Connecting SOTN sub DGs to network DG

Changes include:
1. Connected SOTN sub DG with network DG
2. Removed hardcoding of version

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

Former-commit-id: c972410c1bb1faa06155e1aa8126c0849990879a

1 files changed, 58 insertions, 58 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 8b953708..923f1e85 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,85 +1,85 @@
 [
   {
-    "id": "6fceaf50.2ca8a",
+    "id": "dade7d5.3be378",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 97.03125762939453,
-    "y": 60.531246185302734,
-    "z": "4279d5d.f45972c",
+    "x": 116.01040649414062,
+    "y": 55.999999734573066,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
-        "cff1a431.d9d948"
+        "88d1057.ae444f8"
       ]
     ]
   },
   {
-    "id": "cff1a431.d9d948",
+    "id": "88d1057.ae444f8",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
-    "version": "1.2.1-SNAPSHOT",
+    "version": "${project.version}",
     "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='1.2.1-SNAPSHOT'>",
+    "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": 309.0312614440918,
-    "y": 132.53126335144043,
-    "z": "4279d5d.f45972c",
+    "x": 328.0104103088379,
+    "y": 128.00001690071076,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
-        "f4a2f725.1d7778"
+        "1b879646.8c5f2a"
       ]
     ]
   },
   {
-    "id": "f4a2f725.1d7778",
+    "id": "1b879646.8c5f2a",
     "type": "method",
     "name": "method sotn-network-topology-operation-delete",
     "xml": "<method rpc='sotn-network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 297.03137969970703,
-    "y": 220.53124618530273,
-    "z": "4279d5d.f45972c",
+    "x": 316.0105285644531,
+    "y": 215.99999973457307,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
-        "977562d1.fa7af"
+        "84422522.f0dfe8"
       ]
     ]
   },
   {
-    "id": "977562d1.fa7af",
+    "id": "84422522.f0dfe8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 467.47571182250977,
-    "y": 282.9757022857666,
-    "z": "4279d5d.f45972c",
+    "x": 486.45486068725586,
+    "y": 278.44445583503693,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
-        "6af1abf.a866354",
-        "18eeced4.574d91",
-        "406c5f6.7e479a",
-        "10a58dd4.391ce2",
-        "60c54ca0.bb3fb4",
-        "47c1a26c.4cd8ec",
-        "a482b966.7af068"
+        "8bc679c2.d2e228",
+        "3dd9c771.f2d768",
+        "81f00f63.ec84b",
+        "a13b30bd.b7628",
+        "a4092a94.cd0c48",
+        "2768fcc.58a2004",
+        "8b28cfea.bd23e"
       ]
     ]
   },
   {
-    "id": "6af1abf.a866354",
+    "id": "8bc679c2.d2e228",
     "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": 929.4201583862305,
-    "y": 77.53124618530273,
-    "z": "4279d5d.f45972c",
+    "x": 948.3993072509766,
+    "y": 72.99999973457307,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
         
@@ -87,15 +87,15 @@
     ]
   },
   {
-    "id": "18eeced4.574d91",
+    "id": "3dd9c771.f2d768",
     "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": 742.8089828491211,
-    "y": 143.8646183013916,
-    "z": "4279d5d.f45972c",
+    "x": 761.7881317138672,
+    "y": 139.33337185066193,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [
         
@@ -103,67 +103,67 @@
     ]
   },
   {
-    "id": "406c5f6.7e479a",
+    "id": "81f00f63.ec84b",
     "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": 827.4756660461426,
-    "y": 391.9555377960205,
-    "z": "4279d5d.f45972c",
+    "x": 846.4548149108887,
+    "y": 387.42429134529084,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       
     ]
   },
   {
-    "id": "10a58dd4.391ce2",
+    "id": "a13b30bd.b7628",
     "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": 756.5869140625,
-    "y": 455.5109257698059,
-    "z": "4279d5d.f45972c",
+    "x": 775.5660629272461,
+    "y": 450.97967931907624,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       
     ]
   },
   {
-    "id": "47c1a26c.4cd8ec",
+    "id": "2768fcc.58a2004",
     "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": 786.1083374023438,
-    "y": 269.42644786834717,
-    "z": "4279d5d.f45972c",
+    "x": 805.0874862670898,
+    "y": 264.8952014176175,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       
     ]
   },
   {
-    "id": "60c54ca0.bb3fb4",
+    "id": "a4092a94.cd0c48",
     "type": "set",
     "name": "Remove networks from ServiceData",
-    "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$nidx].\" value=\"\"/>\n\n",
+    "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.nidx].\" value=\"\"/>\n\n",
     "comments": "",
-    "x": 826.732494354248,
-    "y": 317.394389629364,
-    "z": "4279d5d.f45972c",
+    "x": 845.7116432189941,
+    "y": 312.86314317863435,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       
     ]
   },
   {
-    "id": "a482b966.7af068",
+    "id": "8b28cfea.bd23e",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 864.6638374328613,
-    "y": 210.53753185272217,
-    "z": "4279d5d.f45972c",
+    "x": 883.6429862976074,
+    "y": 206.0062854019925,
+    "z": "1ff7724b.6a5b2e",
     "wires": [
       [