diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-06-04 10:34:56 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-06-08 08:59:20 +0200 |
| commit | 9499f8bc3ff935c507c2d7fc36d5debb6949b89d (patch) | |
| tree | a3e564298790bbb272349def292fefd7d5696ba0 | |
| parent | f99047547159c41f363f96a36b4d134258ea52c8 (diff) | |
spec: Rename required in mandatory attributes
The term "required" is quite overloaded in the specification context.
Use "mandatory" instead.
Shorten the phrase "explicitly defined attributes" to "explicit
attributes".
140 files changed, 392 insertions, 408 deletions
diff --git a/rtemsqual/specdoc.py b/rtemsqual/specdoc.py index 25cf4555..55a0f98a 100644 --- a/rtemsqual/specdoc.py +++ b/rtemsqual/specdoc.py @@ -43,15 +43,18 @@ _PRIMITIVE_TYPES = { "str": "{} {} be a string.", } -_REQUIRED_ATTRIBUTES = { - "all": "All explicitly defined attributes shall be specified.", +_MANDATORY_ATTRIBUTES = { + "all": + "All explicit attributes shall be specified.", "at-least-one": - "At least one of the explicitly defined attributes shall be specified.", + "At least one of the explicit attributes shall be specified.", "at-most-one": - "At most one of the explicitly defined attributes shall be specified.", + "At most one of the explicit attributes shall be specified.", "exactly-one": - "Exactly one of the explicitly defined attributes shall be specified.", - "none": "None of the explicitly defined attributes are required.", + "Exactly one of the explicit attributes shall be specified.", + "none": + "None of the explicit attributes is mandatory, " + "they are all are optional.", } _SPEC_TYPE_PREFIX = "SpecType" @@ -353,33 +356,31 @@ class _Documenter: content.paste_and_add(self._substitute(info["description"])) has_explicit_attributes = len(info["attributes"]) > 0 if has_explicit_attributes: - required_attributes = info["required-attributes"] - if isinstance(required_attributes, str): - content.paste(_REQUIRED_ATTRIBUTES[required_attributes]) + mandatory_attributes = info["mandatory-attributes"] + if isinstance(mandatory_attributes, str): + content.paste(_MANDATORY_ATTRIBUTES[mandatory_attributes]) else: - assert isinstance(required_attributes, list) - required_attribute_count = len(required_attributes) - if required_attribute_count == 1: - content.paste(f"Only the ``{required_attributes[0]}`` " - "attribute is required.") - elif required_attribute_count > 1: - content.paste("The following explicitly defined " - "attributes are required:") - for attribute in sorted(required_attributes): + assert isinstance(mandatory_attributes, list) + mandatory_attribute_count = len(mandatory_attributes) + if mandatory_attribute_count == 1: + content.paste(f"Only the ``{mandatory_attributes[0]}`` " + "attribute is mandatory.") + elif mandatory_attribute_count > 1: + content.paste("The following explicit " + "attributes are mandatory:") + for attribute in sorted(mandatory_attributes): content.add_list_item(f"``{attribute}``") content.add_blank_line() else: content.add_blank_line() - content.paste("The following attributes are explicitly " - "defined for this type:") + content.paste("The explicit attributes for this type are:") self._document_attributes(content, info["attributes"]) if "generic-attributes" in info: if has_explicit_attributes: - content.wrap( - "In addition to the explicitly defined " - "attributes above, generic attributes may be defined.") + content.wrap("In addition to the explicit attributes, " + "generic attributes may be specified.") else: - content.paste("Generic attributes may be defined.") + content.paste("Generic attributes may be specified.") content.paste("Each attribute key shall be a :ref:`SpecTypeName`.") type_phrase = self.get_value_type_phrase( "The attribute value", "shall", diff --git a/rtemsqual/specverify.py b/rtemsqual/specverify.py index 33fc86f4..f9b639ac 100644 --- a/rtemsqual/specverify.py +++ b/rtemsqual/specverify.py @@ -308,23 +308,23 @@ class _ItemVerifier(_Verifier): if not specified_keys.issubset(keys): missing_keys = specified_keys.difference( specified_keys.intersection(keys)) - logging.error("%s missing required keys for type '%s': %s", + logging.error("%s missing mandatory keys for type '%s': %s", _prefix(path), self._name, str(sorted(missing_keys))) - def _assert_required_keys(self, path: _Path, type_info: Any, - attr_info: Any, keys: List[str]) -> None: - required_attr_info = type_info["required-attributes"] - if isinstance(required_attr_info, str): - _ASSERT_KEYS[required_attr_info](self, path, set(attr_info), keys) + def _assert_mandatory_keys(self, path: _Path, type_info: Any, + attr_info: Any, keys: List[str]) -> None: + mandatory_attr_info = type_info["mandatory-attributes"] + if isinstance(mandatory_attr_info, str): + _ASSERT_KEYS[mandatory_attr_info](self, path, set(attr_info), keys) else: - assert isinstance(required_attr_info, list) - self.assert_keys_subset(path, set(required_attr_info), keys) + assert isinstance(mandatory_attr_info, list) + self.assert_keys_subset(path, set(mandatory_attr_info), keys) def verify_dict(self, path: _Path, value: Any, type_info: Any) -> Set[str]: """ Verifies a dictionary value. """ keys = sorted(filter(lambda key: not key.startswith("_"), value)) attr_info = type_info["attributes"] - self._assert_required_keys(path, type_info, attr_info, keys) + self._assert_mandatory_keys(path, type_info, attr_info, keys) verified_keys = set() # type: Set[str] for key in keys: if key in attr_info: diff --git a/rtemsqual/tests/spec-doc/a.yml b/rtemsqual/tests/spec-doc/a.yml index 922b5507..15a275e1 100644 --- a/rtemsqual/tests/spec-doc/a.yml +++ b/rtemsqual/tests/spec-doc/a.yml @@ -19,7 +19,7 @@ spec-info: description: null spec-type: a description: null - required-attributes: [] + mandatory-attributes: [] spec-name: A spec-type: a type: spec diff --git a/rtemsqual/tests/spec-doc/b.yml b/rtemsqual/tests/spec-doc/b.yml index f9d2049f..fb0dae66 100644 --- a/rtemsqual/tests/spec-doc/b.yml +++ b/rtemsqual/tests/spec-doc/b.yml @@ -22,7 +22,7 @@ spec-info: generic-attributes: description: null spec-type: list-only - required-attributes: all + mandatory-attributes: all spec-name: B spec-type: b type: spec diff --git a/rtemsqual/tests/spec-doc/c.yml b/rtemsqual/tests/spec-doc/c.yml index 3cb145c5..314bda78 100644 --- a/rtemsqual/tests/spec-doc/c.yml +++ b/rtemsqual/tests/spec-doc/c.yml @@ -14,7 +14,7 @@ spec-info: description: null spec-type: float description: null - required-attributes: + mandatory-attributes: - c spec-name: C spec-type: c diff --git a/rtemsqual/tests/spec-doc/d.yml b/rtemsqual/tests/spec-doc/d.yml index c5de036c..38abd2ea 100644 --- a/rtemsqual/tests/spec-doc/d.yml +++ b/rtemsqual/tests/spec-doc/d.yml @@ -17,7 +17,7 @@ spec-info: description: null spec-type: none description: null - required-attributes: + mandatory-attributes: - d1 - d2 spec-name: D diff --git a/rtemsqual/tests/spec-doc/root.yml b/rtemsqual/tests/spec-doc/root.yml index 37af7f10..b1ed0e89 100644 --- a/rtemsqual/tests/spec-doc/root.yml +++ b/rtemsqual/tests/spec-doc/root.yml @@ -19,7 +19,7 @@ spec-info: generic-attributes: description: null spec-type: root - required-attributes: all + mandatory-attributes: all float: assert: eq: 0.0 diff --git a/rtemsqual/tests/spec-verify/spec/enabled-by.yml b/rtemsqual/tests/spec-verify/spec/enabled-by.yml index fa7de056..2f3bb287 100644 --- a/rtemsqual/tests/spec-verify/spec/enabled-by.yml +++ b/rtemsqual/tests/spec-verify/spec/enabled-by.yml @@ -34,7 +34,7 @@ spec-info: spec-type: enabled-by-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation diff --git a/rtemsqual/tests/spec-verify/spec/link.yml b/rtemsqual/tests/spec-verify/spec/link.yml index 748ce840..c9dadb7f 100644 --- a/rtemsqual/tests/spec-verify/spec/link.yml +++ b/rtemsqual/tests/spec-verify/spec/link.yml @@ -20,7 +20,7 @@ spec-info: spec-type: uid description: | This attribute value shall a link to a specification item. - required-attributes: all + mandatory-attributes: all spec-name: Link spec-type: link type: spec diff --git a/rtemsqual/tests/spec-verify/spec/root.yml b/rtemsqual/tests/spec-verify/spec/root.yml index 93fd3a9b..466d01a2 100644 --- a/rtemsqual/tests/spec-verify/spec/root.yml +++ b/rtemsqual/tests/spec-verify/spec/root.yml @@ -33,7 +33,7 @@ spec-info: spec-type: name description: | This is the root specification item type. - required-attributes: all + mandatory-attributes: all spec-name: Root Item Type spec-type: root type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml index 2ff8a414..30addf5c 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml @@ -11,6 +11,6 @@ spec-info: list: description: null spec-type: spec-assert-float -spec-name: Floating-Point Assert Specification List +spec-name: Specification Floating-Point Assert List spec-type: spec-assert-float-list type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml index 9ed1a3fd..fd6f2564 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml @@ -60,12 +60,12 @@ spec-info: spec-type: spec-assert-float-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation results of the expressions in the list. spec-type: spec-assert-float -spec-name: Floating-Point Assert Specification +spec-name: Specification Floating-Point Assert spec-type: spec-assert-float type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml index 27e689b3..98f20673 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml @@ -11,6 +11,6 @@ spec-info: list: description: null spec-type: spec-assert-int -spec-name: Integer Assert Specification List +spec-name: Specification Integer Assert List spec-type: spec-assert-int-list type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml index 983e1930..ec903b80 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml @@ -59,12 +59,12 @@ spec-info: spec-type: spec-assert-int-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation results of the expressions in the list. spec-type: spec-assert-int -spec-name: Integer Assert Specification +spec-name: Specification Integer Assert spec-type: spec-assert-int type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml index 39a54916..290c0bd9 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml @@ -11,6 +11,6 @@ spec-info: list: description: null spec-type: spec-assert-str -spec-name: String Assert Specification List +spec-name: Specification String Assert List spec-type: spec-assert-str-list type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml b/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml index eccbf710..915da6ed 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml @@ -83,12 +83,12 @@ spec-info: spec-type: none description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation results of the expressions in the list. spec-type: spec-assert-str -spec-name: String Assert Specification +spec-name: Specification String Assert spec-type: spec-assert-str type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml b/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml index f824de54..d44e2256 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml @@ -12,17 +12,15 @@ spec-info: attributes: description: description: | - This mandatory attribute shall be the description of the specified - attribute. + It shall be the description of the attribute value. spec-type: optional-str spec-type: description: | - This mandatory attribute defines the specification type of the - specified attribute. + It shall be the specification type of the attribute value. spec-type: name description: | - This attribute set specifies an attribute value. - required-attributes: all -spec-name: Attribute Value Specification + This set of attributes specifies an attribute value. + mandatory-attributes: all +spec-name: Specification Attribute Value spec-type: spec-attribute-value type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-attributes.yml b/rtemsqual/tests/spec-verify/spec/spec-attributes.yml index c5299138..4d4f1686 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-attributes.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-attributes.yml @@ -15,7 +15,7 @@ spec-info: description: | The generic attributes specify an attribute set. spec-type: spec-attribute-value - required-attributes: none -spec-name: Attribute Specification + mandatory-attributes: none +spec-name: Specification Attribute spec-type: spec-attributes type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-bool.yml b/rtemsqual/tests/spec-verify/spec/spec-bool.yml index 12f932b6..e23f3b1f 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-bool.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-bool.yml @@ -22,13 +22,12 @@ spec-info: spec-type: bool description: description: | - This mandatory attribute shall be the description of the specified - boolean value. + It shall be the description of the specified boolean value. spec-type: optional-str description: | This attribute set specifies a boolean value. - required-attributes: + mandatory-attributes: - description -spec-name: Boolean Value Specification +spec-name: Specification Boolean Value spec-type: spec-bool type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-dict.yml b/rtemsqual/tests/spec-verify/spec/spec-dict.yml index 411d0370..d917c52e 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-dict.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-dict.yml @@ -12,30 +12,27 @@ spec-info: attributes: attributes: description: | - This mandatory attribute defines the explicitly defined attributes of - the specified attribute set. + It shall be the specification of the set of explicit attributes. spec-type: spec-attributes description: description: | - This mandatory attribute shall be the description of the specified - attribute set. + It shall be the description of the attribute set. spec-type: optional-str generic-attributes: description: | - This optional attribute defines the generic attributes of the - specified attribute set. + It shall be the specification of the generic attributes of the + attribute set. spec-type: spec-generic-attributes - required-attributes: + mandatory-attributes: description: | - This mandatory attribute defines the required attributes of the - specified attribute set. - spec-type: spec-required-attributes + It shall be the set of mandatory attributes of the attribute set. + spec-type: spec-mandatory-attributes description: | This set of attributes specifies a set of attributes. - required-attributes: + mandatory-attributes: - attributes - description - - required-attributes -spec-name: Attribute Set Specification + - mandatory-attributes +spec-name: Specification Attribute Set spec-type: spec-dict type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-float.yml b/rtemsqual/tests/spec-verify/spec/spec-float.yml index 1b0e4925..1f831eb8 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-float.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-float.yml @@ -19,13 +19,12 @@ spec-info: spec-type: spec-assert-float description: description: | - This mandatory attribute shall be the description of the specified - floating-point value. + It shall be the description of the specified floating-point value. spec-type: optional-str description: | - This attribute set specifies a floating-point value. - required-attributes: + This set of attributes specifies a floating-point value. + mandatory-attributes: - description -spec-name: Floating-Point Value Specification +spec-name: Specification Floating-Point Value spec-type: spec-float type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml b/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml index 71fb976d..50e89bc8 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml @@ -12,19 +12,17 @@ spec-info: attributes: description: description: | - This mandatory attribute shall be the description of the generic - attributes. + It shall be the description of the generic attributes. spec-type: optional-str spec-type: description: | - This mandatory attribute defines the specification type of the - generic attribute values. + It shall be the specification type of the generic attribute values. spec-type: name description: | This set of attributes specifies generic attributes. Generic attributes are attributes which are not explicitly defined. They are restricted to a uniform attribute value type. - required-attributes: all -spec-name: Generic Attributes Specification + mandatory-attributes: all +spec-name: Specification Generic Attributes spec-type: spec-generic-attributes type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-info.yml b/rtemsqual/tests/spec-verify/spec/spec-info.yml index 18ecf5c5..5bdbeee0 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-info.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-info.yml @@ -12,35 +12,35 @@ spec-info: attributes: bool: description: | - This attribute specifies a boolean value. + It shall specify a boolean value. spec-type: spec-bool dict: description: | - This attribute specifies a set of attributes. + It shall specify a set of attributes. spec-type: spec-dict float: description: | - This attribute specifies a floating-point value. + It shall specify a floating-point value. spec-type: spec-float int: description: | - This attribute specifies an integer value. + It shall specify an integer value. spec-type: spec-int list: description: | - This attribute specifies a list of attributes or values. + It shall specify a list of attributes or values. spec-type: spec-list none: description: | - This attribute indicates that no value is required. + It specifies that no value is required. spec-type: none str: description: | - This attribute specifies a string. + It shall specify a string. spec-type: spec-str description: | - This attribute set specifies attribute values. - required-attributes: at-least-one + This set of attributes specifies attribute values. + mandatory-attributes: at-least-one spec-name: Specification Information spec-type: spec-info type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-int.yml b/rtemsqual/tests/spec-verify/spec/spec-int.yml index 2f7394b0..080a3a9d 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-int.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-int.yml @@ -19,13 +19,12 @@ spec-info: spec-type: spec-assert-int description: description: | - This mandatory attribute shall be the description of the specified - integer value. + It shall be the description of the specified integer value. spec-type: optional-str description: | - This attribute set specifies an integer value. - required-attributes: + This set of attributes specifies an integer value. + mandatory-attributes: - description -spec-name: Integer Value Specification +spec-name: Specification Integer Value spec-type: spec-int type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-list.yml b/rtemsqual/tests/spec-verify/spec/spec-list.yml index 2c60db37..b8f87807 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-list.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-list.yml @@ -12,17 +12,15 @@ spec-info: attributes: description: description: | - This mandatory attribute shall be the description of the specified - list. + It shall be the description of the list. spec-type: optional-str spec-type: description: | - This mandatory attribute defines the specification type of elements - of the specified list. + It shall be the specification type of elements of the list. spec-type: name description: | - This attribute set specifies a list of attributes or values. - required-attributes: all -spec-name: List Specification + This set of attributes specifies a list of attributes or values. + mandatory-attributes: all +spec-name: Specification List spec-type: spec-list type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-required-attributes.yml b/rtemsqual/tests/spec-verify/spec/spec-mandatory-attributes.yml index adf6f47b..700de958 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-required-attributes.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-mandatory-attributes.yml @@ -6,13 +6,12 @@ links: - role: spec-member uid: root spec-description: | - This attribute value defines which of the explicitly defined attributes are - required. + It defines which explicit attributes are mandatory. spec-example: null spec-info: list: description: | - This list defines the required attributes through their keys. + The list defines the mandatory attributes through their key names. spec-type: name str: assert: @@ -23,8 +22,9 @@ spec-info: - exactly-one - none description: | - This string defines the how many explicitly defined attributes are - required. -spec-name: Required Attributes Specification -spec-type: spec-required-attributes + It defines how many explicit attributes are mandatory. If `none` is + used, then none of the explicit attributes is mandatory, they are all + optional. +spec-name: Specification Mandatory Attributes +spec-type: spec-mandatory-attributes type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-member.yml b/rtemsqual/tests/spec-verify/spec/spec-member.yml index 60707f97..790500ef 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-member.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-member.yml @@ -15,8 +15,8 @@ spec-info: dict: attributes: {} description: | - This specification type defines the specification membership role of links. - required-attributes: none + It defines the specification membership role of links. + mandatory-attributes: all spec-name: Specification Member Link Role spec-type: spec-member type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-refinement.yml b/rtemsqual/tests/spec-verify/spec/spec-refinement.yml index e95467ae..8fd16da1 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-refinement.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-refinement.yml @@ -16,18 +16,17 @@ spec-info: attributes: spec-key: description: | - This mandatory attribute defines the specification type refinement - attribute key of the specification refinement. + It shall be the specification type refinement attribute key of the + specification refinement. spec-type: name spec-value: description: | - This mandatory attribute defines the specification type refinement - attribute value of the specification refinement. + It shall be the specification type refinement attribute value of the + specification refinement. spec-type: name description: | - This specification type defines the specification refinement role of - links. - required-attributes: all + It defines the specification refinement role of links. + mandatory-attributes: all spec-name: Specification Refinement Link Role spec-type: spec-refinement type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec-str.yml b/rtemsqual/tests/spec-verify/spec/spec-str.yml index 1ccba6f4..f83dae5e 100644 --- a/rtemsqual/tests/spec-verify/spec/spec-str.yml +++ b/rtemsqual/tests/spec-verify/spec/spec-str.yml @@ -18,13 +18,12 @@ spec-info: spec-type: spec-assert-str description: description: | - This mandatory attribute shall be the description of the specified - string attribute. + It shall be the description of the specified string attribute. spec-type: optional-str description: | - This attribute set specifies a string. - required-attributes: + This set of attributes specifies a string. + mandatory-attributes: - description -spec-name: String Specification +spec-name: Specification String Value spec-type: spec-str type: spec diff --git a/rtemsqual/tests/spec-verify/spec/spec.yml b/rtemsqual/tests/spec-verify/spec/spec.yml index 7f33c78a..e67e920e 100644 --- a/rtemsqual/tests/spec-verify/spec/spec.yml +++ b/rtemsqual/tests/spec-verify/spec/spec.yml @@ -29,15 +29,15 @@ spec-example: | attributes: an-example-attribute: description: | - This mandatory attribute shall be an example. + It shall be an example. spec-type: optional-str example-number: description: | - This mandatory attribute shall be the example number. + It shall be the example number. spec-type: int description: | - This set of attributes gives an example. - required-attributes: all + This set of attributes specifies an example. + mandatory-attributes: all spec-name: Example Item Type spec-type: spec type: spec @@ -46,29 +46,27 @@ spec-info: attributes: spec-description: description: | - This mandatory attribute shall be the description of the - specification type. + It shall be the description of the specification type. spec-type: optional-str spec-example: description: | - This mandatory attribute shall an example of the specification type. + If the value is present, then it shall be an example of the + specification type. spec-type: optional-str spec-info: - description: | - This mandatory attribute defines the specification type information. + description: null spec-type: spec-info spec-name: description: | - This mandatory attribute shall be the human readable name of the - specification type. + It shall be the human readable name of the specification type. spec-type: optional-str spec-type: description: | - This mandatory attribute defines the specification type name. + It shall the specification type. spec-type: name description: | This set of attributes specifies specification types. - required-attributes: all + mandatory-attributes: all spec-name: Specification Item Type spec-type: spec type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/any-dict.yml b/rtemsqual/tests/spec-verify/spec2/any-dict.yml index 5adf31c4..998b114d 100644 --- a/rtemsqual/tests/spec-verify/spec2/any-dict.yml +++ b/rtemsqual/tests/spec-verify/spec2/any-dict.yml @@ -11,6 +11,6 @@ spec-info: attributes: {} generic-attributes: spec-type: str - required-attributes: none + mandatory-attributes: none spec-type: any-dict type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/c.yml b/rtemsqual/tests/spec-verify/spec2/c.yml index 8c3fcb53..4154288c 100644 --- a/rtemsqual/tests/spec-verify/spec2/c.yml +++ b/rtemsqual/tests/spec-verify/spec2/c.yml @@ -35,6 +35,6 @@ spec-info: spec-type: str-contains uid: spec-type: uid - required-attributes: all + mandatory-attributes: all spec-type: c type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/d-a.yml b/rtemsqual/tests/spec-verify/spec2/d-a.yml index 861ead49..e011310d 100644 --- a/rtemsqual/tests/spec-verify/spec2/d-a.yml +++ b/rtemsqual/tests/spec-verify/spec2/d-a.yml @@ -17,6 +17,6 @@ spec-info: attributes: d-type: spec-type: x - required-attributes: none + mandatory-attributes: none spec-type: d-a type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/d.yml b/rtemsqual/tests/spec-verify/spec2/d.yml index 5557dabe..27089960 100644 --- a/rtemsqual/tests/spec-verify/spec2/d.yml +++ b/rtemsqual/tests/spec-verify/spec2/d.yml @@ -15,7 +15,7 @@ spec-info: attributes: d-type: spec-type: name - required-attributes: + mandatory-attributes: - d-type spec-type: d type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/invalid.yml b/rtemsqual/tests/spec-verify/spec2/invalid.yml index 20194144..a38e724f 100644 --- a/rtemsqual/tests/spec-verify/spec2/invalid.yml +++ b/rtemsqual/tests/spec-verify/spec2/invalid.yml @@ -15,7 +15,7 @@ spec-info: attributes: INVALID: spec-type: invalid - required-attributes: none + mandatory-attributes: none none: true str: foo: bar diff --git a/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml b/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml index d1944f17..2336efe1 100644 --- a/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml +++ b/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml @@ -17,6 +17,6 @@ spec-info: spec-type: none key-b: spec-type: none - required-attributes: at-least-one + mandatory-attributes: at-least-one spec-type: keys-at-least-one type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml b/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml index 16581b1d..b8fb29c5 100644 --- a/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml +++ b/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml @@ -17,6 +17,6 @@ spec-info: spec-type: none key-b: spec-type: none - required-attributes: at-most-one + mandatory-attributes: at-most-one spec-type: keys-at-most-one type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml b/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml index 84c17457..c546d574 100644 --- a/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml +++ b/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml @@ -17,6 +17,6 @@ spec-info: spec-type: none key-b: spec-type: none - required-attributes: exactly-one + mandatory-attributes: exactly-one spec-type: keys-exactly-one type: spec diff --git a/rtemsqual/tests/spec-verify/spec2/some-dict.yml b/rtemsqual/tests/spec-verify/spec2/some-dict.yml index 534b6538..c0bd51b8 100644 --- a/rtemsqual/tests/spec-verify/spec2/some-dict.yml +++ b/rtemsqual/tests/spec-verify/spec2/some-dict.yml @@ -11,7 +11,7 @@ spec-info: attributes: a: spec-type: none - required-attributes: none + mandatory-attributes: none none: null spec-type: some-dict type: spec diff --git a/rtemsqual/tests/test_specdoc.py b/rtemsqual/tests/test_specdoc.py index 72cfb7f0..d8ead25d 100644 --- a/rtemsqual/tests/test_specdoc.py +++ b/rtemsqual/tests/test_specdoc.py @@ -79,15 +79,15 @@ A value of this type shall be of one of the following variants: * The value may be a boolean. A reference to :ref:`SpecTypeRoot`. The value shall be true. -* The value may be a set of attributes. All explicitly defined attributes shall - be specified. The following attributes are explicitly defined for this type: +* The value may be a set of attributes. All explicit attributes shall be + specified. The explicit attributes for this type are: type The attribute value shall be a :ref:`SpecTypeName`. - In addition to the explicitly defined attributes above, generic attributes - may be defined. Each attribute key shall be a :ref:`SpecTypeName`. The - attribute value shall be a :ref:`SpecTypeRoot`. + In addition to the explicit attributes, generic attributes may be specified. + Each attribute key shall be a :ref:`SpecTypeName`. The attribute value shall + be a :ref:`SpecTypeRoot`. * The value may be a floating-point number. The value shall be equal to 0.0. @@ -193,7 +193,7 @@ A This type refines the :ref:`SpecTypeRoot` though the ``type`` attribute if the value is ``a``. -The following attributes are explicitly defined for this type: +The explicit attributes for this type are: a The attribute value shall be an :ref:`SpecTypeA`. @@ -219,7 +219,7 @@ This type refines the following types: * :ref:`SpecTypeRoot` though the ``type`` attribute if the value is ``b`` -Generic attributes may be defined. Each attribute key shall be a +Generic attributes may be specified. Each attribute key shall be a :ref:`SpecTypeName`. The attribute value shall be a list. Each list element shall be a string. @@ -233,8 +233,8 @@ Specification Attribute Sets and Value Types C ^ -Only the ``c`` attribute is required. The following attributes are explicitly -defined for this type: +Only the ``c`` attribute is mandatory. The explicit attributes for this type +are: c The attribute value shall be a floating-point number. @@ -244,13 +244,13 @@ c D ^ -The following explicitly defined attributes are required: +The following explicit attributes are mandatory: * ``d1`` * ``d2`` -The following attributes are explicitly defined for this type: +The explicit attributes for this type are: d1 The attribute value shall be a :ref:`SpecTypeName`. diff --git a/rtemsqual/tests/test_specverify.py b/rtemsqual/tests/test_specverify.py index aad62bc7..4b01d2ef 100644 --- a/rtemsqual/tests/test_specverify.py +++ b/rtemsqual/tests/test_specverify.py @@ -121,9 +121,9 @@ INFO type: spec-info INFO type: spec-int INFO type: spec-invalid INFO type: spec-list +INFO type: spec-mandatory-attributes INFO type: spec-member INFO type: spec-refinement -INFO type: spec-required-attributes INFO type: spec-str INFO type: str INFO type: str-contains @@ -142,7 +142,7 @@ INFO /c1:/links[0]/uid: verify using type 'uid' ERROR /c1:/links[0]: unknown subtype for key 'role' for type 'link': x INFO /c1:/type: verify using type 'name' INFO /c1: verify using type 'c' -ERROR /c1: missing required keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'must-be-true', 'other-int', 'str', 'str-contains'] +ERROR /c1: missing mandatory keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'must-be-true', 'other-int', 'str', 'str-contains'] INFO /c1:/dict: verify using type 'some-dict' INFO /c1:/dict/a: verify using type 'none' INFO /c1:/list: verify using type 'some-list' @@ -156,7 +156,7 @@ INFO /c2:/enabled-by: verify using type 'enabled-by' INFO /c2:/links: verify using type 'links' INFO /c2:/type: verify using type 'name' INFO /c2: verify using type 'c' -ERROR /c2: missing required keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'must-be-true', 'other-int', 'str', 'uid'] +ERROR /c2: missing mandatory keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'must-be-true', 'other-int', 'str', 'uid'] INFO /c2:/dict: verify using type 'some-dict' ERROR /c2:/dict: has unverfied keys for type 'some-dict' and its subtypes: ['b'] INFO /c2:/list: verify using type 'some-list' @@ -170,7 +170,7 @@ INFO /c3:/enabled-by: verify using type 'enabled-by' INFO /c3:/links: verify using type 'links' INFO /c3:/type: verify using type 'name' INFO /c3: verify using type 'c' -ERROR /c3: missing required keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'other-int'] +ERROR /c3: missing mandatory keys for type 'c': ['any-dict', 'bool', 'float', 'int', 'other-int'] INFO /c3:/dict: verify using type 'some-dict' ERROR /c3:/dict: expected value of types ['dict', 'none'] for type 'some-dict', actual type 'list' INFO /c3:/list: verify using type 'some-list' @@ -234,7 +234,7 @@ INFO /d3:/enabled-by: verify using type 'enabled-by' INFO /d3:/links: verify using type 'links' INFO /d3:/type: verify using type 'name' INFO /d3: verify using type 'd' -ERROR /d3: missing required keys for type 'd': ['d-type'] +ERROR /d3: missing mandatory keys for type 'd': ['d-type'] ERROR /d3: subtype key 'd-type' not present for type 'd' INFO /e: verify using type 'root' INFO /e:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -339,7 +339,7 @@ ERROR /keys-exactly-one-2: not exactly one key out of ['key-a', 'key-b'] is pres INFO /keys-exactly-one-2:/key-a: verify using type 'none' INFO /keys-exactly-one-2:/key-b: verify using type 'none' INFO /notype: verify using type 'root' -ERROR /notype: missing required keys for type 'root': ['type'] +ERROR /notype: missing mandatory keys for type 'root': ['type'] INFO /notype:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' INFO /notype:/copyrights: verify using type 'copyrights' INFO /notype:/copyrights[0]: verify using type 'copyright' @@ -421,7 +421,7 @@ INFO /spec/enabled-by:/spec-info/dict/attributes/or: verify using type 'spec-att INFO /spec/enabled-by:/spec-info/dict/attributes/or/description: verify using type 'optional-str' INFO /spec/enabled-by:/spec-info/dict/attributes/or/spec-type: verify using type 'name' INFO /spec/enabled-by:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/enabled-by:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/enabled-by:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/enabled-by:/spec-info/list: verify using type 'spec-list' INFO /spec/enabled-by:/spec-info/list/description: verify using type 'optional-str' INFO /spec/enabled-by:/spec-info/list/spec-type: verify using type 'name' @@ -473,7 +473,7 @@ INFO /spec/link:/spec-info/dict/attributes/uid: verify using type 'spec-attribut INFO /spec/link:/spec-info/dict/attributes/uid/description: verify using type 'optional-str' INFO /spec/link:/spec-info/dict/attributes/uid/spec-type: verify using type 'name' INFO /spec/link:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/link:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/link:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/link:/spec-name: verify using type 'optional-str' INFO /spec/link:/spec-type: verify using type 'name' INFO /spec/links: verify using type 'root' @@ -565,7 +565,7 @@ INFO /spec/root:/spec-info/dict/attributes/type: verify using type 'spec-attribu INFO /spec/root:/spec-info/dict/attributes/type/description: verify using type 'optional-str' INFO /spec/root:/spec-info/dict/attributes/type/spec-type: verify using type 'name' INFO /spec/root:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/root:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/root:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/root:/spec-name: verify using type 'optional-str' INFO /spec/root:/spec-type: verify using type 'name' INFO /spec/spdx-license-identifier: verify using type 'root' @@ -633,7 +633,7 @@ INFO /spec/spec:/spec-info/dict/attributes/spec-type: verify using type 'spec-at INFO /spec/spec:/spec-info/dict/attributes/spec-type/description: verify using type 'optional-str' INFO /spec/spec:/spec-info/dict/attributes/spec-type/spec-type: verify using type 'name' INFO /spec/spec:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec:/spec-name: verify using type 'optional-str' INFO /spec/spec:/spec-type: verify using type 'name' INFO /spec/spec-assert-float: verify using type 'root' @@ -681,7 +681,7 @@ INFO /spec/spec-assert-float:/spec-info/dict/attributes/or: verify using type 's INFO /spec/spec-assert-float:/spec-info/dict/attributes/or/description: verify using type 'optional-str' INFO /spec/spec-assert-float:/spec-info/dict/attributes/or/spec-type: verify using type 'name' INFO /spec/spec-assert-float:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-assert-float:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-assert-float:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-assert-float:/spec-info/list: verify using type 'spec-list' INFO /spec/spec-assert-float:/spec-info/list/description: verify using type 'optional-str' INFO /spec/spec-assert-float:/spec-info/list/spec-type: verify using type 'name' @@ -752,7 +752,7 @@ INFO /spec/spec-assert-int:/spec-info/dict/attributes/or: verify using type 'spe INFO /spec/spec-assert-int:/spec-info/dict/attributes/or/description: verify using type 'optional-str' INFO /spec/spec-assert-int:/spec-info/dict/attributes/or/spec-type: verify using type 'name' INFO /spec/spec-assert-int:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-assert-int:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-assert-int:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-assert-int:/spec-info/list: verify using type 'spec-list' INFO /spec/spec-assert-int:/spec-info/list/description: verify using type 'optional-str' INFO /spec/spec-assert-int:/spec-info/list/spec-type: verify using type 'name' @@ -835,7 +835,7 @@ INFO /spec/spec-assert-str:/spec-info/dict/attributes/uid: verify using type 'sp INFO /spec/spec-assert-str:/spec-info/dict/attributes/uid/description: verify using type 'optional-str' INFO /spec/spec-assert-str:/spec-info/dict/attributes/uid/spec-type: verify using type 'name' INFO /spec/spec-assert-str:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-assert-str:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-assert-str:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-assert-str:/spec-info/list: verify using type 'spec-list' INFO /spec/spec-assert-str:/spec-info/list/description: verify using type 'optional-str' INFO /spec/spec-assert-str:/spec-info/list/spec-type: verify using type 'name' @@ -885,7 +885,7 @@ INFO /spec/spec-attribute-value:/spec-info/dict/attributes/spec-type: verify usi INFO /spec/spec-attribute-value:/spec-info/dict/attributes/spec-type/description: verify using type 'optional-str' INFO /spec/spec-attribute-value:/spec-info/dict/attributes/spec-type/spec-type: verify using type 'name' INFO /spec/spec-attribute-value:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-attribute-value:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-attribute-value:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-attribute-value:/spec-name: verify using type 'optional-str' INFO /spec/spec-attribute-value:/spec-type: verify using type 'name' INFO /spec/spec-attributes: verify using type 'root' @@ -909,7 +909,7 @@ INFO /spec/spec-attributes:/spec-info/dict/description: verify using type 'optio INFO /spec/spec-attributes:/spec-info/dict/generic-attributes: verify using type 'spec-generic-attributes' INFO /spec/spec-attributes:/spec-info/dict/generic-attributes/description: verify using type 'optional-str' INFO /spec/spec-attributes:/spec-info/dict/generic-attributes/spec-type: verify using type 'name' -INFO /spec/spec-attributes:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-attributes:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-attributes:/spec-name: verify using type 'optional-str' INFO /spec/spec-attributes:/spec-type: verify using type 'name' INFO /spec/spec-bool: verify using type 'root' @@ -936,8 +936,8 @@ INFO /spec/spec-bool:/spec-info/dict/attributes/description: verify using type ' INFO /spec/spec-bool:/spec-info/dict/attributes/description/description: verify using type 'optional-str' INFO /spec/spec-bool:/spec-info/dict/attributes/description/spec-type: verify using type 'name' INFO /spec/spec-bool:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-bool:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec/spec-bool:/spec-info/dict/required-attributes[0]: verify using type 'name' +INFO /spec/spec-bool:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec/spec-bool:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' INFO /spec/spec-bool:/spec-name: verify using type 'optional-str' INFO /spec/spec-bool:/spec-type: verify using type 'name' INFO /spec/spec-dict: verify using type 'root' @@ -966,14 +966,14 @@ INFO /spec/spec-dict:/spec-info/dict/attributes/description/spec-type: verify us INFO /spec/spec-dict:/spec-info/dict/attributes/generic-attributes: verify using type 'spec-attribute-value' INFO /spec/spec-dict:/spec-info/dict/attributes/generic-attributes/description: verify using type 'optional-str' INFO /spec/spec-dict:/spec-info/dict/attributes/generic-attributes/spec-type: verify using type 'name' -INFO /spec/spec-dict:/spec-info/dict/attributes/required-attributes: verify using type 'spec-attribute-value' -INFO /spec/spec-dict:/spec-info/dict/attributes/required-attributes/description: verify using type 'optional-str' -INFO /spec/spec-dict:/spec-info/dict/attributes/required-attributes/spec-type: verify using type 'name' +INFO /spec/spec-dict:/spec-info/dict/attributes/mandatory-attributes: verify using type 'spec-attribute-value' +INFO /spec/spec-dict:/spec-info/dict/attributes/mandatory-attributes/description: verify using type 'optional-str' +INFO /spec/spec-dict:/spec-info/dict/attributes/mandatory-attributes/spec-type: verify using type 'name' INFO /spec/spec-dict:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-dict:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec/spec-dict:/spec-info/dict/required-attributes[0]: verify using type 'name' -INFO /spec/spec-dict:/spec-info/dict/required-attributes[1]: verify using type 'name' -INFO /spec/spec-dict:/spec-info/dict/required-attributes[2]: verify using type 'name' +INFO /spec/spec-dict:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec/spec-dict:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' +INFO /spec/spec-dict:/spec-info/dict/mandatory-attributes[1]: verify using type 'name' +INFO /spec/spec-dict:/spec-info/dict/mandatory-attributes[2]: verify using type 'name' INFO /spec/spec-dict:/spec-name: verify using type 'optional-str' INFO /spec/spec-dict:/spec-type: verify using type 'name' INFO /spec/spec-float: verify using type 'root' @@ -1000,8 +1000,8 @@ INFO /spec/spec-float:/spec-info/dict/attributes/description: verify using type INFO /spec/spec-float:/spec-info/dict/attributes/description/description: verify using type 'optional-str' INFO /spec/spec-float:/spec-info/dict/attributes/description/spec-type: verify using type 'name' INFO /spec/spec-float:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-float:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec/spec-float:/spec-info/dict/required-attributes[0]: verify using type 'name' +INFO /spec/spec-float:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec/spec-float:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' INFO /spec/spec-float:/spec-name: verify using type 'optional-str' INFO /spec/spec-float:/spec-type: verify using type 'name' INFO /spec/spec-generic-attributes: verify using type 'root' @@ -1028,7 +1028,7 @@ INFO /spec/spec-generic-attributes:/spec-info/dict/attributes/spec-type: verify INFO /spec/spec-generic-attributes:/spec-info/dict/attributes/spec-type/description: verify using type 'optional-str' INFO /spec/spec-generic-attributes:/spec-info/dict/attributes/spec-type/spec-type: verify using type 'name' INFO /spec/spec-generic-attributes:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-generic-attributes:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-generic-attributes:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-generic-attributes:/spec-name: verify using type 'optional-str' INFO /spec/spec-generic-attributes:/spec-type: verify using type 'name' INFO /spec/spec-info: verify using type 'root' @@ -1070,7 +1070,7 @@ INFO /spec/spec-info:/spec-info/dict/attributes/str: verify using type 'spec-att INFO /spec/spec-info:/spec-info/dict/attributes/str/description: verify using type 'optional-str' INFO /spec/spec-info:/spec-info/dict/attributes/str/spec-type: verify using type 'name' INFO /spec/spec-info:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-info:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-info:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-info:/spec-name: verify using type 'optional-str' INFO /spec/spec-info:/spec-type: verify using type 'name' INFO /spec/spec-int: verify using type 'root' @@ -1097,8 +1097,8 @@ INFO /spec/spec-int:/spec-info/dict/attributes/description: verify using type 's INFO /spec/spec-int:/spec-info/dict/attributes/description/description: verify using type 'optional-str' INFO /spec/spec-int:/spec-info/dict/attributes/description/spec-type: verify using type 'name' INFO /spec/spec-int:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-int:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec/spec-int:/spec-info/dict/required-attributes[0]: verify using type 'name' +INFO /spec/spec-int:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec/spec-int:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' INFO /spec/spec-int:/spec-name: verify using type 'optional-str' INFO /spec/spec-int:/spec-type: verify using type 'name' INFO /spec/spec-list: verify using type 'root' @@ -1125,9 +1125,38 @@ INFO /spec/spec-list:/spec-info/dict/attributes/spec-type: verify using type 'sp INFO /spec/spec-list:/spec-info/dict/attributes/spec-type/description: verify using type 'optional-str' INFO /spec/spec-list:/spec-info/dict/attributes/spec-type/spec-type: verify using type 'name' INFO /spec/spec-list:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-list:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-list:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-list:/spec-name: verify using type 'optional-str' INFO /spec/spec-list:/spec-type: verify using type 'name' +INFO /spec/spec-mandatory-attributes: verify using type 'root' +INFO /spec/spec-mandatory-attributes:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' +INFO /spec/spec-mandatory-attributes:/copyrights: verify using type 'copyrights' +INFO /spec/spec-mandatory-attributes:/copyrights[0]: verify using type 'copyright' +INFO /spec/spec-mandatory-attributes:/enabled-by: verify using type 'enabled-by' +INFO /spec/spec-mandatory-attributes:/links: verify using type 'links' +INFO /spec/spec-mandatory-attributes:/links[0]: verify using type 'link' +INFO /spec/spec-mandatory-attributes:/links[0]/role: verify using type 'name' +INFO /spec/spec-mandatory-attributes:/links[0]/uid: verify using type 'uid' +INFO /spec/spec-mandatory-attributes:/links[0]: verify using type 'spec-member' +INFO /spec/spec-mandatory-attributes:/type: verify using type 'name' +INFO /spec/spec-mandatory-attributes: verify using type 'spec' +INFO /spec/spec-mandatory-attributes:/spec-description: verify using type 'optional-str' +INFO /spec/spec-mandatory-attributes:/spec-example: verify using type 'optional-str' +INFO /spec/spec-mandatory-attributes:/spec-info: verify using type 'spec-info' +INFO /spec/spec-mandatory-attributes:/spec-info/list: verify using type 'spec-list' +INFO /spec/spec-mandatory-attributes:/spec-info/list/description: verify using type 'optional-str' +INFO /spec/spec-mandatory-attributes:/spec-info/list/spec-type: verify using type 'name' +INFO /spec/spec-mandatory-attributes:/spec-info/str: verify using type 'spec-str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert: verify using type 'spec-assert-str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in: verify using type 'list-str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in[0]: verify using type 'str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in[1]: verify using type 'str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in[2]: verify using type 'str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in[3]: verify using type 'str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/assert/in[4]: verify using type 'str' +INFO /spec/spec-mandatory-attributes:/spec-info/str/description: verify using type 'optional-str' +INFO /spec/spec-mandatory-attributes:/spec-name: verify using type 'optional-str' +INFO /spec/spec-mandatory-attributes:/spec-type: verify using type 'name' INFO /spec/spec-member: verify using type 'root' INFO /spec/spec-member:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' INFO /spec/spec-member:/copyrights: verify using type 'copyrights' @@ -1152,7 +1181,7 @@ INFO /spec/spec-member:/spec-info: verify using type 'spec-info' INFO /spec/spec-member:/spec-info/dict: verify using type 'spec-dict' INFO /spec/spec-member:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec/spec-member:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-member:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-member:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-member:/spec-name: verify using type 'optional-str' INFO /spec/spec-member:/spec-type: verify using type 'name' INFO /spec/spec-refinement: verify using type 'root' @@ -1185,38 +1214,9 @@ INFO /spec/spec-refinement:/spec-info/dict/attributes/spec-value: verify using t INFO /spec/spec-refinement:/spec-info/dict/attributes/spec-value/description: verify using type 'optional-str' INFO /spec/spec-refinement:/spec-info/dict/attributes/spec-value/spec-type: verify using type 'name' INFO /spec/spec-refinement:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-refinement:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec/spec-refinement:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec/spec-refinement:/spec-name: verify using type 'optional-str' INFO /spec/spec-refinement:/spec-type: verify using type 'name' -INFO /spec/spec-required-attributes: verify using type 'root' -INFO /spec/spec-required-attributes:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' -INFO /spec/spec-required-attributes:/copyrights: verify using type 'copyrights' -INFO /spec/spec-required-attributes:/copyrights[0]: verify using type 'copyright' -INFO /spec/spec-required-attributes:/enabled-by: verify using type 'enabled-by' -INFO /spec/spec-required-attributes:/links: verify using type 'links' -INFO /spec/spec-required-attributes:/links[0]: verify using type 'link' -INFO /spec/spec-required-attributes:/links[0]/role: verify using type 'name' -INFO /spec/spec-required-attributes:/links[0]/uid: verify using type 'uid' -INFO /spec/spec-required-attributes:/links[0]: verify using type 'spec-member' -INFO /spec/spec-required-attributes:/type: verify using type 'name' -INFO /spec/spec-required-attributes: verify using type 'spec' -INFO /spec/spec-required-attributes:/spec-description: verify using type 'optional-str' -INFO /spec/spec-required-attributes:/spec-example: verify using type 'optional-str' -INFO /spec/spec-required-attributes:/spec-info: verify using type 'spec-info' -INFO /spec/spec-required-attributes:/spec-info/list: verify using type 'spec-list' -INFO /spec/spec-required-attributes:/spec-info/list/description: verify using type 'optional-str' -INFO /spec/spec-required-attributes:/spec-info/list/spec-type: verify using type 'name' -INFO /spec/spec-required-attributes:/spec-info/str: verify using type 'spec-str' -INFO /spec/spec-required-attributes:/spec-info/str/assert: verify using type 'spec-assert-str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in: verify using type 'list-str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in[0]: verify using type 'str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in[1]: verify using type 'str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in[2]: verify using type 'str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in[3]: verify using type 'str' -INFO /spec/spec-required-attributes:/spec-info/str/assert/in[4]: verify using type 'str' -INFO /spec/spec-required-attributes:/spec-info/str/description: verify using type 'optional-str' -INFO /spec/spec-required-attributes:/spec-name: verify using type 'optional-str' -INFO /spec/spec-required-attributes:/spec-type: verify using type 'name' INFO /spec/spec-str: verify using type 'root' INFO /spec/spec-str:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' INFO /spec/spec-str:/copyrights: verify using type 'copyrights' @@ -1241,8 +1241,8 @@ INFO /spec/spec-str:/spec-info/dict/attributes/description: verify using type 's INFO /spec/spec-str:/spec-info/dict/attributes/description/description: verify using type 'optional-str' INFO /spec/spec-str:/spec-info/dict/attributes/description/spec-type: verify using type 'name' INFO /spec/spec-str:/spec-info/dict/description: verify using type 'optional-str' -INFO /spec/spec-str:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec/spec-str:/spec-info/dict/required-attributes[0]: verify using type 'name' +INFO /spec/spec-str:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec/spec-str:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' INFO /spec/spec-str:/spec-name: verify using type 'optional-str' INFO /spec/spec-str:/spec-type: verify using type 'name' INFO /spec2/any-dict: verify using type 'root' @@ -1257,16 +1257,16 @@ INFO /spec2/any-dict:/links[0]/uid: verify using type 'uid' INFO /spec2/any-dict:/links[0]: verify using type 'spec-member' INFO /spec2/any-dict:/type: verify using type 'name' INFO /spec2/any-dict: verify using type 'spec' -ERROR /spec2/any-dict: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/any-dict: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/any-dict:/spec-example: verify using type 'optional-str' INFO /spec2/any-dict:/spec-info: verify using type 'spec-info' INFO /spec2/any-dict:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/any-dict:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/any-dict:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/any-dict:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/any-dict:/spec-info/dict/generic-attributes: verify using type 'spec-generic-attributes' -ERROR /spec2/any-dict:/spec-info/dict/generic-attributes: missing required keys for type 'spec-generic-attributes': ['description'] +ERROR /spec2/any-dict:/spec-info/dict/generic-attributes: missing mandatory keys for type 'spec-generic-attributes': ['description'] INFO /spec2/any-dict:/spec-info/dict/generic-attributes/spec-type: verify using type 'name' -INFO /spec2/any-dict:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/any-dict:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/any-dict:/spec-type: verify using type 'name' INFO /spec2/c: verify using type 'root' INFO /spec2/c:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1286,46 +1286,46 @@ INFO /spec2/c:/links[1]/spec-key: verify using type 'name' INFO /spec2/c:/links[1]/spec-value: verify using type 'name' INFO /spec2/c:/type: verify using type 'name' INFO /spec2/c: verify using type 'spec' -ERROR /spec2/c: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/c: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/c:/spec-example: verify using type 'optional-str' INFO /spec2/c:/spec-info: verify using type 'spec-info' INFO /spec2/c:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/c:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/c:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/c:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/c:/spec-info/dict/attributes/any-dict: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/any-dict: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/any-dict: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/any-dict/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/bool: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/bool: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/bool: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/bool/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/dict: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/dict: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/dict: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/dict/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/float: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/float: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/float: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/float/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/int: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/int: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/int: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/int/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/list: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/list: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/list: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/list/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/must-be-true: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/must-be-true: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/must-be-true: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/must-be-true/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/other-int: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/other-int: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/other-int: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/other-int/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/str: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/str: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/str: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/str/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/str-contains: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/str-contains: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/str-contains: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/str-contains/spec-type: verify using type 'name' INFO /spec2/c:/spec-info/dict/attributes/uid: verify using type 'spec-attribute-value' -ERROR /spec2/c:/spec-info/dict/attributes/uid: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/c:/spec-info/dict/attributes/uid: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/c:/spec-info/dict/attributes/uid/spec-type: verify using type 'name' -INFO /spec2/c:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/c:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/c:/spec-type: verify using type 'name' INFO /spec2/d: verify using type 'root' INFO /spec2/d:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1345,17 +1345,17 @@ INFO /spec2/d:/links[1]/spec-key: verify using type 'name' INFO /spec2/d:/links[1]/spec-value: verify using type 'name' INFO /spec2/d:/type: verify using type 'name' INFO /spec2/d: verify using type 'spec' -ERROR /spec2/d: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/d: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/d:/spec-example: verify using type 'optional-str' INFO /spec2/d:/spec-info: verify using type 'spec-info' INFO /spec2/d:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/d:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/d:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/d:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/d:/spec-info/dict/attributes/d-type: verify using type 'spec-attribute-value' -ERROR /spec2/d:/spec-info/dict/attributes/d-type: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/d:/spec-info/dict/attributes/d-type: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/d:/spec-info/dict/attributes/d-type/spec-type: verify using type 'name' -INFO /spec2/d:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' -INFO /spec2/d:/spec-info/dict/required-attributes[0]: verify using type 'name' +INFO /spec2/d:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' +INFO /spec2/d:/spec-info/dict/mandatory-attributes[0]: verify using type 'name' INFO /spec2/d:/spec-type: verify using type 'name' INFO /spec2/d-a: verify using type 'root' INFO /spec2/d-a:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1379,16 +1379,16 @@ INFO /spec2/d-a:/links[2]/uid: verify using type 'uid' ERROR /spec2/d-a:/links[2]: unknown subtype for key 'role' for type 'link': other INFO /spec2/d-a:/type: verify using type 'name' INFO /spec2/d-a: verify using type 'spec' -ERROR /spec2/d-a: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/d-a: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/d-a:/spec-example: verify using type 'optional-str' INFO /spec2/d-a:/spec-info: verify using type 'spec-info' INFO /spec2/d-a:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/d-a:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/d-a:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/d-a:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/d-a:/spec-info/dict/attributes/d-type: verify using type 'spec-attribute-value' -ERROR /spec2/d-a:/spec-info/dict/attributes/d-type: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/d-a:/spec-info/dict/attributes/d-type: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/d-a:/spec-info/dict/attributes/d-type/spec-type: verify using type 'name' -INFO /spec2/d-a:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/d-a:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/d-a:/spec-type: verify using type 'name' INFO /spec2/invalid: verify using type 'root' INFO /spec2/invalid:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1408,21 +1408,21 @@ INFO /spec2/invalid:/links[1]/spec-key: verify using type 'name' INFO /spec2/invalid:/links[1]/spec-value: verify using type 'name' INFO /spec2/invalid:/type: verify using type 'name' INFO /spec2/invalid: verify using type 'spec' -ERROR /spec2/invalid: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/invalid: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/invalid:/spec-example: verify using type 'optional-str' INFO /spec2/invalid:/spec-info: verify using type 'spec-info' INFO /spec2/invalid:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/invalid:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/invalid:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/invalid:/spec-info/dict/attributes: verify using type 'spec-attributes' ERROR /spec2/invalid:/spec-info/dict/attributes: invalid name: INVALID INFO /spec2/invalid:/spec-info/dict/attributes/INVALID: verify using type 'spec-attribute-value' -ERROR /spec2/invalid:/spec-info/dict/attributes/INVALID: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/invalid:/spec-info/dict/attributes/INVALID: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/invalid:/spec-info/dict/attributes/INVALID/spec-type: verify using type 'name' -INFO /spec2/invalid:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/invalid:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/invalid:/spec-info/none: verify using type 'none' ERROR /spec2/invalid:/spec-info/none: expected type 'none', actual type 'bool' INFO /spec2/invalid:/spec-info/str: verify using type 'spec-str' -ERROR /spec2/invalid:/spec-info/str: missing required keys for type 'spec-str': ['description'] +ERROR /spec2/invalid:/spec-info/str: missing mandatory keys for type 'spec-str': ['description'] ERROR /spec2/invalid:/spec-info/str: has unverfied keys for type 'spec-str' and its subtypes: ['foo'] ERROR /spec2/invalid:/spec-info: has unverfied keys for type 'spec-info' and its subtypes: ['unexpected'] INFO /spec2/invalid:/spec-type: verify using type 'name' @@ -1444,19 +1444,19 @@ INFO /spec2/keys-at-least-one:/links[1]/spec-key: verify using type 'name' INFO /spec2/keys-at-least-one:/links[1]/spec-value: verify using type 'name' INFO /spec2/keys-at-least-one:/type: verify using type 'name' INFO /spec2/keys-at-least-one: verify using type 'spec' -ERROR /spec2/keys-at-least-one: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/keys-at-least-one: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/keys-at-least-one:/spec-example: verify using type 'optional-str' INFO /spec2/keys-at-least-one:/spec-info: verify using type 'spec-info' INFO /spec2/keys-at-least-one:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/keys-at-least-one:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/keys-at-least-one:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/keys-at-least-one:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/keys-at-least-one:/spec-info/dict/attributes/key-a: verify using type 'spec-attribute-value' -ERROR /spec2/keys-at-least-one:/spec-info/dict/attributes/key-a: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-at-least-one:/spec-info/dict/attributes/key-a: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-at-least-one:/spec-info/dict/attributes/key-a/spec-type: verify using type 'name' INFO /spec2/keys-at-least-one:/spec-info/dict/attributes/key-b: verify using type 'spec-attribute-value' -ERROR /spec2/keys-at-least-one:/spec-info/dict/attributes/key-b: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-at-least-one:/spec-info/dict/attributes/key-b: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-at-least-one:/spec-info/dict/attributes/key-b/spec-type: verify using type 'name' -INFO /spec2/keys-at-least-one:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/keys-at-least-one:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/keys-at-least-one:/spec-type: verify using type 'name' INFO /spec2/keys-at-most-one: verify using type 'root' INFO /spec2/keys-at-most-one:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1476,19 +1476,19 @@ INFO /spec2/keys-at-most-one:/links[1]/spec-key: verify using type 'name' INFO /spec2/keys-at-most-one:/links[1]/spec-value: verify using type 'name' INFO /spec2/keys-at-most-one:/type: verify using type 'name' INFO /spec2/keys-at-most-one: verify using type 'spec' -ERROR /spec2/keys-at-most-one: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/keys-at-most-one: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/keys-at-most-one:/spec-example: verify using type 'optional-str' INFO /spec2/keys-at-most-one:/spec-info: verify using type 'spec-info' INFO /spec2/keys-at-most-one:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/keys-at-most-one:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/keys-at-most-one:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/keys-at-most-one:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/keys-at-most-one:/spec-info/dict/attributes/key-a: verify using type 'spec-attribute-value' -ERROR /spec2/keys-at-most-one:/spec-info/dict/attributes/key-a: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-at-most-one:/spec-info/dict/attributes/key-a: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-at-most-one:/spec-info/dict/attributes/key-a/spec-type: verify using type 'name' INFO /spec2/keys-at-most-one:/spec-info/dict/attributes/key-b: verify using type 'spec-attribute-value' -ERROR /spec2/keys-at-most-one:/spec-info/dict/attributes/key-b: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-at-most-one:/spec-info/dict/attributes/key-b: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-at-most-one:/spec-info/dict/attributes/key-b/spec-type: verify using type 'name' -INFO /spec2/keys-at-most-one:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/keys-at-most-one:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/keys-at-most-one:/spec-type: verify using type 'name' INFO /spec2/keys-exactly-one: verify using type 'root' INFO /spec2/keys-exactly-one:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1508,19 +1508,19 @@ INFO /spec2/keys-exactly-one:/links[1]/spec-key: verify using type 'name' INFO /spec2/keys-exactly-one:/links[1]/spec-value: verify using type 'name' INFO /spec2/keys-exactly-one:/type: verify using type 'name' INFO /spec2/keys-exactly-one: verify using type 'spec' -ERROR /spec2/keys-exactly-one: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/keys-exactly-one: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/keys-exactly-one:/spec-example: verify using type 'optional-str' INFO /spec2/keys-exactly-one:/spec-info: verify using type 'spec-info' INFO /spec2/keys-exactly-one:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/keys-exactly-one:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/keys-exactly-one:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/keys-exactly-one:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/keys-exactly-one:/spec-info/dict/attributes/key-a: verify using type 'spec-attribute-value' -ERROR /spec2/keys-exactly-one:/spec-info/dict/attributes/key-a: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-exactly-one:/spec-info/dict/attributes/key-a: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-exactly-one:/spec-info/dict/attributes/key-a/spec-type: verify using type 'name' INFO /spec2/keys-exactly-one:/spec-info/dict/attributes/key-b: verify using type 'spec-attribute-value' -ERROR /spec2/keys-exactly-one:/spec-info/dict/attributes/key-b: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/keys-exactly-one:/spec-info/dict/attributes/key-b: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/keys-exactly-one:/spec-info/dict/attributes/key-b/spec-type: verify using type 'name' -INFO /spec2/keys-exactly-one:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/keys-exactly-one:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/keys-exactly-one:/spec-type: verify using type 'name' INFO /spec2/must-be-true: verify using type 'root' INFO /spec2/must-be-true:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1534,11 +1534,11 @@ INFO /spec2/must-be-true:/links[0]/uid: verify using type 'uid' INFO /spec2/must-be-true:/links[0]: verify using type 'spec-member' INFO /spec2/must-be-true:/type: verify using type 'name' INFO /spec2/must-be-true: verify using type 'spec' -ERROR /spec2/must-be-true: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/must-be-true: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/must-be-true:/spec-example: verify using type 'optional-str' INFO /spec2/must-be-true:/spec-info: verify using type 'spec-info' INFO /spec2/must-be-true:/spec-info/bool: verify using type 'spec-bool' -ERROR /spec2/must-be-true:/spec-info/bool: missing required keys for type 'spec-bool': ['description'] +ERROR /spec2/must-be-true:/spec-info/bool: missing mandatory keys for type 'spec-bool': ['description'] INFO /spec2/must-be-true:/spec-info/bool/assert: verify using type 'bool' INFO /spec2/must-be-true:/spec-type: verify using type 'name' INFO /spec2/other-int: verify using type 'root' @@ -1553,11 +1553,11 @@ INFO /spec2/other-int:/links[0]/uid: verify using type 'uid' INFO /spec2/other-int:/links[0]: verify using type 'spec-member' INFO /spec2/other-int:/type: verify using type 'name' INFO /spec2/other-int: verify using type 'spec' -ERROR /spec2/other-int: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/other-int: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/other-int:/spec-example: verify using type 'optional-str' INFO /spec2/other-int:/spec-info: verify using type 'spec-info' INFO /spec2/other-int:/spec-info/int: verify using type 'spec-int' -ERROR /spec2/other-int:/spec-info/int: missing required keys for type 'spec-int': ['description'] +ERROR /spec2/other-int:/spec-info/int: missing mandatory keys for type 'spec-int': ['description'] INFO /spec2/other-int:/spec-type: verify using type 'name' INFO /spec2/some-bool: verify using type 'root' INFO /spec2/some-bool:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1571,11 +1571,11 @@ INFO /spec2/some-bool:/links[0]/uid: verify using type 'uid' INFO /spec2/some-bool:/links[0]: verify using type 'spec-member' INFO /spec2/some-bool:/type: verify using type 'name' INFO /spec2/some-bool: verify using type 'spec' -ERROR /spec2/some-bool: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-bool: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-bool:/spec-example: verify using type 'optional-str' INFO /spec2/some-bool:/spec-info: verify using type 'spec-info' INFO /spec2/some-bool:/spec-info/bool: verify using type 'spec-bool' -ERROR /spec2/some-bool:/spec-info/bool: missing required keys for type 'spec-bool': ['description'] +ERROR /spec2/some-bool:/spec-info/bool: missing mandatory keys for type 'spec-bool': ['description'] INFO /spec2/some-bool:/spec-type: verify using type 'name' INFO /spec2/some-dict: verify using type 'root' INFO /spec2/some-dict:/SPDX-License-Identifier: verify using type 'spdx-license-identifier' @@ -1589,16 +1589,16 @@ INFO /spec2/some-dict:/links[0]/uid: verify using type 'uid' INFO /spec2/some-dict:/links[0]: verify using type 'spec-member' INFO /spec2/some-dict:/type: verify using type 'name' INFO /spec2/some-dict: verify using type 'spec' -ERROR /spec2/some-dict: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-dict: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-dict:/spec-example: verify using type 'optional-str' INFO /spec2/some-dict:/spec-info: verify using type 'spec-info' INFO /spec2/some-dict:/spec-info/dict: verify using type 'spec-dict' -ERROR /spec2/some-dict:/spec-info/dict: missing required keys for type 'spec-dict': ['description'] +ERROR /spec2/some-dict:/spec-info/dict: missing mandatory keys for type 'spec-dict': ['description'] INFO /spec2/some-dict:/spec-info/dict/attributes: verify using type 'spec-attributes' INFO /spec2/some-dict:/spec-info/dict/attributes/a: verify using type 'spec-attribute-value' -ERROR /spec2/some-dict:/spec-info/dict/attributes/a: missing required keys for type 'spec-attribute-value': ['description'] +ERROR /spec2/some-dict:/spec-info/dict/attributes/a: missing mandatory keys for type 'spec-attribute-value': ['description'] INFO /spec2/some-dict:/spec-info/dict/attributes/a/spec-type: verify using type 'name' -INFO /spec2/some-dict:/spec-info/dict/required-attributes: verify using type 'spec-required-attributes' +INFO /spec2/some-dict:/spec-info/dict/mandatory-attributes: verify using type 'spec-mandatory-attributes' INFO /spec2/some-dict:/spec-info/none: verify using type 'none' INFO /spec2/some-dict:/spec-type: verify using type 'name' INFO /spec2/some-float: verify using type 'root' @@ -1613,11 +1613,11 @@ INFO /spec2/some-float:/links[0]/uid: verify using type 'uid' INFO /spec2/some-float:/links[0]: verify using type 'spec-member' INFO /spec2/some-float:/type: verify using type 'name' INFO /spec2/some-float: verify using type 'spec' -ERROR /spec2/some-float: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-float: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-float:/spec-example: verify using type 'optional-str' INFO /spec2/some-float:/spec-info: verify using type 'spec-info' INFO /spec2/some-float:/spec-info/float: verify using type 'spec-float' -ERROR /spec2/some-float:/spec-info/float: missing required keys for type 'spec-float': ['description'] +ERROR /spec2/some-float:/spec-info/float: missing mandatory keys for type 'spec-float': ['description'] INFO /spec2/some-float:/spec-info/float/assert: verify using type 'spec-assert-float' INFO /spec2/some-float:/spec-info/float/assert[0]: verify using type 'spec-assert-float' INFO /spec2/some-float:/spec-info/float/assert[0]/le: verify using type 'float' @@ -1634,11 +1634,11 @@ INFO /spec2/some-int:/links[0]/uid: verify using type 'uid' INFO /spec2/some-int:/links[0]: verify using type 'spec-member' INFO /spec2/some-int:/type: verify using type 'name' INFO /spec2/some-int: verify using type 'spec' -ERROR /spec2/some-int: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-int: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-int:/spec-example: verify using type 'optional-str' INFO /spec2/some-int:/spec-info: verify using type 'spec-info' INFO /spec2/some-int:/spec-info/int: verify using type 'spec-int' -ERROR /spec2/some-int:/spec-info/int: missing required keys for type 'spec-int': ['description'] +ERROR /spec2/some-int:/spec-info/int: missing mandatory keys for type 'spec-int': ['description'] INFO /spec2/some-int:/spec-info/int/assert: verify using type 'spec-assert-int' INFO /spec2/some-int:/spec-info/int/assert[0]: verify using type 'spec-assert-int' INFO /spec2/some-int:/spec-info/int/assert[0]/and: verify using type 'spec-assert-int-list' @@ -1710,11 +1710,11 @@ INFO /spec2/some-list:/links[0]/uid: verify using type 'uid' INFO /spec2/some-list:/links[0]: verify using type 'spec-member' INFO /spec2/some-list:/type: verify using type 'name' INFO /spec2/some-list: verify using type 'spec' -ERROR /spec2/some-list: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-list: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-list:/spec-example: verify using type 'optional-str' INFO /spec2/some-list:/spec-info: verify using type 'spec-info' INFO /spec2/some-list:/spec-info/list: verify using type 'spec-list' -ERROR /spec2/some-list:/spec-info/list: missing required keys for type 'spec-list': ['description'] +ERROR /spec2/some-list:/spec-info/list: missing mandatory keys for type 'spec-list': ['description'] INFO /spec2/some-list:/spec-info/list/spec-type: verify using type 'name' INFO /spec2/some-list:/spec-type: verify using type 'name' INFO /spec2/some-str: verify using type 'root' @@ -1729,11 +1729,11 @@ INFO /spec2/some-str:/links[0]/uid: verify using type 'uid' INFO /spec2/some-str:/links[0]: verify using type 'spec-member' INFO /spec2/some-str:/type: verify using type 'name' INFO /spec2/some-str: verify using type 'spec' -ERROR /spec2/some-str: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/some-str: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/some-str:/spec-example: verify using type 'optional-str' INFO /spec2/some-str:/spec-info: verify using type 'spec-info' INFO /spec2/some-str:/spec-info/str: verify using type 'spec-str' -ERROR /spec2/some-str:/spec-info/str: missing required keys for type 'spec-str': ['description'] +ERROR /spec2/some-str:/spec-info/str: missing mandatory keys for type 'spec-str': ['description'] INFO /spec2/some-str:/spec-info/str/assert: verify using type 'spec-assert-str' INFO /spec2/some-str:/spec-info/str/assert[0]: verify using type 'spec-assert-str' INFO /spec2/some-str:/spec-info/str/assert[0]/uid: verify using type 'none' @@ -1752,7 +1752,7 @@ INFO /spec2/sta:/enabled-by: verify using type 'enabled-by' INFO /spec2/sta:/links: verify using type 'links' INFO /spec2/sta:/type: verify using type 'name' INFO /spec2/sta: verify using type 'spec' -ERROR /spec2/sta: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/sta: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/sta:/spec-example: verify using type 'optional-str' INFO /spec2/sta:/spec-info: verify using type 'spec-info' ERROR /spec2/sta:/spec-info: not at least one key out of ['bool', 'dict', 'float', 'int', 'list', 'none', 'str'] is present for type 'spec-info' @@ -1769,11 +1769,11 @@ INFO /spec2/str-contains:/links[0]/uid: verify using type 'uid' INFO /spec2/str-contains:/links[0]: verify using type 'spec-member' INFO /spec2/str-contains:/type: verify using type 'name' INFO /spec2/str-contains: verify using type 'spec' -ERROR /spec2/str-contains: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/str-contains: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/str-contains:/spec-example: verify using type 'optional-str' INFO /spec2/str-contains:/spec-info: verify using type 'spec-info' INFO /spec2/str-contains:/spec-info/str: verify using type 'spec-str' -ERROR /spec2/str-contains:/spec-info/str: missing required keys for type 'spec-str': ['description'] +ERROR /spec2/str-contains:/spec-info/str: missing mandatory keys for type 'spec-str': ['description'] INFO /spec2/str-contains:/spec-info/str/assert: verify using type 'spec-assert-str' INFO /spec2/str-contains:/spec-info/str/assert/and: verify using type 'spec-assert-str-list' INFO /spec2/str-contains:/spec-info/str/assert/and[0]: verify using type 'spec-assert-str' @@ -1797,11 +1797,11 @@ INFO /spec2/x:/links[0]/uid: verify using type 'uid' INFO /spec2/x:/links[0]: verify using type 'spec-member' INFO /spec2/x:/type: verify using type 'name' INFO /spec2/x: verify using type 'spec' -ERROR /spec2/x: missing required keys for type 'spec': ['spec-description', 'spec-name'] +ERROR /spec2/x: missing mandatory keys for type 'spec': ['spec-description', 'spec-name'] INFO /spec2/x:/spec-example: verify using type 'optional-str' INFO /spec2/x:/spec-info: verify using type 'spec-info' INFO /spec2/x:/spec-info/str: verify using type 'spec-str' -ERROR /spec2/x:/spec-info/str: missing required keys for type 'spec-str': ['description'] +ERROR /spec2/x:/spec-info/str: missing mandatory keys for type 'spec-str': ['description'] INFO /spec2/x:/spec-info/str/assert: verify using type 'spec-assert-str' INFO /spec2/x:/spec-info/str/assert/eq: verify using type 'str' INFO /spec2/x:/spec-type: verify using type 'name' diff --git a/spec/spec/appl-config-group-member.yml b/spec/spec/appl-config-group-member.yml index 954bd36f..3c40703f 100644 --- a/spec/spec/appl-config-group-member.yml +++ b/spec/spec/appl-config-group-member.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the application configuration group membership role of links. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Group Member Link Role spec-type: appl-config-group-member type: spec diff --git a/spec/spec/appl-config-group.yml b/spec/spec/appl-config-group.yml index 03e62449..b7e72f45 100644 --- a/spec/spec/appl-config-group.yml +++ b/spec/spec/appl-config-group.yml @@ -30,7 +30,7 @@ spec-info: spec-type: requirement-text description: | This set of attributes specifies an application configuration group. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Group Item Type spec-type: appl-config-group type: spec diff --git a/spec/spec/appl-config-option-constraints.yml b/spec/spec/appl-config-option-constraints.yml index 1e33835a..0fde7a94 100644 --- a/spec/spec/appl-config-option-constraints.yml +++ b/spec/spec/appl-config-option-constraints.yml @@ -35,7 +35,7 @@ spec-info: This set of attributes defines application configuration option constraints. Additional constraints can be added through the links of the item using the ${constraint-role:/spec-name}. - required-attributes: none + mandatory-attributes: none spec-name: Application Configuration Option Constraint Set spec-type: appl-config-option-constraints type: spec diff --git a/spec/spec/appl-config-option-feature-enable.yml b/spec/spec/appl-config-option-feature-enable.yml index 024bac46..d7b37088 100644 --- a/spec/spec/appl-config-option-feature-enable.yml +++ b/spec/spec/appl-config-option-feature-enable.yml @@ -17,7 +17,7 @@ spec-info: description: | This set of attributes specifies an application configuration feature enable option. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Feature Enable Option Item Type spec-type: appl-config-option-feature-enable type: spec diff --git a/spec/spec/appl-config-option-feature.yml b/spec/spec/appl-config-option-feature.yml index b4ecdcfa..a54154ae 100644 --- a/spec/spec/appl-config-option-feature.yml +++ b/spec/spec/appl-config-option-feature.yml @@ -22,7 +22,7 @@ spec-info: description: | This set of attributes specifies an application configuration feature option. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Feature Option Item Type spec-type: appl-config-option-feature type: spec diff --git a/spec/spec/appl-config-option-value.yml b/spec/spec/appl-config-option-value.yml index 7842d2bb..96abef0d 100644 --- a/spec/spec/appl-config-option-value.yml +++ b/spec/spec/appl-config-option-value.yml @@ -29,7 +29,7 @@ spec-info: description: | This set of attributes specifies application configuration initializer or integer option. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Value Option Item Type spec-type: appl-config-option-value type: spec diff --git a/spec/spec/appl-config-option.yml b/spec/spec/appl-config-option.yml index 7759f408..f41bda80 100644 --- a/spec/spec/appl-config-option.yml +++ b/spec/spec/appl-config-option.yml @@ -42,7 +42,7 @@ spec-info: spec-type: requirement-text description: | This set of attributes specifies an application configuration option. - required-attributes: all + mandatory-attributes: all spec-name: Application Configuration Option Item Type spec-type: appl-config-option type: spec diff --git a/spec/spec/build-action-check-cc.yml b/spec/spec/build-action-check-cc.yml index 0b7796b1..b784c959 100644 --- a/spec/spec/build-action-check-cc.yml +++ b/spec/spec/build-action-check-cc.yml @@ -25,7 +25,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a check done using the C compiler. - required-attributes: all + mandatory-attributes: all spec-name: Build Option C Compiler Check Action spec-type: build-action-check-cc type: spec diff --git a/spec/spec/build-action-check-cxx.yml b/spec/spec/build-action-check-cxx.yml index 64699127..620254e1 100644 --- a/spec/spec/build-action-check-cxx.yml +++ b/spec/spec/build-action-check-cxx.yml @@ -25,7 +25,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a check done using the C++ compiler. - required-attributes: all + mandatory-attributes: all spec-name: Build Option C++ Compiler Check Action spec-type: build-action-check-cxx type: spec diff --git a/spec/spec/build-action-set-test-state.yml b/spec/spec/build-action-set-test-state.yml index 28aa0894..c630c8f8 100644 --- a/spec/spec/build-action-set-test-state.yml +++ b/spec/spec/build-action-set-test-state.yml @@ -20,7 +20,7 @@ spec-info: of items, there is no way to check if the name specified by the attribute key is valid. spec-type: build-test-state - required-attributes: all + mandatory-attributes: all spec-name: Build Option Set Test State Action spec-type: build-action-set-test-state type: spec diff --git a/spec/spec/build-action.yml b/spec/spec/build-action.yml index 462e03f6..1b3302e5 100644 --- a/spec/spec/build-action.yml +++ b/spec/spec/build-action.yml @@ -219,7 +219,7 @@ spec-info: spec-type: none description: | This set of attributes specifies a build option action. - required-attributes: exactly-one + mandatory-attributes: exactly-one spec-name: Build Option Action spec-type: build-action type: spec diff --git a/spec/spec/build-ada-test-program.yml b/spec/spec/build-ada-test-program.yml index 2425f858..21518735 100644 --- a/spec/spec/build-ada-test-program.yml +++ b/spec/spec/build-ada-test-program.yml @@ -89,7 +89,7 @@ spec-info: ``enabled-by`` attribute value which is controlled by the option action :ref:`set-test-state <SpecTypeBuildOptionItemType>`. If the test state is set to ``exclude``, then the test program is not built. - required-attributes: all + mandatory-attributes: all spec-name: Build Ada Test Program Item Type spec-type: build-ada-test-program type: spec diff --git a/spec/spec/build-bsp.yml b/spec/spec/build-bsp.yml index 3660da67..4258d08f 100644 --- a/spec/spec/build-bsp.yml +++ b/spec/spec/build-bsp.yml @@ -82,7 +82,7 @@ spec-info: spec-type: build-source-list description: | This set of attributes specifies a base BSP variant to build. - required-attributes: all + mandatory-attributes: all spec-name: Build BSP Item Type spec-type: build-bsp type: spec diff --git a/spec/spec/build-config-file.yml b/spec/spec/build-config-file.yml index ed050b68..ca196778 100644 --- a/spec/spec/build-config-file.yml +++ b/spec/spec/build-config-file.yml @@ -45,7 +45,7 @@ spec-info: This set of attributes specifies a configuration file placed in the build tree. The configuration file is generated during the configure command execution and are placed in the build tree. - required-attributes: all + mandatory-attributes: all spec-name: Build Configuration File Item Type spec-type: build-config-file type: spec diff --git a/spec/spec/build-config-header.yml b/spec/spec/build-config-header.yml index 98a332a2..647f847c 100644 --- a/spec/spec/build-config-header.yml +++ b/spec/spec/build-config-header.yml @@ -35,7 +35,7 @@ spec-info: written to the configuration header file during the configure command execution. To have all configuration defines from sibling items available it is recommended to link them in the proper order. - required-attributes: all + mandatory-attributes: all spec-name: Build Configuration Header Item Type spec-type: build-config-header type: spec diff --git a/spec/spec/build-default-by-variant.yml b/spec/spec/build-default-by-variant.yml index 4d37dda4..5a6e7fa4 100644 --- a/spec/spec/build-default-by-variant.yml +++ b/spec/spec/build-default-by-variant.yml @@ -21,7 +21,7 @@ spec-info: spec-type: list-str description: | This set of attributes specifies build option default values by variant. - required-attributes: all + mandatory-attributes: all spec-name: Build Option Default by Variant spec-type: build-default-by-variant type: spec diff --git a/spec/spec/build-dependency.yml b/spec/spec/build-dependency.yml index aecde8b0..9f12bb71 100644 --- a/spec/spec/build-dependency.yml +++ b/spec/spec/build-dependency.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the build dependency role of links. - required-attributes: all + mandatory-attributes: all spec-name: Build Dependency Link Role spec-type: build-dependency type: spec diff --git a/spec/spec/build-group.yml b/spec/spec/build-group.yml index c0dd1c63..643637d1 100644 --- a/spec/spec/build-group.yml +++ b/spec/spec/build-group.yml @@ -57,7 +57,7 @@ spec-info: items. The ``includes``, ``ldflags``, ``objects``, and ``use`` variables of the build item context are updated by the corresponding attributes of the build group. - required-attributes: all + mandatory-attributes: all spec-name: Build Group Item Type spec-type: build-group type: spec diff --git a/spec/spec/build-install.yml b/spec/spec/build-install.yml index 84e5f66b..cb6ce9bf 100644 --- a/spec/spec/build-install.yml +++ b/spec/spec/build-install.yml @@ -22,7 +22,7 @@ spec-info: spec-type: list-str description: | This set of attributes specifies files installed by a build item. - required-attributes: all + mandatory-attributes: all spec-name: Build Install Directive spec-type: build-install type: spec diff --git a/spec/spec/build-library.yml b/spec/spec/build-library.yml index a48644ac..de5cfe1a 100644 --- a/spec/spec/build-library.yml +++ b/spec/spec/build-library.yml @@ -65,7 +65,7 @@ spec-info: This set of attributes specifies a static library. Library items may use additional objects provided by ${build-objects:/spec-name} items through the build dependency links of the item. - required-attributes: all + mandatory-attributes: all spec-name: Build Library Item Type spec-type: build-library type: spec diff --git a/spec/spec/build-objects.yml b/spec/spec/build-objects.yml index 2192cb07..0453619d 100644 --- a/spec/spec/build-objects.yml +++ b/spec/spec/build-objects.yml @@ -55,7 +55,7 @@ spec-info: description: | This set of attributes specifies a set of object files used to build static libraries or test programs. - required-attributes: all + mandatory-attributes: all spec-name: Build Objects Item Type spec-type: build-objects type: spec diff --git a/spec/spec/build-option.yml b/spec/spec/build-option.yml index b05275aa..86384b8f 100644 --- a/spec/spec/build-option.yml +++ b/spec/spec/build-option.yml @@ -72,7 +72,7 @@ spec-info: spec-type: build-option-name description: | This set of attributes specifies a build option. - required-attributes: + mandatory-attributes: - actions - default - default-by-variant diff --git a/spec/spec/build-script.yml b/spec/spec/build-script.yml index dcbe498c..9cce6f03 100644 --- a/spec/spec/build-script.yml +++ b/spec/spec/build-script.yml @@ -100,7 +100,7 @@ spec-info: description: | This set of attributes specifies a build script. The optional attributes may be required by commands executed through the scripts. - required-attributes: + mandatory-attributes: - do-build - do-configure - prepare-build diff --git a/spec/spec/build-start-file.yml b/spec/spec/build-start-file.yml index d82722bf..b79db900 100644 --- a/spec/spec/build-start-file.yml +++ b/spec/spec/build-start-file.yml @@ -49,7 +49,7 @@ spec-info: description: | This set of attributes specifies a start file to build. A start file is used to link an executable. - required-attributes: all + mandatory-attributes: all spec-name: Build Start File Item Type spec-type: build-start-file type: spec diff --git a/spec/spec/build-test-program.yml b/spec/spec/build-test-program.yml index f2fc4d0d..0f96964b 100644 --- a/spec/spec/build-test-program.yml +++ b/spec/spec/build-test-program.yml @@ -77,7 +77,7 @@ spec-info: ``enabled-by`` attribute value which is controlled by the option action :ref:`set-test-state <SpecTypeBuildOptionItemType>`. If the test state is set to ``exclude``, then the test program is not built. - required-attributes: all + mandatory-attributes: all spec-name: Build Test Program Item Type spec-type: build-test-program type: spec diff --git a/spec/spec/build.yml b/spec/spec/build.yml index d91deb8e..4dce73a0 100644 --- a/spec/spec/build.yml +++ b/spec/spec/build.yml @@ -20,7 +20,7 @@ spec-info: spec-type: name description: | This set of attributes specifies a build item. - required-attributes: all + mandatory-attributes: all spec-name: Build Item Type spec-type: build type: spec diff --git a/spec/spec/constraint-role.yml b/spec/spec/constraint-role.yml index c57cf17f..3ceb60fd 100644 --- a/spec/spec/constraint-role.yml +++ b/spec/spec/constraint-role.yml @@ -17,7 +17,7 @@ spec-info: description: | It defines the constraint role of links. The link target shall be a constraint. - required-attributes: all + mandatory-attributes: all spec-name: Constraint Link Role spec-type: constraint-role type: spec diff --git a/spec/spec/constraint.yml b/spec/spec/constraint.yml index aa00f51f..07670b74 100644 --- a/spec/spec/constraint.yml +++ b/spec/spec/constraint.yml @@ -29,7 +29,7 @@ spec-info: spec-type: requirement-text description: | This set of attributes specifies a constraint. - required-attributes: all + mandatory-attributes: all spec-name: Constraint Item Type spec-type: constraint type: spec diff --git a/spec/spec/enabled-by.yml b/spec/spec/enabled-by.yml index ec13804f..c88d74e4 100644 --- a/spec/spec/enabled-by.yml +++ b/spec/spec/enabled-by.yml @@ -38,7 +38,7 @@ spec-info: spec-type: enabled-by-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation diff --git a/spec/spec/glossary-group.yml b/spec/spec/glossary-group.yml index 305d6152..6f8ea05a 100644 --- a/spec/spec/glossary-group.yml +++ b/spec/spec/glossary-group.yml @@ -24,7 +24,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a glossary group. - required-attributes: all + mandatory-attributes: all spec-name: Glossary Group Item Type spec-type: glossary-group type: spec diff --git a/spec/spec/glossary-member.yml b/spec/spec/glossary-member.yml index 7c91beb4..6220f7a9 100644 --- a/spec/spec/glossary-member.yml +++ b/spec/spec/glossary-member.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the glossary membership role of links. - required-attributes: all + mandatory-attributes: all spec-name: Glossary Membership Link Role spec-type: glossary-member type: spec diff --git a/spec/spec/glossary-term.yml b/spec/spec/glossary-term.yml index c6493fc8..9e6473b9 100644 --- a/spec/spec/glossary-term.yml +++ b/spec/spec/glossary-term.yml @@ -24,7 +24,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a glossary term. - required-attributes: all + mandatory-attributes: all spec-name: Glossary Term Item Type spec-type: glossary-term type: spec diff --git a/spec/spec/glossary.yml b/spec/spec/glossary.yml index d3a9e134..831564b2 100644 --- a/spec/spec/glossary.yml +++ b/spec/spec/glossary.yml @@ -20,7 +20,7 @@ spec-info: spec-type: name description: | This set of attributes specifies a glossary item. - required-attributes: all + mandatory-attributes: all spec-name: Glossary Item Type spec-type: glossary type: spec diff --git a/spec/spec/interface-compound.yml b/spec/spec/interface-compound.yml index f277756a..a1fdc123 100644 --- a/spec/spec/interface-compound.yml +++ b/spec/spec/interface-compound.yml @@ -39,7 +39,7 @@ spec-info: spec-type: interface-notes description: | This set of attributes specifies a compound (struct or union). - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Item Type spec-type: interface-compound type: spec diff --git a/spec/spec/interface-container.yml b/spec/spec/interface-container.yml index 9f59b8ec..be98c68e 100644 --- a/spec/spec/interface-container.yml +++ b/spec/spec/interface-container.yml @@ -19,7 +19,7 @@ spec-info: exactly one link with the ${interface-placement:/spec-name} to an ${interface-domain:/spec-name} item. This link defines the interface domain of the container. - required-attributes: all + mandatory-attributes: all spec-name: Interface Container Item Type spec-type: interface-container type: spec diff --git a/spec/spec/interface-define.yml b/spec/spec/interface-define.yml index a8aefc12..ccd8718f 100644 --- a/spec/spec/interface-define.yml +++ b/spec/spec/interface-define.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-notes description: | This set of attributes specifies a define. - required-attributes: all + mandatory-attributes: all spec-name: Interface Define Item Type spec-type: interface-define type: spec diff --git a/spec/spec/interface-definition-directive.yml b/spec/spec/interface-definition-directive.yml index 7112bc52..d5fe46cb 100644 --- a/spec/spec/interface-definition-directive.yml +++ b/spec/spec/interface-definition-directive.yml @@ -20,7 +20,7 @@ spec-info: spec-type: interface-definition-variant-list description: | This set of attributes specifies an interface definition directive. - required-attributes: all + mandatory-attributes: all spec-name: Interface Definition Directive spec-type: interface-definition-directive type: spec diff --git a/spec/spec/interface-definition-variant.yml b/spec/spec/interface-definition-variant.yml index 56baf89f..02276c5e 100644 --- a/spec/spec/interface-definition-variant.yml +++ b/spec/spec/interface-definition-variant.yml @@ -21,7 +21,7 @@ spec-info: spec-type: interface-enabled-by description: | This set of attributes specifies an interface definition variant. - required-attributes: all + mandatory-attributes: all spec-name: Interface Definition Variant spec-type: interface-definition-variant type: spec diff --git a/spec/spec/interface-domain.yml b/spec/spec/interface-domain.yml index 0ea33efa..143e0b8c 100644 --- a/spec/spec/interface-domain.yml +++ b/spec/spec/interface-domain.yml @@ -27,7 +27,7 @@ spec-info: ${interface-container:/spec-name} and ${interface-header-file:/spec-name} are placed into domains through links with the ${interface-placement:/spec-name}. - required-attributes: all + mandatory-attributes: all spec-name: Interface Domain Item Type spec-type: interface-domain type: spec diff --git a/spec/spec/interface-enabled-by.yml b/spec/spec/interface-enabled-by.yml index 8863269b..9c0798ec 100644 --- a/spec/spec/interface-enabled-by.yml +++ b/spec/spec/interface-enabled-by.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-enabled-by-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | It defines a *logical or* of the expressions in the list. diff --git a/spec/spec/interface-enum.yml b/spec/spec/interface-enum.yml index 38430703..0a7c3e57 100644 --- a/spec/spec/interface-enum.yml +++ b/spec/spec/interface-enum.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-description description: | This set of attributes specifies an enum. - required-attributes: all + mandatory-attributes: all spec-name: Interface Enum Item Type spec-type: interface-enum type: spec diff --git a/spec/spec/interface-enumerator-role.yml b/spec/spec/interface-enumerator-role.yml index 7fab2799..1bfa32c9 100644 --- a/spec/spec/interface-enumerator-role.yml +++ b/spec/spec/interface-enumerator-role.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the interface enumerator role of links. - required-attributes: all + mandatory-attributes: all spec-name: Interface Enumerator Link Role spec-type: interface-enumerator-role type: spec diff --git a/spec/spec/interface-enumerator.yml b/spec/spec/interface-enumerator.yml index 1743ed55..3b7b60b7 100644 --- a/spec/spec/interface-enumerator.yml +++ b/spec/spec/interface-enumerator.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-notes description: | This set of attributes specifies an enumerator. - required-attributes: all + mandatory-attributes: all spec-name: Interface Enumerator Item Type spec-type: interface-enumerator type: spec diff --git a/spec/spec/interface-forward-declaration.yml b/spec/spec/interface-forward-declaration.yml index de6e1562..ab180f04 100644 --- a/spec/spec/interface-forward-declaration.yml +++ b/spec/spec/interface-forward-declaration.yml @@ -19,7 +19,7 @@ spec-info: exactly one link with the ${interface-target:/spec-name} to an ${interface-compound:/spec-name} item. This link defines the type declared by the forward declaration. - required-attributes: all + mandatory-attributes: all spec-name: Interface Forward Declaration Item Type spec-type: interface-forward-declaration type: spec diff --git a/spec/spec/interface-function-definition-directive.yml b/spec/spec/interface-function-definition-directive.yml index d7258990..b7f1f87d 100644 --- a/spec/spec/interface-function-definition-directive.yml +++ b/spec/spec/interface-function-definition-directive.yml @@ -20,7 +20,7 @@ spec-info: spec-type: interface-function-definition-variant-list description: | This set of attributes specifies a function definition directive. - required-attributes: all + mandatory-attributes: all spec-name: Interface Function Definition Directive spec-type: interface-function-definition-directive type: spec diff --git a/spec/spec/interface-function-definition-variant.yml b/spec/spec/interface-function-definition-variant.yml index ab9fdaca..167ed8ff 100644 --- a/spec/spec/interface-function-definition-variant.yml +++ b/spec/spec/interface-function-definition-variant.yml @@ -21,7 +21,7 @@ spec-info: spec-type: interface-enabled-by description: | This set of attributes specifies a function definition variant. - required-attributes: all + mandatory-attributes: all spec-name: Interface Function Definition Variant spec-type: interface-function-definition-variant type: spec diff --git a/spec/spec/interface-function-definition.yml b/spec/spec/interface-function-definition.yml index 1d05127d..c4297969 100644 --- a/spec/spec/interface-function-definition.yml +++ b/spec/spec/interface-function-definition.yml @@ -30,7 +30,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a function definition. - required-attributes: all + mandatory-attributes: all spec-name: Interface Function Definition spec-type: interface-function-definition type: spec diff --git a/spec/spec/interface-function.yml b/spec/spec/interface-function.yml index 21e7e846..f1916752 100644 --- a/spec/spec/interface-function.yml +++ b/spec/spec/interface-function.yml @@ -38,7 +38,7 @@ spec-info: spec-type: interface-return-directive description: | This set of attributes specifies a function. - required-attributes: all + mandatory-attributes: all spec-name: Interface Function Item Type spec-type: interface-function type: spec diff --git a/spec/spec/interface-group.yml b/spec/spec/interface-group.yml index ee6c3c2c..8710d42a 100644 --- a/spec/spec/interface-group.yml +++ b/spec/spec/interface-group.yml @@ -29,7 +29,7 @@ spec-info: spec-type: str description: | This set of attributes specifies an interface group. - required-attributes: all + mandatory-attributes: all spec-name: Interface Group Item Type spec-type: interface-group type: spec diff --git a/spec/spec/interface-header-file.yml b/spec/spec/interface-header-file.yml index f7965150..d6b10e89 100644 --- a/spec/spec/interface-header-file.yml +++ b/spec/spec/interface-header-file.yml @@ -29,7 +29,7 @@ spec-info: exactly one link with the ${interface-placement:/spec-name} to an ${interface-domain:/spec-name} item. This link defines the interface domain of the header file. - required-attributes: all + mandatory-attributes: all spec-name: Interface Header File Item Type spec-type: interface-header-file type: spec diff --git a/spec/spec/interface-include.yml b/spec/spec/interface-include.yml index 30524426..13fc0040 100644 --- a/spec/spec/interface-include.yml +++ b/spec/spec/interface-include.yml @@ -23,7 +23,7 @@ spec-info: It defines the interface include role of links and is used to indicate that an interface container includes another interface container. For example, one header file includes another header file. - required-attributes: all + mandatory-attributes: all spec-name: Interface Include Link Role spec-type: interface-include type: spec diff --git a/spec/spec/interface-ingroup.yml b/spec/spec/interface-ingroup.yml index 98b5e09c..f55e8ab4 100644 --- a/spec/spec/interface-ingroup.yml +++ b/spec/spec/interface-ingroup.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the interface group membership role of links. - required-attributes: all + mandatory-attributes: all spec-name: Interface Group Membership Link Role spec-type: interface-ingroup type: spec diff --git a/spec/spec/interface-macro.yml b/spec/spec/interface-macro.yml index d67624a2..69bf9998 100644 --- a/spec/spec/interface-macro.yml +++ b/spec/spec/interface-macro.yml @@ -38,7 +38,7 @@ spec-info: spec-type: interface-return-directive description: | This set of attributes specifies a macro. - required-attributes: all + mandatory-attributes: all spec-name: Interface Macro Item Type spec-type: interface-macro type: spec diff --git a/spec/spec/interface-member-compound.yml b/spec/spec/interface-member-compound.yml index 1322f22d..aff80d65 100644 --- a/spec/spec/interface-member-compound.yml +++ b/spec/spec/interface-member-compound.yml @@ -23,7 +23,7 @@ spec-info: spec-type: interface-member-definition-directive-list description: | This set of attributes specifies an interface compound member compound. - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Member Compound spec-type: interface-member-compound type: spec diff --git a/spec/spec/interface-member-declaration.yml b/spec/spec/interface-member-declaration.yml index 763e5f08..c119b765 100644 --- a/spec/spec/interface-member-declaration.yml +++ b/spec/spec/interface-member-declaration.yml @@ -23,7 +23,7 @@ spec-info: description: | This set of attributes specifies an interface compound member declaration. - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Member Declaration spec-type: interface-member-declaration type: spec diff --git a/spec/spec/interface-member-definition-directive.yml b/spec/spec/interface-member-definition-directive.yml index 8193d0ee..1e17e577 100644 --- a/spec/spec/interface-member-definition-directive.yml +++ b/spec/spec/interface-member-definition-directive.yml @@ -21,7 +21,7 @@ spec-info: description: | This set of attributes specifies an interface compound member definition directive. - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Member Definition Directive spec-type: interface-member-definition-directive type: spec diff --git a/spec/spec/interface-member-definition-variant.yml b/spec/spec/interface-member-definition-variant.yml index 4f215656..3cd15a58 100644 --- a/spec/spec/interface-member-definition-variant.yml +++ b/spec/spec/interface-member-definition-variant.yml @@ -22,7 +22,7 @@ spec-info: description: | This set of attributes specifies an interface compound member definition variant. - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Member Definition Variant spec-type: interface-member-definition-variant type: spec diff --git a/spec/spec/interface-member-definition.yml b/spec/spec/interface-member-definition.yml index 5833cec0..2f8be1fe 100644 --- a/spec/spec/interface-member-definition.yml +++ b/spec/spec/interface-member-definition.yml @@ -26,7 +26,7 @@ spec-info: spec-type: str description: | This set of attributes specifies an interface compound member definition. - required-attributes: all + mandatory-attributes: all spec-name: Interface Compound Member Definition spec-type: interface-member-definition type: spec diff --git a/spec/spec/interface-param.yml b/spec/spec/interface-param.yml index f0fada59..cb822665 100644 --- a/spec/spec/interface-param.yml +++ b/spec/spec/interface-param.yml @@ -22,7 +22,7 @@ spec-info: spec-type: str description: | This set of attributes specifies an interface parameter. - required-attributes: all + mandatory-attributes: all spec-name: Interface Parameter spec-type: interface-param type: spec diff --git a/spec/spec/interface-placement.yml b/spec/spec/interface-placement.yml index f1c72fb5..b8c6f6f7 100644 --- a/spec/spec/interface-placement.yml +++ b/spec/spec/interface-placement.yml @@ -18,7 +18,7 @@ spec-info: It defines the interface placement role of links. It is used to indicate that an interface definition is placed into an interface container, for example a header file. - required-attributes: all + mandatory-attributes: all spec-name: Interface Placement Link Role spec-type: interface-placement type: spec diff --git a/spec/spec/interface-return-directive.yml b/spec/spec/interface-return-directive.yml index 66182f6a..5fe3f6f7 100644 --- a/spec/spec/interface-return-directive.yml +++ b/spec/spec/interface-return-directive.yml @@ -19,7 +19,7 @@ spec-info: spec-type: interface-return-value-list description: | This set of attributes specifies an interface return. - required-attributes: all + mandatory-attributes: all spec-name: Interface Return Directive spec-type: interface-return-directive type: spec diff --git a/spec/spec/interface-return-value.yml b/spec/spec/interface-return-value.yml index 800917b3..c479c987 100644 --- a/spec/spec/interface-return-value.yml +++ b/spec/spec/interface-return-value.yml @@ -19,7 +19,7 @@ spec-info: spec-type: bool-or-int-or-str description: | This set of attributes specifies an interface return value. - required-attributes: all + mandatory-attributes: all spec-name: Interface Return Value spec-type: interface-return-value type: spec diff --git a/spec/spec/interface-target.yml b/spec/spec/interface-target.yml index 4fc4db68..94cae816 100644 --- a/spec/spec/interface-target.yml +++ b/spec/spec/interface-target.yml @@ -17,7 +17,7 @@ spec-info: description: | It defines the interface target role of links. It is used for interface forward declarations. - required-attributes: all + mandatory-attributes: all spec-name: Interface Target Link Role spec-type: interface-target type: spec diff --git a/spec/spec/interface-typedef.yml b/spec/spec/interface-typedef.yml index 28218330..c066a22b 100644 --- a/spec/spec/interface-typedef.yml +++ b/spec/spec/interface-typedef.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-notes description: | This set of attributes specifies a typedef. - required-attributes: all + mandatory-attributes: all spec-name: Interface Typedef Item Type spec-type: interface-typedef type: spec diff --git a/spec/spec/interface-unspecified.yml b/spec/spec/interface-unspecified.yml index 7d82ab54..41d5482d 100644 --- a/spec/spec/interface-unspecified.yml +++ b/spec/spec/interface-unspecified.yml @@ -20,7 +20,7 @@ spec-info: spec-type: str description: | This set of attributes specifies an unspecified interface. - required-attributes: all + mandatory-attributes: all spec-name: Interface Unspecified Item Type spec-type: interface-unspecified type: spec diff --git a/spec/spec/interface-variable.yml b/spec/spec/interface-variable.yml index b727327f..c57da662 100644 --- a/spec/spec/interface-variable.yml +++ b/spec/spec/interface-variable.yml @@ -32,7 +32,7 @@ spec-info: spec-type: interface-notes description: | This set of attributes specifies a variable. - required-attributes: all + mandatory-attributes: all spec-name: Interface Variable Item Type spec-type: interface-variable type: spec diff --git a/spec/spec/interface.yml b/spec/spec/interface.yml index d975a949..e8bfed2c 100644 --- a/spec/spec/interface.yml +++ b/spec/spec/interface.yml @@ -25,7 +25,7 @@ spec-info: ${interface-domain:/spec-name} items to specify interface domains, for example the ${/glossary/api:/term}, C language, compiler, interfaces to the implementation, and the hardware. - required-attributes: all + mandatory-attributes: all spec-name: Interface Item Type spec-type: interface type: spec diff --git a/spec/spec/link.yml b/spec/spec/link.yml index d8378064..3c7fb5de 100644 --- a/spec/spec/link.yml +++ b/spec/spec/link.yml @@ -22,7 +22,7 @@ spec-info: This set of attributes specifies a link from one specification item to another specification item. The links in a list are ordered. The first link in the list is processed first. - required-attributes: all + mandatory-attributes: all spec-name: Link spec-type: link type: spec diff --git a/spec/spec/requirement-functional.yml b/spec/spec/requirement-functional.yml index 46ed7cd0..503909dc 100644 --- a/spec/spec/requirement-functional.yml +++ b/spec/spec/requirement-functional.yml @@ -20,7 +20,7 @@ spec-info: spec-type: requirement-functional-type description: | This set of attributes specifies a functional requirement. - required-attributes: all + mandatory-attributes: all spec-name: Functional Requirement Item Type spec-type: requirement-functional type: spec diff --git a/spec/spec/requirement-non-functional.yml b/spec/spec/requirement-non-functional.yml index 410446bf..11bd5495 100644 --- a/spec/spec/requirement-non-functional.yml +++ b/spec/spec/requirement-non-functional.yml @@ -20,7 +20,7 @@ spec-info: spec-type: requirement-non-functional-type description: | This set of attributes specifies a non-functional requirement. - required-attributes: all + mandatory-attributes: all spec-name: Non-Functional Requirement Item Type spec-type: requirement-non-functional type: spec diff --git a/spec/spec/requirement-reference.yml b/spec/spec/requirement-reference.yml index 12a06a3d..599963a1 100644 --- a/spec/spec/requirement-reference.yml +++ b/spec/spec/requirement-reference.yml @@ -20,7 +20,7 @@ spec-info: spec-type: requirement-reference-type description: | This set of attributes specifies a requirement reference. - required-attributes: all + mandatory-attributes: all spec-name: Requirement Reference spec-type: requirement-reference type: spec diff --git a/spec/spec/requirement-refinement.yml b/spec/spec/requirement-refinement.yml index 7918bc8a..f5dc5d45 100644 --- a/spec/spec/requirement-refinement.yml +++ b/spec/spec/requirement-refinement.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the requirement refinement role of links. - required-attributes: all + mandatory-attributes: all spec-name: Requirement Refinement Link Role spec-type: requirement-refinement type: spec diff --git a/spec/spec/requirement-validation-role.yml b/spec/spec/requirement-validation-role.yml index ed948838..a2460ba4 100644 --- a/spec/spec/requirement-validation-role.yml +++ b/spec/spec/requirement-validation-role.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the requirement validation role of links. - required-attributes: all + mandatory-attributes: all spec-name: Requirement Validation Link Role spec-type: requirement-validation-role type: spec diff --git a/spec/spec/requirement-validation.yml b/spec/spec/requirement-validation.yml index 4b1bbf42..dadba7ad 100644 --- a/spec/spec/requirement-validation.yml +++ b/spec/spec/requirement-validation.yml @@ -37,7 +37,7 @@ spec-info: This set of attributes provides a requirement validation evidence. The item shall have exactly one link to the validated requirement with the ${requirement-validation-role:/spec-name}. - required-attributes: all + mandatory-attributes: all spec-name: Requirement Validation Item Type spec-type: requirement-validation type: spec diff --git a/spec/spec/requirement.yml b/spec/spec/requirement.yml index e241c001..3018b8c7 100644 --- a/spec/spec/requirement.yml +++ b/spec/spec/requirement.yml @@ -44,7 +44,7 @@ spec-info: spec-type: requirement-text description: | This set of attributes specifies a requirement. - required-attributes: all + mandatory-attributes: all spec-name: Requirement Item Type spec-type: requirement type: spec diff --git a/spec/spec/root.yml b/spec/spec/root.yml index b819dddf..58d65280 100644 --- a/spec/spec/root.yml +++ b/spec/spec/root.yml @@ -45,7 +45,7 @@ spec-info: use in tools. This is the root specification item type. - required-attributes: all + mandatory-attributes: all spec-name: Root Item Type spec-type: root type: spec diff --git a/spec/spec/spec-assert-float.yml b/spec/spec/spec-assert-float.yml index bad0bae5..fd6f2564 100644 --- a/spec/spec/spec-assert-float.yml +++ b/spec/spec/spec-assert-float.yml @@ -60,7 +60,7 @@ spec-info: spec-type: spec-assert-float-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation diff --git a/spec/spec/spec-assert-int.yml b/spec/spec/spec-assert-int.yml index de96df11..ec903b80 100644 --- a/spec/spec/spec-assert-int.yml +++ b/spec/spec/spec-assert-int.yml @@ -59,7 +59,7 @@ spec-info: spec-type: spec-assert-int-list description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation diff --git a/spec/spec/spec-assert-str.yml b/spec/spec/spec-assert-str.yml index 0ebd4779..915da6ed 100644 --- a/spec/spec/spec-assert-str.yml +++ b/spec/spec/spec-assert-str.yml @@ -83,7 +83,7 @@ spec-info: spec-type: none description: | Each attribute defines an operator. - required-attributes: exactly-one + mandatory-attributes: exactly-one list: description: | This list of expressions evaluates to the *logical or* of the evaluation diff --git a/spec/spec/spec-attribute-value.yml b/spec/spec/spec-attribute-value.yml index 3143ac08..d44e2256 100644 --- a/spec/spec/spec-attribute-value.yml +++ b/spec/spec/spec-attribute-value.yml @@ -20,7 +20,7 @@ spec-info: spec-type: name description: | This set of attributes specifies an attribute value. - required-attributes: all + mandatory-attributes: all spec-name: Specification Attribute Value spec-type: spec-attribute-value type: spec diff --git a/spec/spec/spec-attributes.yml b/spec/spec/spec-attributes.yml index e32b4139..4d4f1686 100644 --- a/spec/spec/spec-attributes.yml +++ b/spec/spec/spec-attributes.yml @@ -15,7 +15,7 @@ spec-info: description: | The generic attributes specify an attribute set. spec-type: spec-attribute-value - required-attributes: none + mandatory-attributes: none spec-name: Specification Attribute spec-type: spec-attributes type: spec diff --git a/spec/spec/spec-bool.yml b/spec/spec/spec-bool.yml index 2f45d243..e23f3b1f 100644 --- a/spec/spec/spec-bool.yml +++ b/spec/spec/spec-bool.yml @@ -26,7 +26,7 @@ spec-info: spec-type: optional-str description: | This attribute set specifies a boolean value. - required-attributes: + mandatory-attributes: - description spec-name: Specification Boolean Value spec-type: spec-bool diff --git a/spec/spec/spec-dict.yml b/spec/spec/spec-dict.yml index a3066f7a..d917c52e 100644 --- a/spec/spec/spec-dict.yml +++ b/spec/spec/spec-dict.yml @@ -12,8 +12,7 @@ spec-info: attributes: attributes: description: | - It shall be the specification of the set of explicitly defined - attributes. + It shall be the specification of the set of explicit attributes. spec-type: spec-attributes description: description: | @@ -24,16 +23,16 @@ spec-info: It shall be the specification of the generic attributes of the attribute set. spec-type: spec-generic-attributes - required-attributes: + mandatory-attributes: description: | - It shall be the set of required attributes of the attribute set. - spec-type: spec-required-attributes + It shall be the set of mandatory attributes of the attribute set. + spec-type: spec-mandatory-attributes description: | This set of attributes specifies a set of attributes. - required-attributes: + mandatory-attributes: - attributes - description - - required-attributes + - mandatory-attributes spec-name: Specification Attribute Set spec-type: spec-dict type: spec diff --git a/spec/spec/spec-float.yml b/spec/spec/spec-float.yml index 1fe07b2e..1f831eb8 100644 --- a/spec/spec/spec-float.yml +++ b/spec/spec/spec-float.yml @@ -23,7 +23,7 @@ spec-info: spec-type: optional-str description: | This set of attributes specifies a floating-point value. - required-attributes: + mandatory-attributes: - description spec-name: Specification Floating-Point Value spec-type: spec-float diff --git a/spec/spec/spec-generic-attributes.yml b/spec/spec/spec-generic-attributes.yml index 50765a48..50e89bc8 100644 --- a/spec/spec/spec-generic-attributes.yml +++ b/spec/spec/spec-generic-attributes.yml @@ -22,7 +22,7 @@ spec-info: This set of attributes specifies generic attributes. Generic attributes are attributes which are not explicitly defined. They are restricted to a uniform attribute value type. - required-attributes: all + mandatory-attributes: all spec-name: Specification Generic Attributes spec-type: spec-generic-attributes type: spec diff --git a/spec/spec/spec-info.yml b/spec/spec/spec-info.yml index e6ef4fa8..5bdbeee0 100644 --- a/spec/spec/spec-info.yml +++ b/spec/spec/spec-info.yml @@ -40,7 +40,7 @@ spec-info: spec-type: spec-str description: | This set of attributes specifies attribute values. - required-attributes: at-least-one + mandatory-attributes: at-least-one spec-name: Specification Information spec-type: spec-info type: spec diff --git a/spec/spec/spec-int.yml b/spec/spec/spec-int.yml index de158a89..080a3a9d 100644 --- a/spec/spec/spec-int.yml +++ b/spec/spec/spec-int.yml @@ -23,7 +23,7 @@ spec-info: spec-type: optional-str description: | This set of attributes specifies an integer value. - required-attributes: + mandatory-attributes: - description spec-name: Specification Integer Value spec-type: spec-int diff --git a/spec/spec/spec-list.yml b/spec/spec/spec-list.yml index 28ea4b89..b8f87807 100644 --- a/spec/spec/spec-list.yml +++ b/spec/spec/spec-list.yml @@ -20,7 +20,7 @@ spec-info: spec-type: name description: | This set of attributes specifies a list of attributes or values. - required-attributes: all + mandatory-attributes: all spec-name: Specification List spec-type: spec-list type: spec diff --git a/spec/spec/spec-required-attributes.yml b/spec/spec/spec-mandatory-attributes.yml index f2a6692b..700de958 100644 --- a/spec/spec/spec-required-attributes.yml +++ b/spec/spec/spec-mandatory-attributes.yml @@ -6,13 +6,12 @@ links: - role: spec-member uid: root spec-description: | - This attribute value defines which of the explicitly defined attributes are - required. + It defines which explicit attributes are mandatory. spec-example: null spec-info: list: description: | - This list defines the required attributes through their keys. + The list defines the mandatory attributes through their key names. spec-type: name str: assert: @@ -23,8 +22,9 @@ spec-info: - exactly-one - none description: | - This string defines the how many explicitly defined attributes are - required. -spec-name: Specification Required Attributes -spec-type: spec-required-attributes + It defines how many explicit attributes are mandatory. If `none` is + used, then none of the explicit attributes is mandatory, they are all + optional. +spec-name: Specification Mandatory Attributes +spec-type: spec-mandatory-attributes type: spec diff --git a/spec/spec/spec-member.yml b/spec/spec/spec-member.yml index 60f68a11..790500ef 100644 --- a/spec/spec/spec-member.yml +++ b/spec/spec/spec-member.yml @@ -16,7 +16,7 @@ spec-info: attributes: {} description: | It defines the specification membership role of links. - required-attributes: all + mandatory-attributes: all spec-name: Specification Member Link Role spec-type: spec-member type: spec diff --git a/spec/spec/spec-refinement.yml b/spec/spec/spec-refinement.yml index ec22d50d..8fd16da1 100644 --- a/spec/spec/spec-refinement.yml +++ b/spec/spec/spec-refinement.yml @@ -26,7 +26,7 @@ spec-info: spec-type: name description: | It defines the specification refinement role of links. - required-attributes: all + mandatory-attributes: all spec-name: Specification Refinement Link Role spec-type: spec-refinement type: spec diff --git a/spec/spec/spec-str.yml b/spec/spec/spec-str.yml index c0ed378e..f83dae5e 100644 --- a/spec/spec/spec-str.yml +++ b/spec/spec/spec-str.yml @@ -22,7 +22,7 @@ spec-info: spec-type: optional-str description: | This set of attributes specifies a string. - required-attributes: + mandatory-attributes: - description spec-name: Specification String Value spec-type: spec-str diff --git a/spec/spec/spec.yml b/spec/spec/spec.yml index 8a752f4a..e67e920e 100644 --- a/spec/spec/spec.yml +++ b/spec/spec/spec.yml @@ -37,7 +37,7 @@ spec-example: | spec-type: int description: | This set of attributes specifies an example. - required-attributes: all + mandatory-attributes: all spec-name: Example Item Type spec-type: spec type: spec @@ -66,7 +66,7 @@ spec-info: spec-type: name description: | This set of attributes specifies specification types. - required-attributes: all + mandatory-attributes: all spec-name: Specification Item Type spec-type: spec type: spec diff --git a/spec/spec/test-case-action.yml b/spec/spec/test-case-action.yml index 2dcedb61..46c3866d 100644 --- a/spec/spec/test-case-action.yml +++ b/spec/spec/test-case-action.yml @@ -26,7 +26,7 @@ spec-info: spec-type: links description: | This set of attributes specifies a test case action. - required-attributes: all + mandatory-attributes: all spec-name: Test Case Action spec-type: test-case-action type: spec diff --git a/spec/spec/test-case-check.yml b/spec/spec/test-case-check.yml index 47b4d912..ebe8c47b 100644 --- a/spec/spec/test-case-check.yml +++ b/spec/spec/test-case-check.yml @@ -23,7 +23,7 @@ spec-info: spec-type: links description: | This set of attributes specifies a test case check. - required-attributes: all + mandatory-attributes: all spec-name: Test Case Check spec-type: test-case-check type: spec diff --git a/spec/spec/test-case.yml b/spec/spec/test-case.yml index 297d7108..00773055 100644 --- a/spec/spec/test-case.yml +++ b/spec/spec/test-case.yml @@ -66,7 +66,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a test case. - required-attributes: all + mandatory-attributes: all spec-name: Test Case Item Type spec-type: test-case type: spec diff --git a/spec/spec/test-platform.yml b/spec/spec/test-platform.yml index dbcc48b5..c2ede20b 100644 --- a/spec/spec/test-platform.yml +++ b/spec/spec/test-platform.yml @@ -30,7 +30,7 @@ spec-info: This item type is work in progress. This set of attributes specifies a test platform. - required-attributes: all + mandatory-attributes: all spec-name: Test Platform Item Type spec-type: test-platform type: spec diff --git a/spec/spec/test-procedure.yml b/spec/spec/test-procedure.yml index f5e381c5..c3675188 100644 --- a/spec/spec/test-procedure.yml +++ b/spec/spec/test-procedure.yml @@ -34,7 +34,7 @@ spec-info: This item type is work in progress. This set of attributes specifies a test procedure. - required-attributes: all + mandatory-attributes: all spec-name: Test Procedure Item Type spec-type: test-procedure type: spec diff --git a/spec/spec/test-suite.yml b/spec/spec/test-suite.yml index 517f5428..aed3a55b 100644 --- a/spec/spec/test-suite.yml +++ b/spec/spec/test-suite.yml @@ -44,7 +44,7 @@ spec-info: spec-type: str description: | This set of attributes specifies a test suite. - required-attributes: all + mandatory-attributes: all spec-name: Test Suite Item Type spec-type: test-suite type: spec |