Kmohr-soprasteria/issue1308_resolve merge conflicts from main to develop

README.md

@@ -80,7 +80,7 @@ Any issues found during implementer review will be found in [MWDI v2.0.1_spec](h
 - this e.g. contains updating the testcases
 - but also contains an issue related to a possible change in how MWDI interacts with Kafka
 
-**v1.2.1**  
+**v1.2.2**  
 Spec release version 1.2.2 fixes further findings found by implementers during implementation of v1.2.1.  
 The list of issues can be found in issue collection [MWDI v1.2.2_spec](https://github.com/openBackhaul/MicroWaveDeviceInventory/milestone/18).  
 

spec/MicroWaveDeviceInventory+services.yaml

@@ -1546,4 +1546,4 @@ clients:
 
           ## unsubscribe from notifications
           - operation-name: /v1/end-subscription
-            uuid: mwdi-2-0-0-op-c-is-np-1-0-2-020
+            uuid: mwdi-2-0-0-op-c-is-np-1-0-2-020

testing/2_functional/completeness/v1.2.2/Alarms/README.md

@@ -0,0 +1,3 @@
+# Functional Testing of Completeness of Alarms  
+
+![Overview](./mwdi+diagram.completeness.alarms.png)  

testing/2_functional/completeness/v1.2.2/Alarms/mwdi+diagram.completeness.alarms.plantuml

@@ -0,0 +1,26 @@
+@startuml mwdi+diagram.completeness.alarms
+skinparam responseMessageBelowArrow true
+
+title
+mwdi+diagram.completeness.alarms
+end title
+
+participant "Postman" as Postman
+participant "Data" as Data
+participant "Collection" as Collection
+
+group Preparation
+  Data --\\o Postman : {servers, mount-name}
+  activate Postman
+  Postman --\\o Collection : {servers, mount-name}
+end
+
+group Alarms
+  note right Postman
+    might be transferred into another application
+  end note
+end
+
+deactivate Postman
+
+@enduml

testing/2_functional/completeness/v1.2.2/CC/README.md

@@ -0,0 +1,3 @@
+# Functional Testing of Completeness of the ControlConstruct  
+
+![Overview](./mwdi+diagram.completeness.cc.png)  

testing/2_functional/completeness/v1.2.2/CC/mwdi+diagram.completeness.cc.plantuml

@@ -0,0 +1,26 @@
+@startuml mwdi+diagram.completeness.cc
+skinparam responseMessageBelowArrow true
+
+title
+mwdi+testcase.completeness.cc
+end title
+
+participant "Postman" as Postman
+participant "Data" as Data
+participant "Collection" as Collection
+
+group Preparation
+  Data --\\o Postman : {servers, mount-name}
+  activate Postman
+  Postman --\\o Collection : {servers, mount-name}
+end
+
+group ControlConstruct
+  note right Postman
+    t.b.d.
+  end note
+end
+
+deactivate Postman
+
+@enduml

testing/2_functional/completeness/v1.2.2/CacheEnrichement/README.md

@@ -0,0 +1,9 @@
+# Functional Testing of Completeness of the Cache Enrichment  
+
+![Overview](./mwdi+diagram.completeness.cacheEnrichement.png)  
+
+Cache enrichment adds (topology) information to the MWDI cache. Contrary to the other cache and live ressource paths this data is not coming from the devices, but has to be added by other (not yet existing) applications.  
+
+Currently the enrichment ressource paths only cover the following objects:
+- link
+- link-port

testing/2_functional/completeness/v1.2.2/CacheEnrichement/mwdi+data.completeness.cacheEnrichment.json

@@ -0,0 +1,58 @@
+[
+	{
+		"mode": "debug",
+		"serverList": [
+			{
+				"serverName": "dummy",
+				"dummyUri": "ping.openBackhaul.com"
+			},
+			{
+				"serverName": "mwdi",
+				"server": "http://IP_ADRESS:PORT",
+				"pathToControlConstruct": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}",
+				"authorizationCode": "YOUR_BASIC_AUTH_CODE",
+				"operationKey": "Operation key not yet provided.",
+				"userName": "Thorsten Heinze",
+				"originator": "InterfaceValidator_TR532v2.0",
+				"xCorrelator": "00000000-0000-0000-0000-000000000532",
+				"traceIndicator": "1",
+				"customerJourney": ""
+			},
+			{
+				"serverName": "mwdi in mwdi+simulator.completeness.cacheEnrichment",
+				"server": "http://localhost:3015",
+				"pathToControlConstruct": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}",
+				"authorizationCode": "",
+				"operationKey": "Operation key not yet provided.",
+				"userName": "Thorsten Heinze",
+				"originator": "InterfaceValidator_TR532v2.0",
+				"xCorrelator": "00000000-0000-0000-0000-000000000532",
+				"traceIndicator": "1",
+				"customerJourney": ""
+			}
+		],
+		"collectionInputList": [
+			{
+				"collectionName": "completeness.cacheEnrichment",
+				"serverToBeApplied": "mwdi",
+				"mountName": "513250004",
+				"linkId": "101550001",
+				"genericLink": "genericLink1",
+				"mfrLink": "mfrLink1",
+				"linkPort": "1",
+				"kindOfReference": "dynamic"
+			},
+			{
+				"collectionName": "completeness.cacheEnrichment_simulator",
+				"serverToBeApplied": "mwdi in mwdi+simulator.completeness.cacheEnrichment",
+				"mountName": "305250001",
+				"linkId": "101550001",
+				"genericLink": "genericLink1",
+				"mfrLink": "mfrLink1",
+				"linkPort": "1",
+				"kindOfReference": "static",
+				"suffixUrlEncodingIsRequired": true
+			}
+		]
+	}
+]

testing/2_functional/completeness/v1.2.2/CacheEnrichement/mwdi+diagram.completeness.cacheEnrichement.plantuml

@@ -0,0 +1,110 @@
+@startuml mwdi+diagram.completeness.cacheEnrichement
+skinparam responseMessageBelowArrow true
+
+title
+mwdi+testcase.cacheEnrichment.dataprovider
+end title
+
+participant "Postman" as Postman
+participant "Data" as Data
+participant "Collection" as Collection
+
+participant "/core-model-1-4:network-control-domain=cache/link={uuid}" as LINK
+participant "/core-model-1-4:network-control-domain=cache/link={uuid}/link-port={localId}" as LINKPORT
+
+
+group Preparation
+  Data --\\o Postman : {servers, genericLinkId, mfrLinkId, linkPortId}
+  activate Postman
+  Postman --\\o Collection : {servers, genericLinkId, mfrLinkId, linkPortId}
+end
+
+== <font color=green> GET </font>==
+
+group GET /core-model-1-4:network-control-domain=cache/link={genericLinkId}
+  Collection --\\o Postman : {servers, genericLinkId}
+  Postman -> LINK
+  Postman <-- LINK : {core-model-1-4:link}
+  note right Postman #Orange
+    schema validation
+  end note
+end
+
+group GET /core-model-1-4:network-control-domain=cache/link={mfrLinkId}
+  Collection --\\o Postman : {servers, mfrLinkId}
+  Postman -> LINK
+  Postman <-- LINK : {core-model-1-4:link}
+  note right Postman #Orange
+    schema validation
+  end note
+end
+
+group GET /core-model-1-4:network-control-domain=cache/link={genericLinkId}/link-port={linkPortId}
+  Collection --\\o Postman : {servers, genericLinkId, linkPortId}
+  Postman -> LINKPORT
+  Postman <-- LINKPORT : {core-model-1-4:link-port}
+  note right Postman #Orange
+    schema validation
+  end note
+end
+
+== <font color=blue> PUT </font>==
+group PUT /core-model-1-4:network-control-domain=cache/link={genericLinkId}
+  Collection --\\o Postman : {servers, genericLinkId}
+  Postman -> LINK : {genericLinkDummyData}
+  Postman <-- LINK
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+group PUT /core-model-1-4:network-control-domain=cache/link={mfrLinkId}
+  Collection --\\o Postman : {servers, mfrLinkId}
+  Postman -> LINK : {mfrLinkDummyData}
+  Postman <-- LINK
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+group PUT /core-model-1-4:network-control-domain=cache/link={genericLinkId}/link-port={linkPortId}
+  Collection --\\o Postman : {servers, genericLinkId, linkPortId}
+  Postman -> LINKPORT : {dummyLinkPortData}
+  Postman <-- LINKPORT
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+== <font color=red> DELETE </font> ==
+
+group DELETE /core-model-1-4:network-control-domain=cache/link={genericLinkId}
+  Collection --\\o Postman : {servers, genericLinkId}
+  Postman -> LINK
+  Postman <-- LINK
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+group DELETE /core-model-1-4:network-control-domain=cache/link={mfrLinkId}
+  Collection --\\o Postman : {servers, mfrLinkId}
+  Postman -> LINK
+  Postman <-- LINK
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+group DELETE /core-model-1-4:network-control-domain=cache/link={genericLinkId}/link-port={linkPortId}
+  Collection --\\o Postman : {servers, genericLinkId, linkPortId}
+  Postman -> LINKPORT
+  Postman <-- LINKPORT
+  note right Postman #Orange
+    check for 204
+  end note
+end
+
+deactivate Postman
+
+@enduml