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-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
index 657287ef..125dbc93 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4ff24108.9f0b9",
+    "id": "92bde18b.90f51",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 110.01040649414062,
-    "y": 84,
-    "z": "7e44475f.b60658",
+    "x": 106.00390625,
+    "y": 51.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "49314d16.951114"
+        "9686f296.2c8dd"
       ]
     ]
   },
   {
-    "id": "49314d16.951114",
+    "id": "9686f296.2c8dd",
     "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": 296.0104103088379,
-    "y": 156.0000171661377,
-    "z": "7e44475f.b60658",
+    "x": 292.00391006469727,
+    "y": 123.0039234161377,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "cacaf9a3.ed2eb8"
+        "5c1e48b9.633c88"
       ]
     ]
   },
   {
-    "id": "cacaf9a3.ed2eb8",
+    "id": "5c1e48b9.633c88",
     "type": "method",
     "name": "method sotn-network-topology-operation-activate",
     "xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 284.0105285644531,
-    "y": 244,
-    "z": "7e44475f.b60658",
+    "x": 280.0040283203125,
+    "y": 211.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "6fc16268.2c373c"
+        "ccaf1419.198158"
       ]
     ]
   },
   {
-    "id": "6fc16268.2c373c",
+    "id": "ccaf1419.198158",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 458.0104217529297,
-    "y": 352.0000591278076,
-    "z": "7e44475f.b60658",
+    "x": 454.00392150878906,
+    "y": 319.0039653778076,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "f31091a3.27362",
-        "15ed0f21.483631",
-        "b7e9a733.12c248",
-        "739286aa.7b5518",
-        "fc03b474.733c48",
-        "8ec0cdeb.99354",
-        "4aa12b59.10e594",
-        "cdb930eb.4db64"
+        "70aaa20a.67efcc",
+        "b5a2c023.8548a",
+        "d1073f16.8ed91",
+        "78851dc5.db0384",
+        "4ca1d850.ac9f28",
+        "d2a509fb.abaf98",
+        "e789c0c0.571e6",
+        "7c9d2cd5.85be04"
       ]
     ]
   },
   {
-    "id": "f31091a3.27362",
+    "id": "70aaa20a.67efcc",
     "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": 916.3993072509766,
-    "y": 101,
-    "z": "7e44475f.b60658",
+    "x": 912.3928070068359,
+    "y": 68.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -88,15 +88,15 @@
     ]
   },
   {
-    "id": "15ed0f21.483631",
+    "id": "b5a2c023.8548a",
     "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-Activate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 716.5660057067871,
-    "y": 154.77785301208496,
-    "z": "7e44475f.b60658",
+    "x": 712.5595054626465,
+    "y": 121.78175926208496,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -104,54 +104,54 @@
     ]
   },
   {
-    "id": "b7e9a733.12c248",
+    "id": "d1073f16.8ed91",
     "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": 807.5660552978516,
-    "y": 343.31329441070557,
-    "z": "7e44475f.b60658",
+    "x": 803.5595550537109,
+    "y": 310.31720066070557,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "739286aa.7b5518",
+    "id": "78851dc5.db0384",
     "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": 729.3438568115234,
-    "y": 532.8687143325806,
-    "z": "7e44475f.b60658",
+    "x": 725.3373565673828,
+    "y": 499.87262058258057,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "fc03b474.733c48",
+    "id": "4ca1d850.ac9f28",
     "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='Active' />\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": 774.4549713134766,
-    "y": 404.5354690551758,
-    "z": "7e44475f.b60658",
+    "x": 770.4484710693359,
+    "y": 371.5393753051758,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "8ec0cdeb.99354",
+    "id": "d2a509fb.abaf98",
     "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": 748.8681106567383,
-    "y": 207.77788925170898,
-    "z": "7e44475f.b60658",
+    "x": 744.8616104125977,
+    "y": 174.78179550170898,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -159,15 +159,15 @@
     ]
   },
   {
-    "id": "4aa12b59.10e594",
+    "id": "e789c0c0.571e6",
     "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='Active' />",
+    "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='Active' />",
     "comments": "",
     "outputs": 1,
-    "x": 808.6735534667969,
-    "y": 464.238657951355,
-    "z": "7e44475f.b60658",
+    "x": 804.6670532226562,
+    "y": 431.242564201355,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -175,27 +175,27 @@
     ]
   },
   {
-    "id": "cdb930eb.4db64",
+    "id": "7c9d2cd5.85be04",
     "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": 771.0105285644531,
-    "y": 275.0910539627075,
-    "z": "7e44475f.b60658",
+    "x": 767.0040283203125,
+    "y": 242.09496021270752,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "c713ecf7.ea914",
+    "id": "ccc44411.171148",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 996.0416564941406,
-    "y": 198.03128051757812,
-    "z": "7e44475f.b60658",
+    "x": 992.03515625,
+    "y": 165.03518676757812,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]