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, 56 insertions, 56 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
index 923f1e85..2f29f7da 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "dade7d5.3be378",
+    "id": "e2842db5.a9071",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 116.01040649414062,
-    "y": 55.999999734573066,
-    "z": "1ff7724b.6a5b2e",
+    "x": 107.00390625,
+    "y": 70.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "88d1057.ae444f8"
+        "d0423637.689c18"
       ]
     ]
   },
   {
-    "id": "88d1057.ae444f8",
+    "id": "d0423637.689c18",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,64 +22,64 @@
     "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": 328.0104103088379,
-    "y": 128.00001690071076,
-    "z": "1ff7724b.6a5b2e",
+    "x": 319.00391006469727,
+    "y": 142.0039234161377,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "1b879646.8c5f2a"
+        "8964c247.35272"
       ]
     ]
   },
   {
-    "id": "1b879646.8c5f2a",
+    "id": "8964c247.35272",
     "type": "method",
     "name": "method sotn-network-topology-operation-delete",
     "xml": "<method rpc='sotn-network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 316.0105285644531,
-    "y": 215.99999973457307,
-    "z": "1ff7724b.6a5b2e",
+    "x": 307.0040283203125,
+    "y": 230.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "84422522.f0dfe8"
+        "7ece957c.81e36c"
       ]
     ]
   },
   {
-    "id": "84422522.f0dfe8",
+    "id": "7ece957c.81e36c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 486.45486068725586,
-    "y": 278.44445583503693,
-    "z": "1ff7724b.6a5b2e",
+    "x": 477.44836044311523,
+    "y": 292.44836235046387,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "8bc679c2.d2e228",
-        "3dd9c771.f2d768",
-        "81f00f63.ec84b",
-        "a13b30bd.b7628",
-        "a4092a94.cd0c48",
-        "2768fcc.58a2004",
-        "8b28cfea.bd23e"
+        "1ccc938f.2f224c",
+        "a9d1874f.281198",
+        "bebcb7e3.f95d48",
+        "f957f73b.5f1c98",
+        "77e06509.a268cc",
+        "ed0dab58.6e6938",
+        "53d6d08a.6aeb8"
       ]
     ]
   },
   {
-    "id": "8bc679c2.d2e228",
+    "id": "1ccc938f.2f224c",
     "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": 948.3993072509766,
-    "y": 72.99999973457307,
-    "z": "1ff7724b.6a5b2e",
+    "x": 939.3928070068359,
+    "y": 87.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -87,15 +87,15 @@
     ]
   },
   {
-    "id": "3dd9c771.f2d768",
+    "id": "a9d1874f.281198",
     "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-delete\"/>\n<parameter name=\"field3\" value=\"SOTN-Delete\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 761.7881317138672,
-    "y": 139.33337185066193,
-    "z": "1ff7724b.6a5b2e",
+    "x": 752.7816314697266,
+    "y": 153.33727836608887,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -103,67 +103,67 @@
     ]
   },
   {
-    "id": "81f00f63.ec84b",
+    "id": "bebcb7e3.f95d48",
     "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='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
     "comments": "",
-    "x": 846.4548149108887,
-    "y": 387.42429134529084,
-    "z": "1ff7724b.6a5b2e",
+    "x": 837.448314666748,
+    "y": 401.4281978607178,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "a13b30bd.b7628",
+    "id": "f957f73b.5f1c98",
     "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": 775.5660629272461,
-    "y": 450.97967931907624,
-    "z": "1ff7724b.6a5b2e",
+    "x": 766.5595626831055,
+    "y": 464.9835858345032,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "2768fcc.58a2004",
+    "id": "ed0dab58.6e6938",
     "type": "set",
     "name": "set new network length",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\n\t\n",
     "comments": "",
-    "x": 805.0874862670898,
-    "y": 264.8952014176175,
-    "z": "1ff7724b.6a5b2e",
+    "x": 796.0809860229492,
+    "y": 278.89910793304443,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "a4092a94.cd0c48",
+    "id": "77e06509.a268cc",
     "type": "set",
     "name": "Remove networks from ServiceData",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.nidx].\" value=\"\"/>\n\n",
     "comments": "",
-    "x": 845.7116432189941,
-    "y": 312.86314317863435,
-    "z": "1ff7724b.6a5b2e",
+    "x": 836.7051429748535,
+    "y": 326.8670496940613,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "8b28cfea.bd23e",
+    "id": "53d6d08a.6aeb8",
     "type": "delete",
-    "name": "delete SOTN VPNInstance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
+    "name": "delete SOTN VPNInstance connectivity in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='connectivity' \n        key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 883.6429862976074,
-    "y": 206.0062854019925,
-    "z": "1ff7724b.6a5b2e",
+    "x": 874.6364860534668,
+    "y": 220.01019191741943,
+    "z": "54170a80.42c614",
     "wires": [
       [