SOTN issue fixes

Issues: SOTN connectivity issues in create, activate and deactivate is fixed

Change-Id: I4b85cf2eb248f36369a85fc93394a1d41d2170ac
Issue-ID: SDNC-356
Signed-off-by: Prakash E <prakash.e@huawei.com>

Former-commit-id: 42ff7639525bbba3dd81abd4965d340291d46b3e

1 files changed, 74 insertions, 92 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 125dbc93..0dac5d39 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": "92bde18b.90f51",
+    "id": "bb559316.43abe",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 106.00390625,
-    "y": 51.00390625,
-    "z": "54170a80.42c614",
+    "x": 169,
+    "y": 76,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "9686f296.2c8dd"
+        "842a594e.4731d8"
       ]
     ]
   },
   {
-    "id": "9686f296.2c8dd",
+    "id": "842a594e.4731d8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,182 +22,164 @@
     "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": 292.00391006469727,
-    "y": 123.0039234161377,
-    "z": "54170a80.42c614",
+    "x": 355.00000381469727,
+    "y": 148.0000171661377,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "5c1e48b9.633c88"
+        "f5dc7555.cee5a8"
       ]
     ]
   },
   {
-    "id": "5c1e48b9.633c88",
+    "id": "f5dc7555.cee5a8",
     "type": "method",
     "name": "method sotn-network-topology-operation-activate",
     "xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 280.0040283203125,
-    "y": 211.00390625,
-    "z": "54170a80.42c614",
+    "x": 343.0001220703125,
+    "y": 236,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "ccaf1419.198158"
+        "48dc382f.96bcc8"
       ]
     ]
   },
   {
-    "id": "ccaf1419.198158",
+    "id": "48dc382f.96bcc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 454.00392150878906,
-    "y": 319.0039653778076,
-    "z": "54170a80.42c614",
+    "x": 517.0000152587891,
+    "y": 344.0000591278076,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "70aaa20a.67efcc",
-        "b5a2c023.8548a",
-        "d1073f16.8ed91",
-        "78851dc5.db0384",
-        "4ca1d850.ac9f28",
-        "d2a509fb.abaf98",
-        "e789c0c0.571e6",
-        "7c9d2cd5.85be04"
+        "40528bdc.5b5f94",
+        "6d718115.bc2bd",
+        "fba83ea2.6feb9",
+        "5f3aca59.c0fbb4",
+        "1643498b.4256a6",
+        "afd35eb.c4071a",
+        "f6449001.6bbfb",
+        "77ac16a7.2846a8"
       ]
     ]
   },
   {
-    "id": "70aaa20a.67efcc",
+    "id": "40528bdc.5b5f94",
     "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": 912.3928070068359,
-    "y": 68.00390625,
-    "z": "54170a80.42c614",
+    "x": 975.3889007568359,
+    "y": 93,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "b5a2c023.8548a",
+    "id": "6d718115.bc2bd",
     "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": 712.5595054626465,
-    "y": 121.78175926208496,
-    "z": "54170a80.42c614",
+    "x": 775.5555992126465,
+    "y": 146.77785301208496,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "d1073f16.8ed91",
+    "id": "fba83ea2.6feb9",
     "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": 803.5595550537109,
-    "y": 310.31720066070557,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 866.5556488037109,
+    "y": 335.31329441070557,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "78851dc5.db0384",
+    "id": "5f3aca59.c0fbb4",
     "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": 725.3373565673828,
-    "y": 499.87262058258057,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 788.3334503173828,
+    "y": 524.8687143325806,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "4ca1d850.ac9f28",
+    "id": "1643498b.4256a6",
     "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`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$tmp.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[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 770.4484710693359,
-    "y": 371.5393753051758,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 833.4445648193359,
+    "y": 396.5354690551758,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "d2a509fb.abaf98",
+    "id": "afd35eb.c4071a",
     "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": 744.8616104125977,
-    "y": 174.78179550170898,
-    "z": "54170a80.42c614",
+    "x": 807.8577041625977,
+    "y": 199.77788925170898,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "e789c0c0.571e6",
+    "id": "f6449001.6bbfb",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
     "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": 804.6670532226562,
-    "y": 431.242564201355,
-    "z": "54170a80.42c614",
+    "x": 867.6631469726562,
+    "y": 456.238657951355,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "7c9d2cd5.85be04",
+    "id": "77ac16a7.2846a8",
     "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.`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 767.0040283203125,
-    "y": 242.09496021270752,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 830.0001220703125,
+    "y": 267.0910539627075,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "ccc44411.171148",
+    "id": "96de6db0.b05dc",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 992.03515625,
-    "y": 165.03518676757812,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 1055.03125,
+    "y": 190.03128051757812,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   }
 ]