staging: Fix functional requirement item types

3 files changed, 40 insertions, 25 deletions

diff --git a/spec/spec/requirement-functional-generic.yml b/spec/spec/requirement-functional-generic.yml
new file mode 100644
index 00000000..99717bf4
--- /dev/null
+++ b/spec/spec/requirement-functional-generic.yml
@@ -0,0 +1,39 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+copyrights:
+- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+enabled-by: true
+links:
+- role: spec-member
+  uid: root
+- role: spec-refinement
+  spec-key: functional-type
+  spec-value: capability
+  uid: requirement-functional
+- role: spec-refinement
+  spec-key: functional-type
+  spec-value: dependability-function
+  uid: requirement-functional
+- role: spec-refinement
+  spec-key: functional-type
+  spec-value: function
+  uid: requirement-functional
+- role: spec-refinement
+  spec-key: functional-type
+  spec-value: operational
+  uid: requirement-functional
+- role: spec-refinement
+  spec-key: functional-type
+  spec-value: safety-function
+  uid: requirement-functional
+spec-description: |
+  Items of this type state a functional requirement with the functional type
+  defined by the specification type refinement.
+spec-example: null
+spec-info:
+  dict:
+    attributes: {}
+    description: null
+    mandatory-attributes: all
+spec-name: Generic Functional Requirement Item Type
+spec-type: requirement-functional-generic
+type: spec
diff --git a/spec/spec/requirement-functional-type.yml b/spec/spec/requirement-functional-type.yml
deleted file mode 100644
index a3c15db2..00000000
--- a/spec/spec/requirement-functional-type.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-enabled-by: true
-links:
-- role: spec-member
-  uid: root
-spec-description: null
-spec-example: null
-spec-info:
-  str:
-    assert:
-      in:
-      - capability
-      - dependability-function
-      - directive
-      - function
-      - operational
-      - safety-function
-    description: |
-      This type shall be used for functional requirement types.
-spec-name: Requirement Functional Type
-spec-type: requirement-functional-type
-type: spec
diff --git a/spec/spec/requirement-functional.yml b/spec/spec/requirement-functional.yml
index 503909dc..cd70da6b 100644
--- a/spec/spec/requirement-functional.yml
+++ b/spec/spec/requirement-functional.yml
@@ -17,7 +17,7 @@ spec-info:
       functional-type:
         description: |
           It shall be the functional type of the requirement.
-        spec-type: requirement-functional-type
+        spec-type: name
     description: |
       This set of attributes specifies a functional requirement.
     mandatory-attributes: all