Merge pull request #45 from openBackhaul/kmohr-soprasteria/issue44

Change forwarding-construct to fc according to MWDI spec
openBackhaul · Mar 13, 2024 · 985a74b · 985a74b
2 parents 2b962fa + b4a7507
commit 985a74b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/spec/MultiDomainInventoryProxy+config.json b/spec/MultiDomainInventoryProxy+config.json
@@ -1444,7 +1444,7 @@
             "layer-protocol-name": "operation-server-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
             "operation-server-interface-1-0:operation-server-interface-pac": {
               "operation-server-interface-capability": {
-                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}"
+                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}"
               },
               "operation-server-interface-configuration": {
                 "life-cycle-state": "operation-server-interface-1-0:LIFE_CYCLE_STATE_TYPE_EXPERIMENTAL",
@@ -1468,7 +1468,7 @@
             "layer-protocol-name": "operation-server-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
             "operation-server-interface-1-0:operation-server-interface-pac": {
               "operation-server-interface-capability": {
-                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}"
+                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}"
               },
               "operation-server-interface-configuration": {
                 "life-cycle-state": "operation-server-interface-1-0:LIFE_CYCLE_STATE_TYPE_EXPERIMENTAL",
@@ -3917,7 +3917,7 @@
             "layer-protocol-name": "operation-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
             "operation-client-interface-1-0:operation-client-interface-pac": {
               "operation-client-interface-configuration": {
-                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}",
+                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}",
                 "operation-key": "Operation key not yet provided."
               },
               "operation-client-interface-status": {
@@ -3942,7 +3942,7 @@
             "layer-protocol-name": "operation-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
             "operation-client-interface-1-0:operation-client-interface-pac": {
               "operation-client-interface-configuration": {
-                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}",
+                "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}",
                 "operation-key": "Operation key not yet provided."
               },
               "operation-client-interface-status": {

diff --git a/spec/MultiDomainInventoryProxy+forwardings.yaml b/spec/MultiDomainInventoryProxy+forwardings.yaml
@@ -150,9 +150,9 @@ forwardings:
         uuid: mdip-1-0-0-op-s-is-201
       - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}
         uuid: mdip-1-0-0-op-s-is-202
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
         uuid: mdip-1-0-0-op-s-is-203
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
         uuid: mdip-1-0-0-op-s-is-204
       - server-name: /core-model-1-4:network-control-domain=cache/link={uuid}
         uuid: mdip-1-0-0-op-s-is-205
@@ -308,9 +308,9 @@ forwardings:
         uuid: mdip-1-0-0-op-s-is-201
       - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}
         uuid: mdip-1-0-0-op-s-is-202
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
         uuid: mdip-1-0-0-op-s-is-203
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
         uuid: mdip-1-0-0-op-s-is-204
       - server-name: /core-model-1-4:network-control-domain=cache/link={uuid}
         uuid: mdip-1-0-0-op-s-is-205
@@ -1138,10 +1138,10 @@ forwardings:
       fc-port-deletion:
       operation-client-deletion:
     initiating-requests:
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
         uuid: mdip-1-0-0-op-s-is-203
     consequent-requests:
-      - client-name: MWDI://core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+      - client-name: MWDI://core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-203
 
   - forwarding-name: RequestForCachedForwardingConstructPortCausesReadingFromCache
@@ -1153,10 +1153,10 @@ forwardings:
       fc-port-deletion:
       operation-client-deletion:
     initiating-requests:
-      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+      - server-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
         uuid: mdip-1-0-0-op-s-is-204
     consequent-requests:
-      - client-name: MWDI://core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+      - client-name: MWDI://core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-204
 
   - forwarding-name: RequestForCachedLinkCausesReadingFromCache

diff --git a/spec/MultiDomainInventoryProxy+services.yaml b/spec/MultiDomainInventoryProxy+services.yaml
@@ -117,9 +117,9 @@ servers:
           uuid: mdip-1-0-0-op-s-is-201
         - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}
           uuid: mdip-1-0-0-op-s-is-202
-        - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+        - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
           uuid: mdip-1-0-0-op-s-is-203
-        - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+        - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
           uuid: mdip-1-0-0-op-s-is-204
         - operation-name: /core-model-1-4:network-control-domain=cache/link={uuid}
           uuid: mdip-1-0-0-op-s-is-205
@@ -464,9 +464,9 @@ clients:
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-201
       - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-202
-      - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}
+      - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-203
-      - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}
+      - operation-name: /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-204
       - operation-name: /core-model-1-4:network-control-domain=cache/link={uuid}
         uuid: mdip-1-0-0-op-c-is-mwdi-1-1-1-205

diff --git a/spec/MultiDomainInventoryProxy.yaml b/spec/MultiDomainInventoryProxy.yaml
@@ -5024,7 +5024,7 @@ paths:
                   $ref: '#/components/responses/responseForErroredServiceRequests'
                 default:
                   $ref: '#/components/responses/responseForErroredServiceRequests'
-  /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}:
+  /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}:
     parameters:
       - $ref: '#/components/parameters/mountName'
       - $ref: '#/components/parameters/uuid'
@@ -5175,7 +5175,7 @@ paths:
                   $ref: '#/components/responses/responseForErroredServiceRequests'
                 default:
                   $ref: '#/components/responses/responseForErroredServiceRequests'
-  /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}:
+  /core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}:
     parameters:
       - $ref: '#/components/parameters/mountName'
       - $ref: '#/components/parameters/uuid'

diff --git a/testing/MultiDomainInventoryProxy+data.json b/testing/MultiDomainInventoryProxy+data.json
@@ -1451,7 +1451,7 @@
                 "layer-protocol-name": "operation-server-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
                 "operation-server-interface-1-0:operation-server-interface-pac": {
                   "operation-server-interface-capability": {
-                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}"
+                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}"
                   },
                   "operation-server-interface-configuration": {
                     "life-cycle-state": "operation-server-interface-1-0:LIFE_CYCLE_STATE_TYPE_EXPERIMENTAL",
@@ -1475,7 +1475,7 @@
                 "layer-protocol-name": "operation-server-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
                 "operation-server-interface-1-0:operation-server-interface-pac": {
                   "operation-server-interface-capability": {
-                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}"
+                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}"
                   },
                   "operation-server-interface-configuration": {
                     "life-cycle-state": "operation-server-interface-1-0:LIFE_CYCLE_STATE_TYPE_EXPERIMENTAL",
@@ -3924,7 +3924,7 @@
                 "layer-protocol-name": "operation-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
                 "operation-client-interface-1-0:operation-client-interface-pac": {
                   "operation-client-interface-configuration": {
-                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}",
+                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}",
                     "operation-key": "Operation key not yet provided."
                   },
                   "operation-client-interface-status": {
@@ -3949,7 +3949,7 @@
                 "layer-protocol-name": "operation-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER",
                 "operation-client-interface-1-0:operation-client-interface-pac": {
                   "operation-client-interface-configuration": {
-                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/forwarding-construct={uuid1}/fc-port={localId}",
+                    "operation-name": "/core-model-1-4:network-control-domain=cache/control-construct={mountName}/forwarding-domain={uuid}/fc={uuid1}/fc-port={localId}",
                     "operation-key": "Operation key not yet provided."
                   },
                   "operation-client-interface-status": {