Skip to content

Commit 9fbe657

Browse files
committed
Revert fulfils to satisfies on arch elements, add satisfied_by for requirements
1 parent 1ca8274 commit 9fbe657

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/extensions/score_metamodel/metamodel.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ needs_types:
298298
derived_from: stkh_req
299299
satisfies: stkh_req
300300
belongs_to: feat # for evaluation
301+
satisfied_by: feat # new preferred name for belongs_to
301302
optional_options:
302303
codelink: ^.*$
303304
testlink: ^.*$
@@ -338,6 +339,7 @@ needs_types:
338339
# TODO: make derived_from mandatory once downstream repos migrate from satisfies
339340
derived_from: feat_req
340341
satisfies: feat_req
342+
satisfied_by: comp # new preferred name for belongs_to
341343
optional_options:
342344
codelink: ^.*$
343345
testlink: ^.*$
@@ -452,8 +454,6 @@ needs_types:
452454
includes: ^logic_arc_int(_op)*__.+$
453455
belongs_to: feat # make it mandatory for evaluation
454456
optional_links:
455-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
456-
satisfies: feat_req
457457
fulfils: feat_req
458458
tags:
459459
- architecture_element
@@ -476,8 +476,6 @@ needs_types:
476476
mandatory_links:
477477
belongs_to: feat
478478
optional_links:
479-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
480-
satisfies: feat_req
481479
fulfils: feat_req
482480
tags:
483481
- architecture_view
@@ -500,7 +498,6 @@ needs_types:
500498
status: ^(valid|invalid)$
501499
optional_links:
502500
includes: logic_arc_int_op
503-
satisfies: feat_req
504501
fulfils: feat_req
505502
tags:
506503
- architecture_element
@@ -609,8 +606,6 @@ needs_types:
609606
belongs_to: comp
610607
optional_links:
611608
uses: logic_arc_int, real_arc_int_op
612-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
613-
satisfies: comp_req
614609
fulfils: comp_req
615610
tags:
616611
- architecture_view
@@ -632,8 +627,6 @@ needs_types:
632627
mandatory_links:
633628
belongs_to: comp
634629
optional_links:
635-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
636-
satisfies: comp_req
637630
fulfils: comp_req
638631
tags:
639632
- architecture_view
@@ -655,7 +648,6 @@ needs_types:
655648
status: ^(valid|invalid)$
656649
language: ^(cpp|rust)$
657650
optional_links:
658-
satisfies: comp_req
659651
fulfils: comp_req
660652
tags:
661653
- architecture_element
@@ -1021,6 +1013,10 @@ needs_extra_links:
10211013
incoming: has
10221014
outgoing: belongs to
10231015

1016+
satisfied_by:
1017+
incoming: satisfies
1018+
outgoing: satisfied by
1019+
10241020
satisfies:
10251021
incoming: satisfied by
10261022
outgoing: satisfies
@@ -1099,7 +1095,6 @@ graph_checks:
10991095
include: feat_arc_sta, logic_arc_int, logic_arc_int_op, comp_arc_sta, real_arc_int, real_arc_int_op
11001096
condition: safety == QM
11011097
check:
1102-
satisfies: safety != QM
11031098
fulfils: safety != QM
11041099
explanation: An QM architecture element cannot implement ASIL requirements.
11051100

src/extensions/score_metamodel/tests/rst/architecture/architecture_tests.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
:security: YES
4646
:safety: ASIL_B
4747
:status: invalid
48-
:satisfies: feat_req__test_feature_1__test_req_1
48+
:fulfils: feat_req__test_feature_1__test_req_1
4949
:includes: logic_arc_int__test_feature_1__test_interface_1
5050

5151
.. needarch
@@ -59,7 +59,7 @@
5959
:security: YES
6060
:safety: ASIL_B
6161
:status: invalid
62-
:satisfies: feat_req__test_feature_1__test_req_1
62+
:fulfils: feat_req__test_feature_1__test_req_1
6363

6464
Put here a sequence diagram
6565

@@ -116,7 +116,7 @@ Component 1
116116
:safety: ASIL_B
117117
:security: YES
118118
:status: invalid
119-
:satisfies: comp_req__test_component_1__requirement_1
119+
:fulfils: comp_req__test_component_1__requirement_1
120120
:implements: logic_arc_int__test_feature_1__test_interface_1
121121
:belongs_to: comp__test_sub_component_1
122122

0 commit comments

Comments
 (0)