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, 66 insertions, 66 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 8fa5b0f0..657287ef 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,86 +1,86 @@
 [
   {
-    "id": "c91e9b10.259838",
+    "id": "4ff24108.9f0b9",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 96,
-    "y": 42.99996852874756,
-    "z": "ea913b4d.eb8638",
+    "x": 110.01040649414062,
+    "y": 84,
+    "z": "7e44475f.b60658",
     "wires": [
       [
-        "38533cf9.2a1214"
+        "49314d16.951114"
       ]
     ]
   },
   {
-    "id": "38533cf9.2a1214",
+    "id": "49314d16.951114",
     "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": 282.00000381469727,
-    "y": 114.99998569488525,
-    "z": "ea913b4d.eb8638",
+    "x": 296.0104103088379,
+    "y": 156.0000171661377,
+    "z": "7e44475f.b60658",
     "wires": [
       [
-        "39d16e55.9c1d22"
+        "cacaf9a3.ed2eb8"
       ]
     ]
   },
   {
-    "id": "39d16e55.9c1d22",
+    "id": "cacaf9a3.ed2eb8",
     "type": "method",
     "name": "method sotn-network-topology-operation-activate",
     "xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 270.0001220703125,
-    "y": 202.99996852874756,
-    "z": "ea913b4d.eb8638",
+    "x": 284.0105285644531,
+    "y": 244,
+    "z": "7e44475f.b60658",
     "wires": [
       [
-        "4519115b.490c9"
+        "6fc16268.2c373c"
       ]
     ]
   },
   {
-    "id": "4519115b.490c9",
+    "id": "6fc16268.2c373c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 444.00001525878906,
-    "y": 311.0000276565552,
-    "z": "ea913b4d.eb8638",
+    "x": 458.0104217529297,
+    "y": 352.0000591278076,
+    "z": "7e44475f.b60658",
     "wires": [
       [
-        "dfb7f2ca.a1635",
-        "d89e17e8.bd1698",
-        "d5e8e338.ac641",
-        "604990bf.defe7",
-        "b18a2025.dcb34",
-        "9bb8612f.5c571",
-        "c3e1900f.1a37e",
-        "18e80a8f.69f565"
+        "f31091a3.27362",
+        "15ed0f21.483631",
+        "b7e9a733.12c248",
+        "739286aa.7b5518",
+        "fc03b474.733c48",
+        "8ec0cdeb.99354",
+        "4aa12b59.10e594",
+        "cdb930eb.4db64"
       ]
     ]
   },
   {
-    "id": "dfb7f2ca.a1635",
+    "id": "f31091a3.27362",
     "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": 902.3889007568359,
-    "y": 59.99996852874756,
-    "z": "ea913b4d.eb8638",
+    "x": 916.3993072509766,
+    "y": 101,
+    "z": "7e44475f.b60658",
     "wires": [
       [
         
@@ -88,15 +88,15 @@
     ]
   },
   {
-    "id": "d89e17e8.bd1698",
+    "id": "15ed0f21.483631",
     "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": 702.5555992126465,
-    "y": 113.77782154083252,
-    "z": "ea913b4d.eb8638",
+    "x": 716.5660057067871,
+    "y": 154.77785301208496,
+    "z": "7e44475f.b60658",
     "wires": [
       [
         
@@ -104,54 +104,54 @@
     ]
   },
   {
-    "id": "d5e8e338.ac641",
+    "id": "b7e9a733.12c248",
     "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": 793.5556488037109,
-    "y": 302.3132629394531,
-    "z": "ea913b4d.eb8638",
+    "x": 807.5660552978516,
+    "y": 343.31329441070557,
+    "z": "7e44475f.b60658",
     "wires": [
       
     ]
   },
   {
-    "id": "604990bf.defe7",
+    "id": "739286aa.7b5518",
     "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": 715.3334503173828,
-    "y": 491.8686828613281,
-    "z": "ea913b4d.eb8638",
+    "x": 729.3438568115234,
+    "y": 532.8687143325806,
+    "z": "7e44475f.b60658",
     "wires": [
       
     ]
   },
   {
-    "id": "b18a2025.dcb34",
+    "id": "fc03b474.733c48",
     "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": 760.4445648193359,
-    "y": 363.53543758392334,
-    "z": "ea913b4d.eb8638",
+    "x": 774.4549713134766,
+    "y": 404.5354690551758,
+    "z": "7e44475f.b60658",
     "wires": [
       
     ]
   },
   {
-    "id": "9bb8612f.5c571",
+    "id": "8ec0cdeb.99354",
     "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": 734.8577041625977,
-    "y": 166.77785778045654,
-    "z": "ea913b4d.eb8638",
+    "x": 748.8681106567383,
+    "y": 207.77788925170898,
+    "z": "7e44475f.b60658",
     "wires": [
       [
         
@@ -159,15 +159,15 @@
     ]
   },
   {
-    "id": "c3e1900f.1a37e",
+    "id": "4aa12b59.10e594",
     "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' />",
     "comments": "",
     "outputs": 1,
-    "x": 794.6631469726562,
-    "y": 423.23862648010254,
-    "z": "ea913b4d.eb8638",
+    "x": 808.6735534667969,
+    "y": 464.238657951355,
+    "z": "7e44475f.b60658",
     "wires": [
       [
         
@@ -175,27 +175,27 @@
     ]
   },
   {
-    "id": "18e80a8f.69f565",
+    "id": "cdb930eb.4db64",
     "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": 757.0001220703125,
-    "y": 234.09102249145508,
-    "z": "ea913b4d.eb8638",
+    "x": 771.0105285644531,
+    "y": 275.0910539627075,
+    "z": "7e44475f.b60658",
     "wires": [
       
     ]
   },
   {
-    "id": "bd8b5b43.6b8768",
+    "id": "c713ecf7.ea914",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 982.03125,
-    "y": 157.03124904632568,
-    "z": "ea913b4d.eb8638",
+    "x": 996.0416564941406,
+    "y": 198.03128051757812,
+    "z": "7e44475f.b60658",
     "wires": [
       
     ]