Updates to SOTN DG

Updates include:
- Changes to support inter-domain.
- Changes wrt. AAI nodes and fields.

Change-Id: I50ed3553e792a382c534c72475afc666629320cc
Issue-ID: SDNC-356
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 62b4fd6b216ec03288cd216b50803ba8c64a3c3b

1 files changed, 64 insertions, 64 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
index 7c4dec42..5caf6849 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "dbfbe99b.e9cbe8",
+    "id": "1cff3dd.1bd75c2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 116.01040649414062,
-    "y": 44.666656255722046,
-    "z": "25c39c60.9e5894",
+    "x": 132.00390625,
+    "y": 51.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "23197697.79faaa"
+        "93d49eff.25811"
       ]
     ]
   },
   {
-    "id": "23197697.79faaa",
+    "id": "93d49eff.25811",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,65 +22,65 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 272.0104103088379,
-    "y": 135.66667819023132,
-    "z": "25c39c60.9e5894",
+    "x": 288.00391006469727,
+    "y": 142.00392818450928,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "f4094d1c.b6791"
+        "92b42a02.8d5ca8"
       ]
     ]
   },
   {
-    "id": "f4094d1c.b6791",
+    "id": "92b42a02.8d5ca8",
     "type": "method",
     "name": "method sotn-network-topology-operation-deactivate",
     "xml": "<method rpc='sotn-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 260.0105285644531,
-    "y": 223.66666102409363,
-    "z": "25c39c60.9e5894",
+    "x": 276.0040283203125,
+    "y": 230.00391101837158,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "8b588587.07d838"
+        "366ea887.121e48"
       ]
     ]
   },
   {
-    "id": "8b588587.07d838",
+    "id": "366ea887.121e48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 483.01048278808594,
-    "y": 295.666734457016,
-    "z": "25c39c60.9e5894",
+    "x": 499.0039825439453,
+    "y": 302.00398445129395,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "37ee3ec1.d168c2",
-        "84f57d66.de4e4",
-        "54ed7f5.2ee008",
-        "642b70ce.9a12c",
-        "26a09247.15d9ee",
-        "d068035a.95625",
-        "453b73b2.972dac",
-        "c7d360a9.620ce"
+        "cd5f7c65.252fa",
+        "62b5f38f.a23b1c",
+        "321a98d2.d65578",
+        "acc7b853.93de78",
+        "66a195e2.15165c",
+        "e88b4c8f.26b3d",
+        "f5303ddb.a29a7",
+        "85416f02.f4216"
       ]
     ]
   },
   {
-    "id": "37ee3ec1.d168c2",
+    "id": "cd5f7c65.252fa",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 914.6215515136719,
-    "y": 43.99999976158142,
-    "z": "25c39c60.9e5894",
+    "x": 930.6150512695312,
+    "y": 50.337249755859375,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -88,15 +88,15 @@
     ]
   },
   {
-    "id": "84f57d66.de4e4",
+    "id": "62b5f38f.a23b1c",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Deactivate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 719.0416564941406,
-    "y": 87.03125262260437,
-    "z": "25c39c60.9e5894",
+    "x": 735.03515625,
+    "y": 93.36850261688232,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -104,54 +104,54 @@
     ]
   },
   {
-    "id": "26a09247.15d9ee",
+    "id": "66a195e2.15165c",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 810.0417060852051,
-    "y": 275.566694021225,
-    "z": "25c39c60.9e5894",
+    "x": 826.0352058410645,
+    "y": 281.90394401550293,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "c7d360a9.620ce",
+    "id": "85416f02.f4216",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 731.819507598877,
-    "y": 465.1221139431,
-    "z": "25c39c60.9e5894",
+    "x": 747.8130073547363,
+    "y": 471.45936393737793,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "d068035a.95625",
+    "id": "e88b4c8f.26b3d",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 776.9306221008301,
-    "y": 336.7888686656952,
-    "z": "25c39c60.9e5894",
+    "x": 792.9241218566895,
+    "y": 343.12611865997314,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "54ed7f5.2ee008",
+    "id": "321a98d2.d65578",
     "type": "execute",
     "name": "execute Properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 751.3437614440918,
-    "y": 140.0312888622284,
-    "z": "25c39c60.9e5894",
+    "x": 767.3372611999512,
+    "y": 146.36853885650635,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -159,15 +159,15 @@
     ]
   },
   {
-    "id": "453b73b2.972dac",
+    "id": "f5303ddb.a29a7",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
-    "x": 811.1492042541504,
-    "y": 396.4920575618744,
-    "z": "25c39c60.9e5894",
+    "x": 827.1427040100098,
+    "y": 402.82930755615234,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -175,27 +175,27 @@
     ]
   },
   {
-    "id": "642b70ce.9a12c",
+    "id": "acc7b853.93de78",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 773.4861793518066,
-    "y": 207.34445357322693,
-    "z": "25c39c60.9e5894",
+    "x": 789.479679107666,
+    "y": 213.68170356750488,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "e7e26097.3b8df",
+    "id": "b10f480b.ef7f98",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 998.5173072814941,
-    "y": 130.28468012809753,
-    "z": "25c39c60.9e5894",
+    "x": 1014.5108070373535,
+    "y": 136.6219301223755,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]