Merge "SDWAN port templates"
authorDan Timoney <dtimoney@att.com>
Thu, 25 Apr 2019 13:32:54 +0000 (13:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 25 Apr 2019 13:32:54 +0000 (13:32 +0000)
Former-commit-id: 3911362969fc1d329cb9fbc07b414be70820a780

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml

index 861a58a..dfb0b20 100644 (file)
@@ -1,38 +1,38 @@
 [\r
     {\r
-        "id": "d9c4f19e.fd2e7",\r
+        "id": "449f76b2.35ecd8",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 672.25390625,\r
-        "y": 347.99999046325684,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 651.00390625,\r
+        "y": 351.99999046325684,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "cef58dbf.65cb",\r
-                "2919e925.39dec6",\r
-                "e1d6ced2.e1fdf"\r
+                "398bb19.252604e",\r
+                "b6d1d1d8.bb9ed",\r
+                "62a6e293.8703bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7e66a22.01e028",\r
+        "id": "3ae00491.8f60fc",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 209.25390243530273,\r
-        "y": 39,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 188.00390243530273,\r
+        "y": 43,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "c86c7fcc.d57a3"\r
+                "cd3d997.ba35068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c86c7fcc.d57a3",\r
+        "id": "cd3d997.ba35068",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 278.5396041870117,\r
-        "y": 102.23810958862305,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 257.2896041870117,\r
+        "y": 106.23810958862305,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "8a66936c.4ecc5"\r
+                "42625ee9.60cf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a66936c.4ecc5",\r
+        "id": "42625ee9.60cf8",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-activate",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 290.25389862060547,\r
-        "y": 196.58634185791016,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 269.00389862060547,\r
+        "y": 200.58634185791016,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "b4cb95ed.cde538"\r
+                "3ec2bae1.a772e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4cb95ed.cde538",\r
+        "id": "3ec2bae1.a772e6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 290.92057037353516,\r
-        "y": 452.666708946228,\r
-        "z": "d0c9a483.09f7c8",\r
-        "wires": [\r
-            [\r
-                "f3bcc30.03c554",\r
-                "ac79d525.fd1fd8",\r
-                "d9c4f19e.fd2e7",\r
-                "1bfdbcc3.c7cd93",\r
-                "6e8941e2.a043c",\r
-                "901afcf1.d22f3",\r
-                "ef04791b.55e268",\r
-                "8364ef5f.25f26",\r
-                "6278217c.89959",\r
-                "760751d.6fd76b",\r
-                "cd4a9b23.d614c8",\r
-                "44113153.ffa83",\r
-                "b05dede5.e0278",\r
-                "45f5fb20.78ea64",\r
-                "b07fc696.74dd68",\r
-                "8fa1111d.08c36",\r
-                "a897b863.5cfc78",\r
-                "9bf6789f.a0ec08",\r
-                "537766b1.131458",\r
-                "8ffe71d6.e37e5",\r
-                "b5fcdf55.56396",\r
-                "695214fd.2c4fdc",\r
-                "188a2b9c.34d5e4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ac79d525.fd1fd8",\r
+        "x": 269.67057037353516,\r
+        "y": 456.666708946228,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "788af4bb.4d81cc",\r
+                "1b2b5acf.fbd5d5",\r
+                "449f76b2.35ecd8",\r
+                "9c153d6a.4cf43",\r
+                "46f7cea6.503f1",\r
+                "fcbf2fc7.b018d",\r
+                "505ed63f.24baa8",\r
+                "94404e6f.e8fde",\r
+                "16a0b0ad.e2c3df",\r
+                "e352097b.fa56f8",\r
+                "ea89a3cd.96c6c",\r
+                "b4355150.f8381",\r
+                "23f60fe.f5fa6f",\r
+                "9f914b2c.f63948",\r
+                "3174dd24.ba8ab2",\r
+                "455e901d.d7497",\r
+                "41672a48.274fe4",\r
+                "58693560.f55b6c",\r
+                "69c506db.344ae8",\r
+                "3c1e06fc.eec57a",\r
+                "b87c5ca2.4198d",\r
+                "13f149d1.1db0a6",\r
+                "97edc5d7.68c598",\r
+                "deaed14.de5b43"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b2b5acf.fbd5d5",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 622.2852630615234,\r
-        "y": 276.2691411972046,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 616.0352668762207,\r
+        "y": 222.26914596557617,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "8d9e53be.f0301"\r
+                "7ea5c9a1.849a58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3bcc30.03c554",\r
+        "id": "788af4bb.4d81cc",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 627.2539176940918,\r
-        "y": 215.00001049041748,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 621.0039215087891,\r
+        "y": 161.00001525878906,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "193a9775.d88519"\r
+                "eddbe91d.071158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "193a9775.d88519",\r
+        "id": "eddbe91d.071158",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 807.2538986206055,\r
-        "y": 214,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 801.0039024353027,\r
+        "y": 160.00000476837158,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4b9a0abb.eb1bb4"\r
+                "43ffd7ae.190158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b9a0abb.eb1bb4",\r
+        "id": "43ffd7ae.190158",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 956.6826248168945,\r
-        "y": 215.14291763305664,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 950.4326286315918,\r
+        "y": 161.14292240142822,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d9e53be.f0301",\r
+        "id": "7ea5c9a1.849a58",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 845.2539138793945,\r
-        "y": 277.00000619888306,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 839.0039176940918,\r
+        "y": 223.00001096725464,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "835ec48b.329e88"\r
+                "63b5b6be.7bb648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "835ec48b.329e88",\r
+        "id": "63b5b6be.7bb648",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1060.2538986206055,\r
-        "y": 275,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1054.0039024353027,\r
+        "y": 221.00000476837158,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "38760c6e.34c224"\r
+                "395d7249.60aa0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38760c6e.34c224",\r
+        "id": "395d7249.60aa0e",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1224.2538986206055,\r
-        "y": 270,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1218.0039024353027,\r
+        "y": 216.00000476837158,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2919e925.39dec6",\r
+        "id": "b6d1d1d8.bb9ed",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.2538986206055,\r
-        "y": 382,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 873.0038986206055,\r
+        "y": 386,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4642ed44.17b144"\r
+                "284a993a.df0816"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cef58dbf.65cb",\r
+        "id": "398bb19.252604e",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 899.2538948059082,\r
-        "y": 328.9999990463257,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 878.0038948059082,\r
+        "y": 332.9999990463257,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4642ed44.17b144"\r
+                "284a993a.df0816"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4642ed44.17b144",\r
+        "id": "284a993a.df0816",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1057.2538986206055,\r
-        "y": 342,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1036.0038986206055,\r
+        "y": 346,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e1d6ced2.e1fdf",\r
+        "id": "62a6e293.8703bc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.2538986206055,\r
-        "y": 443,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 873.0038986206055,\r
+        "y": 447,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "1bffa38f.f0c50c"\r
+                "f366b8b5.961cc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3daf6135.38733e",\r
+        "id": "cb04cf04.061eb",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1248.2539138793945,\r
-        "y": 441.0000139474869,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1227.0039138793945,\r
+        "y": 445.0000139474869,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1bffa38f.f0c50c",\r
+        "id": "f366b8b5.961cc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1055.2539443969727,\r
-        "y": 439.99999141693115,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1034.0039443969727,\r
+        "y": 443.99999141693115,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "3daf6135.38733e",\r
-                "ef25b392.fb9e5"\r
+                "cb04cf04.061eb",\r
+                "19000243.abd3ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef25b392.fb9e5",\r
+        "id": "19000243.abd3ee",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1267.2538833618164,\r
-        "y": 493.99999046325684,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1246.0038833618164,\r
+        "y": 497.99999046325684,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "a5aa4ea3.3a9f8"\r
+                "7d37972f.257a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5aa4ea3.3a9f8",\r
+        "id": "7d37972f.257a38",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1510.2538986206055,\r
-        "y": 489,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1489.0038986206055,\r
+        "y": 493,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "291f40c7.f811f"\r
+                "377bfea7.613792"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "291f40c7.f811f",\r
+        "id": "377bfea7.613792",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1708.253927230835,\r
-        "y": 476.0000066757202,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1687.003927230835,\r
+        "y": 480.0000066757202,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "62bd116.37066f"\r
+                "18c55aa5.f966a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62bd116.37066f",\r
+        "id": "18c55aa5.f966a5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1860.2538986206055,\r
-        "y": 478,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1839.0038986206055,\r
+        "y": 482,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "fceeafa7.b7652",\r
-                "767f5d19.fe3e84",\r
-                "f1e44e3e.f0b3c"\r
+                "d08221fe.a8a22",\r
+                "f8638c60.50c2c",\r
+                "4e4f3655.251b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fceeafa7.b7652",\r
+        "id": "d08221fe.a8a22",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2088.2540130615234,\r
-        "y": 420.00000381469727,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2067.0040130615234,\r
+        "y": 424.00000381469727,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "767f5d19.fe3e84",\r
+        "id": "f8638c60.50c2c",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2092.2540130615234,\r
-        "y": 474.00000381469727,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2071.0040130615234,\r
+        "y": 478.00000381469727,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1bfdbcc3.c7cd93",\r
+        "id": "9c153d6a.4cf43",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 606.2540168762207,\r
-        "y": 2089.501151561737,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 585.0040168762207,\r
+        "y": 2093.501151561737,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1e44e3e.f0b3c",\r
+        "id": "4e4f3655.251b48",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2122.7090377807617,\r
-        "y": 525.0104961395264,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2101.4590377807617,\r
+        "y": 529.0104961395264,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aa0d1480.7f1978",\r
+        "id": "2dd1b5ff.e9de3a",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1379.5080871582031,\r
-        "y": 553.0040807723999,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1358.2580871582031,\r
+        "y": 557.0040807723999,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "9ed7ce57.d6ce"\r
+                "afb4aa7c.d42128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f605289.f2eb7d",\r
+        "id": "bc24bdbf.b7fae",\r
         "type": "switchNode",\r
         "name": "switch this deviceName == vf-input",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1450.50830078125,\r
-        "y": 626.0042104721069,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1429.25830078125,\r
+        "y": 630.0042104721069,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "b123da61.76e8a8"\r
+                "3a56a654.531a3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ed7ce57.d6ce",\r
+        "id": "afb4aa7c.d42128",\r
         "type": "for",\r
         "name": "for vf-module-input-param length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1665.5079345703125,\r
-        "y": 555.0041646957397,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1644.2579345703125,\r
+        "y": 559.0041646957397,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "f599447.9ac3fb8"\r
+                "258487d9.bf18e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b123da61.76e8a8",\r
+        "id": "3a56a654.531a3a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1670.5080242156982,\r
-        "y": 627.0042181015015,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1649.2580242156982,\r
+        "y": 631.0042181015015,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "2d7f5405.e9306c"\r
+                "c2e2f4ae.3e81f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d7f5405.e9306c",\r
+        "id": "c2e2f4ae.3e81f8",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1915.5081024169922,\r
-        "y": 627.0041356086731,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1894.2581024169922,\r
+        "y": 631.0041356086731,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "faceb28.d0a9d5"\r
+                "1b295fc8.1fb94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "faceb28.d0a9d5",\r
+        "id": "1b295fc8.1fb94",\r
         "type": "switchNode",\r
         "name": "switch deviceId == input vf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2223.5083770751953,\r
-        "y": 610.0041036605835,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2202.2583770751953,\r
+        "y": 614.0041036605835,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "ec659d9d.8002"\r
+                "35a3cdd9.9a70d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec659d9d.8002",\r
+        "id": "35a3cdd9.9a70d2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2432.508415222168,\r
-        "y": 612.004096031189,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2411.258415222168,\r
+        "y": 616.004096031189,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "73ebf520.d1f88c"\r
+                "219f921f.088efe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73ebf520.d1f88c",\r
+        "id": "219f921f.088efe",\r
         "type": "set",\r
         "name": "set prop.lan.deviceId",\r
         "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2609.5083808898926,\r
-        "y": 608.0042867660522,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2588.2583808898926,\r
+        "y": 612.0042867660522,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e8941e2.a043c",\r
+        "id": "46f7cea6.503f1",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 633.5078125,\r
-        "y": 420.00404262542725,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 612.2578125,\r
+        "y": 424.00404262542725,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "5c633f8a.ecb75"\r
+                "8fd527ce.0b2738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "415f5cb9.3a6e44",\r
+        "id": "daa35d7b.bbc16",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANSiteInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1270.258186340332,\r
-        "y": 737.0039882659912,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1249.008186340332,\r
+        "y": 741.0039882659912,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "55fab2c0.18755c"\r
+                "d9309324.f3584"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba32492c.0e54c8",\r
+        "id": "7a222fcd.73c1e",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 916.2580261230469,\r
-        "y": 704.0040283203125,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 895.0080261230469,\r
+        "y": 708.0040283203125,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "bd374d2.a7cdcb"\r
+                "7ba15821.578698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b07fc696.74dd68",\r
+        "id": "3174dd24.ba8ab2",\r
         "type": "for",\r
         "name": "for service-data.vnfs.vnf_length",\r
         "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 667.2578811645508,\r
-        "y": 635.0039081573486,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 646.0078811645508,\r
+        "y": 639.0039081573486,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "ba32492c.0e54c8"\r
+                "7a222fcd.73c1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55fab2c0.18755c",\r
+        "id": "d9309324.f3584",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1492.2581024169922,\r
-        "y": 737.0040698051453,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1471.0081024169922,\r
+        "y": 741.0040698051453,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "2d0cb991.e67216"\r
+                "6e42570c.9e97d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d0cb991.e67216",\r
+        "id": "6e42570c.9e97d8",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1573.5081100463867,\r
-        "y": 811.5040712356567,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1552.2581100463867,\r
+        "y": 815.5040712356567,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "f98893a0.de7a4"\r
+                "8eb63937.68f308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39ba7083.5ed54",\r
+        "id": "f89ede9f.dfe34",\r
         "type": "switchNode",\r
         "name": "switch siteId",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1956.5084686279297,\r
-        "y": 818.5041785240173,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1935.2584686279297,\r
+        "y": 822.5041785240173,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "36c8a445.c6055c"\r
+                "69e745ff.0d272c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36c8a445.c6055c",\r
+        "id": "69e745ff.0d272c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2133.508487701416,\r
-        "y": 821.5040187835693,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2112.258487701416,\r
+        "y": 825.5040187835693,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "cb17586e.80dbb8"\r
+                "f03a8e8e.83fe2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cafa7b8b.465778",\r
+        "id": "dee78c9f.5dd72",\r
         "type": "set",\r
         "name": "set prop.attach.siteId",\r
         "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2517.5089950561523,\r
-        "y": 795.5040702819824,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2496.2589950561523,\r
+        "y": 799.5040702819824,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb17586e.80dbb8",\r
+        "id": "f03a8e8e.83fe2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2292.7586784362793,\r
-        "y": 817.0040588378906,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2271.5086784362793,\r
+        "y": 821.0040588378906,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "cafa7b8b.465778",\r
-                "9412ef29.cc029",\r
-                "4b9ca75a.7fc698",\r
-                "2f9763b5.4e87fc"\r
+                "dee78c9f.5dd72",\r
+                "43b17553.c7382c",\r
+                "36d57da.c3bd682",\r
+                "1a9cf10f.4a8b1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fa1111d.08c36",\r
+        "id": "9e2a9762.50d9a8",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 628.2578277587891,\r
-        "y": 954.5039968490601,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1930.0078430175781,\r
+        "y": 1338.5039596557617,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4a5d401e.8bf8e",\r
-                "1ff4f9b4.f19fb6",\r
-                "8afdb3bf.1d43d"\r
+                "45a4d258.24544c",\r
+                "cb543421.e8e548",\r
+                "f2ddc8f8.67f5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a5d401e.8bf8e",\r
+        "id": "45a4d258.24544c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 872.2578887939453,\r
-        "y": 918.5039968490601,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2174.0079040527344,\r
+        "y": 1302.5039596557617,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "ec14c17f.6e2c1"\r
+                "73860a6b.6e7a64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ff4f9b4.f19fb6",\r
+        "id": "cb543421.e8e548",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.7487716674805,\r
-        "y": 954.0780334472656,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2176.4987869262695,\r
+        "y": 1338.0779962539673,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "7501ffb3.13588"\r
+                "57b80d68.fd6804"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8afdb3bf.1d43d",\r
+        "id": "f2ddc8f8.67f5b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 870.0817794799805,\r
-        "y": 990.4113922119141,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2171.8317947387695,\r
+        "y": 1374.4113550186157,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "26b83768.3bb758"\r
+                "114f2452.7c39bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26b83768.3bb758",\r
+        "id": "114f2452.7c39bc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1023.8542709350586,\r
-        "y": 987.8504791259766,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2325.6042861938477,\r
+        "y": 1371.8504419326782,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7501ffb3.13588",\r
+        "id": "57b80d68.fd6804",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1020.3201675415039,\r
-        "y": 952.3637208938599,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2322.070182800293,\r
+        "y": 1336.3636837005615,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec14c17f.6e2c1",\r
+        "id": "73860a6b.6e7a64",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 1032.757999420166,\r
-        "y": 916.5039367675781,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2334.508014678955,\r
+        "y": 1300.5038995742798,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a897b863.5cfc78",\r
+        "id": "315d042b.94c54c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 642.1960601806641,\r
-        "y": 1057.62509059906,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1943.9460754394531,\r
+        "y": 1441.6250534057617,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "b99d5bfa.8263b8",\r
-                "3b97c655.fec2fa"\r
+                "277e96cc.23f53a",\r
+                "d503dd86.6b851"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b99d5bfa.8263b8",\r
+        "id": "277e96cc.23f53a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877.1961860656738,\r
-        "y": 1043.6250791549683,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2178.946201324463,\r
+        "y": 1427.62504196167,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "da99c661.cc9138"\r
+                "7b5e2570.2698cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b97c655.fec2fa",\r
+        "id": "d503dd86.6b851",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.4461860656738,\r
-        "y": 1079.2679862976074,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2178.196201324463,\r
+        "y": 1463.267949104309,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "d1dde0a7.dc9a2"\r
+                "198d65d8.c721ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1dde0a7.dc9a2",\r
+        "id": "198d65d8.c721ba",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1025.1961936950684,\r
-        "y": 1080.0180683135986,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2326.9462089538574,\r
+        "y": 1464.0180311203003,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da99c661.cc9138",\r
+        "id": "7b5e2570.2698cc",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1019.1961936950684,\r
-        "y": 1042.6250801086426,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2320.9462089538574,\r
+        "y": 1426.6250429153442,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "537766b1.131458",\r
+        "id": "41672a48.274fe4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode device port create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668.28515625,\r
-        "y": 1209.0782289505005,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 647.03515625,\r
+        "y": 1213.0782289505005,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "8649541f.c916f8",\r
-                "490b0339.21ab4c"\r
+                "74d5de9e.64c39",\r
+                "95bf4540.859768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8649541f.c916f8",\r
+        "id": "74d5de9e.64c39",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 917.2852153778076,\r
-        "y": 1223.0784349441528,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 896.0352153778076,\r
+        "y": 1227.0784349441528,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "53d53343.edd9cc"\r
+                "446d7b16.686f54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "490b0339.21ab4c",\r
+        "id": "95bf4540.859768",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 917.2852153778076,\r
-        "y": 1185.0782704353333,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 896.0352153778076,\r
+        "y": 1189.0782704353333,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "bb7e9ee8.bdde5"\r
+                "5b043775.82b438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb7e9ee8.bdde5",\r
+        "id": "5b043775.82b438",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1061.2855491638184,\r
-        "y": 1184.078269958496,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1040.0355491638184,\r
+        "y": 1188.078269958496,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "53d53343.edd9cc",\r
+        "id": "446d7b16.686f54",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.2852268218994,\r
-        "y": 1224.0782737731934,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1043.0352268218994,\r
+        "y": 1228.0782737731934,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "901afcf1.d22f3",\r
+        "id": "fcbf2fc7.b018d",\r
         "type": "set",\r
         "name": "set prop.lan.devicePortId",\r
         "xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 610.9424171447754,\r
-        "y": 1262.1794338226318,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 589.6924171447754,\r
+        "y": 1266.1794338226318,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44729f10.35f05",\r
+        "id": "b76fce1f.c41d6",\r
         "type": "comment",\r
         "name": "Create port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 569.9510955810547,\r
-        "y": 1175.522253036499,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 548.7010955810547,\r
+        "y": 1179.522253036499,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9bf6789f.a0ec08",\r
+        "id": "455e901d.d7497",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 616.9510955810547,\r
-        "y": 1124.1886892318726,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 595.7010955810547,\r
+        "y": 1128.1886892318726,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eeb61a62.766e08",\r
+        "id": "4fc0e57c.93c3fc",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode bridge domain create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1090.9354057312012,\r
-        "y": 1304.188857793808,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1069.6854057312012,\r
+        "y": 1308.188857793808,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "925721ce.9c9c3",\r
-                "4887b469.84db6c"\r
+                "fe4c3471.1ff888",\r
+                "5d7f5544.360c1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925721ce.9c9c3",\r
+        "id": "fe4c3471.1ff888",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1411.935432434082,\r
-        "y": 1321.1891782283783,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1390.685432434082,\r
+        "y": 1325.1891782283783,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "ae68593e.8ba108"\r
+                "ab1e6271.60b9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4887b469.84db6c",\r
+        "id": "5d7f5544.360c1c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1414.935459136963,\r
-        "y": 1286.1889598369598,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1393.685459136963,\r
+        "y": 1290.1889598369598,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "79f2f146.ca204"\r
+                "cee492db.e0603"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79f2f146.ca204",\r
+        "id": "cee492db.e0603",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create bridge domain rest api\" />\n",\r
         "comments": "",\r
-        "x": 1617.935848236084,\r
-        "y": 1282.1890671253204,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1596.685848236084,\r
+        "y": 1286.1890671253204,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ae68593e.8ba108",\r
+        "id": "ab1e6271.60b9c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1618.9354133605957,\r
-        "y": 1317.1889336109161,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1597.6854133605957,\r
+        "y": 1321.1889336109161,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ccce6236.dc74f",\r
+        "id": "e47a1f03.1d40d",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1034.6012992858887,\r
-        "y": 1270.6330835819244,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1013.3512992858887,\r
+        "y": 1274.6330835819244,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef04791b.55e268",\r
+        "id": "505ed63f.24baa8",\r
         "type": "switchNode",\r
         "name": "switch portSwitch",\r
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 590.7128715515137,\r
-        "y": 1305.855489730835,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 569.4628715515137,\r
+        "y": 1309.855489730835,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "c3342bc2.390e38"\r
+                "f3a0568f.15eb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3342bc2.390e38",\r
+        "id": "f3a0568f.15eb08",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 769.7129020690918,\r
-        "y": 1305.966812133789,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 748.4629020690918,\r
+        "y": 1309.966812133789,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "eeb61a62.766e08"\r
+                "4fc0e57c.93c3fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8364ef5f.25f26",\r
+        "id": "94404e6f.e8fde",\r
         "type": "execute",\r
         "name": "execute split ip and mask",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 615.2578659057617,\r
-        "y": 1405.7540397644043,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 594.0078659057617,\r
+        "y": 1409.7540397644043,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "760fe778.7861c8",\r
-                "4e9c561e.4ac8b8"\r
+                "8f41cbf5.215278",\r
+                "e159f50d.926278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e9c561e.4ac8b8",\r
+        "id": "e159f50d.926278",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 816.257884979248,\r
-        "y": 1383.7540311813354,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 795.007884979248,\r
+        "y": 1387.7540311813354,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "3c0ad409.f6e78c"\r
+                "f5bbd137.51f5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "760fe778.7861c8",\r
+        "id": "8f41cbf5.215278",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 816.2578887939453,\r
-        "y": 1424.7540349960327,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 795.0078887939453,\r
+        "y": 1428.7540349960327,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "af9e51cb.86f12"\r
+                "b8b52f84.e55ad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c0ad409.f6e78c",\r
+        "id": "f5bbd137.51f5f",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 1013.2579040527344,\r
-        "y": 1381.7540311813354,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 992.0079040527344,\r
+        "y": 1385.7540311813354,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af9e51cb.86f12",\r
+        "id": "b8b52f84.e55ad",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 971.2578964233398,\r
-        "y": 1421.7540340423584,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 950.0078964233398,\r
+        "y": 1425.7540340423584,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9e3f075.4494b",\r
+        "id": "9835abaa.deb1b8",\r
         "type": "comment",\r
         "name": "Create wan port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 588.2677421569824,\r
-        "y": 1358.7640895843506,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 567.0177421569824,\r
+        "y": 1362.7640895843506,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd240d96.e63a6",\r
+        "id": "707a08a2.84bfc8",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1012.2675361633301,\r
-        "y": 1343.9343032836914,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 991.0175361633301,\r
+        "y": 1347.9343032836914,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ffe71d6.e37e5",\r
+        "id": "58693560.f55b6c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode IPSubnets create",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.0292358398438,\r
-        "y": 1481.8749294281006,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 652.7792358398438,\r
+        "y": 1485.8749294281006,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "87d7037c.ae081",\r
-                "b63381ea.1d864"\r
+                "e01d8566.26a208",\r
+                "b77c647.be67698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b63381ea.1d864",\r
+        "id": "b77c647.be67698",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 943.0292663574219,\r
-        "y": 1468.8749017715454,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 921.7792663574219,\r
+        "y": 1472.8749017715454,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "594e98d1.fab688"\r
+                "7b6fdd20.906734"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87d7037c.ae081",\r
+        "id": "e01d8566.26a208",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 940.029239654541,\r
-        "y": 1503.8751201629639,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 918.779239654541,\r
+        "y": 1507.8751201629639,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "5e9af700.a76ce8"\r
+                "a2642272.8a0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "594e98d1.fab688",\r
+        "id": "7b6fdd20.906734",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1096.0296478271484,\r
-        "y": 1464.8751277923584,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1074.7796478271484,\r
+        "y": 1468.8751277923584,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e9af700.a76ce8",\r
+        "id": "a2642272.8a0b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1087.0292205810547,\r
-        "y": 1504.8748760223389,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1065.7792205810547,\r
+        "y": 1508.8748760223389,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4982389d.632728"\r
+                "e06f7472.e95f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4982389d.632728",\r
+        "id": "e06f7472.e95f98",\r
         "type": "set",\r
         "name": "set prop.lan.lanPortId",\r
         "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 1293.9183235168457,\r
-        "y": 1507.208342552185,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1272.6683235168457,\r
+        "y": 1511.208342552185,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "695214fd.2c4fdc",\r
+        "id": "3c1e06fc.eec57a",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn topology",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 699.5396575927734,\r
-        "y": 1640.333706855774,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 669.2896881103516,\r
+        "y": 1665.3338165283203,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "d46aab2e.402878",\r
-                "f79fe60.440a918"\r
+                "5e387a3e.4fd8a4",\r
+                "e4302470.9e4168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f79fe60.440a918",\r
+        "id": "e4302470.9e4168",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 938.539571762085,\r
-        "y": 1687.333193898201,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 917.289571762085,\r
+        "y": 1691.333193898201,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "be3a59b0.64c5a8"\r
+                "1a5d2b85.cc6d14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be3a59b0.64c5a8",\r
+        "id": "1a5d2b85.cc6d14",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1108.5395107269287,\r
-        "y": 1690.333193898201,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1087.2895107269287,\r
+        "y": 1694.333193898201,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cb1060d7.72a6a",\r
+        "id": "5ab2794a.636098",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",\r
         "comments": "",\r
-        "x": 1108.5396327972412,\r
-        "y": 1646.333193898201,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1087.2896327972412,\r
+        "y": 1650.333193898201,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d46aab2e.402878",\r
+        "id": "5e387a3e.4fd8a4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 941.5395107269287,\r
-        "y": 1646.333193898201,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 920.2895107269287,\r
+        "y": 1650.333193898201,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "cb1060d7.72a6a"\r
+                "5ab2794a.636098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5fcdf55.56396",\r
+        "id": "69c506db.344ae8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn ",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 661.538013458252,\r
-        "y": 1571.8328762054443,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 640.288013458252,\r
+        "y": 1575.8328762054443,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "1dcea603.d095ca",\r
-                "286fea94.caec26"\r
+                "e0d8f775.adb548",\r
+                "1307c84a.e256c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "286fea94.caec26",\r
+        "id": "1307c84a.e256c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 882.5379161834717,\r
-        "y": 1593.8328419923782,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 861.2879161834717,\r
+        "y": 1597.8328419923782,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "8857322c.003b2"\r
+                "845c9ffd.b87b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8857322c.003b2",\r
+        "id": "845c9ffd.b87b7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1052.5378551483154,\r
-        "y": 1596.8328419923782,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1031.2878551483154,\r
+        "y": 1600.8328419923782,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "94eea86a.175328",\r
+        "id": "de430292.51fa5",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",\r
         "comments": "",\r
-        "x": 1052.537977218628,\r
-        "y": 1552.8328419923782,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1031.287977218628,\r
+        "y": 1556.8328419923782,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1dcea603.d095ca",\r
+        "id": "e0d8f775.adb548",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 885.5378551483154,\r
-        "y": 1552.8328419923782,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 864.2878551483154,\r
+        "y": 1556.8328419923782,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "94eea86a.175328"\r
+                "de430292.51fa5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ec433f0.4a2dec",\r
+        "id": "8b10096b.8cb7e8",\r
         "type": "switchNode",\r
         "name": "switch ActivateSDWANVpnInstance",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1248.5398406982422,\r
-        "y": 858.3332567214966,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1227.2898406982422,\r
+        "y": 862.3332567214966,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "df6b5755.18ea68"\r
+                "43a6f166.ec09e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd374d2.a7cdcb",\r
+        "id": "7ba15821.578698",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1005.8729438781738,\r
-        "y": 787.3333368301392,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 984.6229438781738,\r
+        "y": 791.3333368301392,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "415f5cb9.3a6e44",\r
-                "7ec433f0.4a2dec"\r
+                "daa35d7b.bbc16",\r
+                "8b10096b.8cb7e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df6b5755.18ea68",\r
+        "id": "43a6f166.ec09e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1344.2063522338867,\r
-        "y": 932.3333377838135,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1322.9563522338867,\r
+        "y": 936.3333377838135,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "a2c862ed.3d8da"\r
+                "f4ccb599.a134d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2c862ed.3d8da",\r
+        "id": "f4ccb599.a134d8",\r
         "type": "for",\r
         "name": "for vf-modules.vf-module_length",\r
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1558.4562377929688,\r
-        "y": 933.8333144187927,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1537.2062377929688,\r
+        "y": 937.8333144187927,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "26c3d6b7.9af80a"\r
+                "f6720c82.39b5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26c3d6b7.9af80a",\r
+        "id": "f6720c82.39b5d",\r
         "type": "switchNode",\r
         "name": "switch vpn-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1805.4562759399414,\r
-        "y": 928.8333973884583,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1784.2062759399414,\r
+        "y": 932.8333973884583,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "73c96ff0.116a"\r
+                "460bb48a.240e2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73c96ff0.116a",\r
+        "id": "460bb48a.240e2c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1956.2062301635742,\r
-        "y": 930.3333129882812,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1934.9562301635742,\r
+        "y": 934.3333129882812,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "736b8a4d.4ec784"\r
+                "ac3fc038.e0007"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "736b8a4d.4ec784",\r
+        "id": "ac3fc038.e0007",\r
         "type": "set",\r
         "name": "set prop.vpn1Id",\r
         "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2130.2069778442383,\r
-        "y": 930.3333714008331,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2108.9569778442383,\r
+        "y": 934.3333714008331,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9412ef29.cc029",\r
+        "id": "43b17553.c7382c",\r
         "type": "set",\r
         "name": "Add sites to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2560.540351867676,\r
-        "y": 836.3333714008331,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2539.290351867676,\r
+        "y": 840.3333714008331,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4b9ca75a.7fc698",\r
+        "id": "36d57da.c3bd682",\r
         "type": "set",\r
         "name": "Add site attachement to list and update length",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2591.5402450561523,\r
-        "y": 879.3333377838135,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2570.2902450561523,\r
+        "y": 883.3333377838135,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6278217c.89959",\r
+        "id": "16a0b0ad.e2c3df",\r
         "type": "set",\r
         "name": "set prop.siteAttachement_length=0",\r
         "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 677.5396194458008,\r
-        "y": 584.333330154419,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 656.2896194458008,\r
+        "y": 588.333330154419,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f98893a0.de7a4",\r
+        "id": "8eb63937.68f308",\r
         "type": "block",\r
         "name": "block atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1790.873275756836,\r
-        "y": 812.3333358764648,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1769.623275756836,\r
+        "y": 816.3333358764648,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "39ba7083.5ed54",\r
-                "5110ed96.6f1424",\r
-                "c2809bfd.795218"\r
+                "f89ede9f.dfe34",\r
+                "fe16c8cc.020428",\r
+                "9d46cf63.0dcd9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5110ed96.6f1424",\r
+        "id": "fe16c8cc.020428",\r
         "type": "switchNode",\r
         "name": "switch role",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1953.2062072753906,\r
-        "y": 743.3333349227905,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1931.9562072753906,\r
+        "y": 747.3333349227905,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "1e253f6e.5c04c1"\r
+                "7b19ac17.f7b154"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e253f6e.5c04c1",\r
+        "id": "7b19ac17.f7b154",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2116.206211090088,\r
-        "y": 738.3333358764648,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2094.956211090088,\r
+        "y": 742.3333358764648,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "76558c73.4a9c94"\r
+                "5fca6bb6.2ad174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76558c73.4a9c94",\r
+        "id": "5fca6bb6.2ad174",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2284.206253051758,\r
-        "y": 732.3333339691162,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2262.956253051758,\r
+        "y": 736.3333339691162,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "7fa808fb.9dfb68",\r
-                "74735438.9332ac",\r
-                "138a0f19.6e1331"\r
+                "fa5fdce5.2309f",\r
+                "d71b47e7.ba0928",\r
+                "368fa25d.21f04e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74735438.9332ac",\r
+        "id": "d71b47e7.ba0928",\r
         "type": "switchNode",\r
         "name": "switch sd-wan-edge",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2479.206382751465,\r
-        "y": 693.3333253860474,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2457.956382751465,\r
+        "y": 697.3333253860474,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "201641a0.5890ce"\r
+                "4c9e170f.05bda8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fa808fb.9dfb68",\r
+        "id": "fa5fdce5.2309f",\r
         "type": "switchNode",\r
         "name": "switch dsvpn-hub",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2476.2064895629883,\r
-        "y": 748.333340883255,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2454.9564895629883,\r
+        "y": 752.333340883255,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "f53ab0a6.6d677"\r
+                "a41f3558.9efd38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69b796c5.6fe848",\r
+        "id": "8f17f745.17ddb8",\r
         "type": "set",\r
         "name": "set spoke role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
         "comments": "",\r
-        "x": 2809.2065048217773,\r
-        "y": 687.3333711624146,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2787.9565048217773,\r
+        "y": 691.3333711624146,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "861df320.7eae2",\r
+        "id": "44a0a864.8cd1d8",\r
         "type": "set",\r
         "name": "set hub role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 2808.2062644958496,\r
-        "y": 742.3333549499512,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2786.9562644958496,\r
+        "y": 746.3333549499512,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "201641a0.5890ce",\r
+        "id": "4c9e170f.05bda8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2649.2063522338867,\r
-        "y": 689,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2627.9563522338867,\r
+        "y": 693,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "69b796c5.6fe848"\r
+                "8f17f745.17ddb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f53ab0a6.6d677",\r
+        "id": "a41f3558.9efd38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2653.2063522338867,\r
-        "y": 744,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2631.9563522338867,\r
+        "y": 748,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "861df320.7eae2"\r
+                "44a0a864.8cd1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "188a2b9c.34d5e4",\r
+        "id": "b87c5ca2.4198d",\r
         "type": "update",\r
         "name": "update SDWAN VPN status to AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 661.5708885192871,\r
-        "y": 2008.031280040741,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 640.3208885192871,\r
+        "y": 2012.031280040741,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "44113153.ffa83",\r
+        "id": "b4355150.f8381",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 658.2059059143066,\r
-        "y": 1951.1261107651517,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 634.9559097290039,\r
+        "y": 1957.126205444336,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd4a9b23.d614c8",\r
+        "id": "ea89a3cd.96c6c",\r
         "type": "set",\r
         "name": "set vf-module-id and vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 692.2059059143066,\r
-        "y": 1902.6261098114774,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 670.9559097290039,\r
+        "y": 1910.6261444091797,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "760751d.6fd76b",\r
+        "id": "e352097b.fa56f8",\r
         "type": "set",\r
         "name": "copy input data in service-data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 656.2058601379395,\r
-        "y": 1854.876064300537,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 634.9558601379395,\r
+        "y": 1858.876064300537,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45f5fb20.78ea64",\r
+        "id": "9f914b2c.f63948",\r
         "type": "set",\r
         "name": "set device PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",\r
         "comments": "",\r
-        "x": 662.5709266662598,\r
-        "y": 1748.0314636230469,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 641.3209266662598,\r
+        "y": 1752.0314636230469,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b05dede5.e0278",\r
+        "id": "23f60fe.f5fa6f",\r
         "type": "set",\r
         "name": "set lan PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",\r
         "comments": "",\r
-        "x": 648.5708503723145,\r
-        "y": 1802.0312767028809,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 627.3208503723145,\r
+        "y": 1806.0312767028809,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f9763b5.4e87fc",\r
+        "id": "1a9cf10f.4a8b1f",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic21.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"prop.attach.siteId\"/>\n<parameter name=\"field3\" value='`$prop.attach.siteId`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2485.5709915161133,\r
-        "y": 924.5312805175781,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2464.3209915161133,\r
+        "y": 928.5312805175781,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "138a0f19.6e1331",\r
+        "id": "368fa25d.21f04e",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2454.571002960205,\r
-        "y": 655.531247138977,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 2433.321002960205,\r
+        "y": 659.531247138977,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2809bfd.795218",\r
+        "id": "9d46cf63.0dcd9",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1948.5708541870117,\r
-        "y": 687.53125,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1927.3208541870117,\r
+        "y": 691.53125,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a37e9bab.abd118",\r
+        "id": "62b5eb93.96f0e4",\r
         "type": "comment",\r
         "name": "**revert the changes",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1349.5708808898926,\r
-        "y": 693.0312824249268,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1328.3208808898926,\r
+        "y": 697.0312824249268,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a795886.274f28",\r
+        "id": "4995fb6d.83aaf4",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.7538909912109,\r
-        "y": 507.25390625,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 871.5038909912109,\r
+        "y": 511.25390625,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "779d12ab.8187fc"\r
+                "208d9618.3a993a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "779d12ab.8187fc",\r
+        "id": "208d9618.3a993a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 998.75390625,\r
-        "y": 558.25390625,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 977.50390625,\r
+        "y": 562.25390625,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "e23c505c.41fa2"\r
+                "fd503aa4.1469a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c633f8a.ecb75",\r
+        "id": "8fd527ce.0b2738",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 693.0039138793945,\r
-        "y": 468.0039048194885,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 671.7539138793945,\r
+        "y": 472.0039048194885,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "4a795886.274f28"\r
+                "4995fb6d.83aaf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e23c505c.41fa2",\r
+        "id": "fd503aa4.1469a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1151.003890991211,\r
-        "y": 555.0039281845093,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1129.753890991211,\r
+        "y": 559.0039281845093,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "aa0d1480.7f1978"\r
+                "2dd1b5ff.e9de3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f599447.9ac3fb8",\r
+        "id": "258487d9.bf18e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1894.7539710998535,\r
-        "y": 553.0039119720459,\r
-        "z": "d0c9a483.09f7c8",\r
+        "x": 1873.5039710998535,\r
+        "y": 557.0039119720459,\r
+        "z": "a60b8cc5.55e8f",\r
         "wires": [\r
             [\r
-                "1f605289.f2eb7d"\r
+                "bc24bdbf.b7fae"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "63f09f8.86bc26",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 878.2539176940918,\r
+        "y": 910.7539704740047,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "6c04212d.63f27"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b3737121.de6a3",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 881.7448844909668,\r
+        "y": 958.328006118536,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "b8053b7f.3dfe58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b40d4802.cec768",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 877.0778923034668,\r
+        "y": 999.6613191068172,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "11f26c3c.e24064"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b8053b7f.3dfe58",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1058.3162956237793,\r
+        "y": 946.6137422025204,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "11f26c3c.e24064",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1064.8504486083984,\r
+        "y": 995.1005118787289,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b9f93820.627df8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 880.2539901733398,\r
+        "y": 1053.7540006637573,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "ea0a2431.4fcee8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4b6f89c7.7da458",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 872.5039901733398,\r
+        "y": 1107.3968839645386,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "10698363.0892ad"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea0a2431.4fcee8",\r
+        "type": "set",\r
+        "name": "set token-id",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
+        "comments": "",\r
+        "x": 1030.2539176940918,\r
+        "y": 1054.7539691925049,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10698363.0892ad",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
+        "comments": "",\r
+        "x": 1025.2539901733398,\r
+        "y": 1107.1469449996948,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6c04212d.63f27",\r
+        "type": "set",\r
+        "name": "set controller data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
+        "comments": "",\r
+        "x": 1073.7539978027344,\r
+        "y": 905.7539749145508,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "97edc5d7.68c598",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Get token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 631.2539672851562,\r
+        "y": 1076.754077911377,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "b9f93820.627df8",\r
+                "4b6f89c7.7da458"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "13f149d1.1db0a6",\r
+        "type": "get-resource",\r
+        "name": "get-resource esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 616.254035949707,\r
+        "y": 957.7539901733398,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            [\r
+                "63f09f8.86bc26",\r
+                "b3737121.de6a3",\r
+                "b40d4802.cec768"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "deaed14.de5b43",\r
+        "type": "execute",\r
+        "name": "execute Properties",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 631.00390625,\r
+        "y": 291.50390625,\r
+        "z": "a60b8cc5.55e8f",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index 833563e..b70f8ce 100644 (file)
@@ -1,6 +1,6 @@
 [\r
     {\r
-        "id": "39688a3a.06a796",\r
+        "id": "f2c51e78.6ee01",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 265.00390625,\r
-        "y": 145.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 233.5,\r
+        "y": 162.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "921891f8.416e5"\r
+                "e7f78c27.133fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "921891f8.416e5",\r
+        "id": "e7f78c27.133fa",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-site-create",\r
         "xml": "<method rpc='sdwan-vf-operation-site-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 264.00390625,\r
-        "y": 245.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 232.5,\r
+        "y": 262.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "22a013b4.ab58dc"\r
+                "31fa463e.82923a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "695e0384.f33d9c",\r
+        "id": "bac9bd77.fe0f",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 94.50390625,\r
-        "y": 56.999998569488525,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 85,\r
+        "y": 68.00000381469727,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "39688a3a.06a796"\r
+                "f2c51e78.6ee01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22a013b4.ab58dc",\r
+        "id": "31fa463e.82923a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 423.00389099121094,\r
-        "y": 361.99999952316284,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 391.49998474121094,\r
+        "y": 378.9999990463257,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "4325b612.73e1e8",\r
-                "a6c02374.2dca",\r
-                "40ba27b5.057bf8",\r
-                "d6478b6b.a2b888",\r
-                "59e1bfa3.d11e4",\r
-                "1c5585c5.9cdc3a",\r
-                "a7e8dd90.c6661",\r
-                "2f9ca627.c38e7a",\r
-                "40436b2a.16f614",\r
-                "64771e44.2196d",\r
-                "bb863987.8db5d8",\r
-                "462de6d9.81f588"\r
+                "dda69c6e.0dcdc",\r
+                "73e90791.30e428",\r
+                "539f4691.77ee38",\r
+                "b886ea54.85e0f8",\r
+                "be0d3540.8ebb28",\r
+                "788efb60.76f4a4",\r
+                "154ced05.a101f3",\r
+                "76dbb250.b292cc",\r
+                "df7eb194.69b7e",\r
+                "6868f266.5fe7ec",\r
+                "e78bb1b3.a529d",\r
+                "2b07f61e.bf4a1a",\r
+                "fd37bb03.271ec8",\r
+                "395e35c1.a6a5fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4325b612.73e1e8",\r
+        "id": "dda69c6e.0dcdc",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 723.3333129882812,\r
-        "y": 253.49612379074097,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 691.8294067382812,\r
+        "y": 270.4961233139038,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "63fc0005.8f2ee"\r
+                "e02bea98.6a2108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63fc0005.8f2ee",\r
+        "id": "e02bea98.6a2108",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.3334045410156,\r
-        "y": 252.1627869606018,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 943.8294982910156,\r
+        "y": 269.16278648376465,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "c555201.0223fe"\r
+                "44afa032.ce578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fae689f.7fef88",\r
+        "id": "c12c2186.d601b",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1346.9998931884766,\r
-        "y": 254.16278982162476,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1315.4959869384766,\r
+        "y": 271.1627893447876,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c555201.0223fe",\r
+        "id": "44afa032.ce578",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193.6667213439941,\r
-        "y": 254.1627688407898,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1162.1628150939941,\r
+        "y": 271.16276836395264,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "6fae689f.7fef88"\r
+                "c12c2186.d601b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6478b6b.a2b888",\r
+        "id": "b886ea54.85e0f8",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.2540969848633,\r
-        "y": 475.6666569709778,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 765.7501907348633,\r
+        "y": 492.6666564941406,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "e10e6c76.58a1d"\r
+                "d6ac010b.ad6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e10e6c76.58a1d",\r
+        "id": "d6ac010b.ad6e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1012.0324401855469,\r
-        "y": 473.2222409248352,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 980.5285339355469,\r
+        "y": 490.22224044799805,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "9a3f095b.53aca8",\r
-                "454b0ff.c77c1f"\r
+                "265e23d4.36e02c",\r
+                "e3c83d1b.72db1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a3f095b.53aca8",\r
+        "id": "265e23d4.36e02c",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.2886428833008,\r
-        "y": 450.9703793525696,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1176.7847366333008,\r
+        "y": 467.9703788757324,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "454b0ff.c77c1f",\r
+        "id": "e3c83d1b.72db1",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1177.7330703735352,\r
-        "y": 487.9704957008362,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1146.2291641235352,\r
+        "y": 504.970495223999,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b7ed90b.0ee057",\r
+        "id": "6cbee016.f6042",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1181.2542991638184,\r
-        "y": 410.33332538604736,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1149.7503929138184,\r
+        "y": 427.3333249092102,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6c02374.2dca",\r
+        "id": "73e90791.30e428",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 737.75390625,\r
-        "y": 208.99999284744263,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 706.25,\r
+        "y": 225.99999237060547,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "698329a9.119718"\r
+                "d8c3ff3.9b067"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "698329a9.119718",\r
+        "id": "d8c3ff3.9b067",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 924.4205856323242,\r
-        "y": 208.33329057693481,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 892.9166793823242,\r
+        "y": 225.33329010009766,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "f31a5878.bf4fd8"\r
+                "94ec6856.a83cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f31a5878.bf4fd8",\r
+        "id": "94ec6856.a83cd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 1106.0872116088867,\r
-        "y": 208.33329057693481,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1074.5833053588867,\r
+        "y": 225.33329010009766,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40ba27b5.057bf8",\r
+        "id": "539f4691.77ee38",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 779.0038957595825,\r
-        "y": 328.99999380111694,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 747.4999895095825,\r
+        "y": 345.9999933242798,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "51b4cfc4.d81ec",\r
-                "9cba331b.ccedc"\r
+                "83439569.31aa38",\r
+                "bcb4cae0.4f9908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51b4cfc4.d81ec",\r
+        "id": "83439569.31aa38",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1010.00390625,\r
-        "y": 304.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 978.5,\r
+        "y": 321.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "3f2cb9e5.051a76"\r
+                "ba3dff03.8dc24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cba331b.ccedc",\r
+        "id": "bcb4cae0.4f9908",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1010.00390625,\r
-        "y": 344.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 978.5,\r
+        "y": 361.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "e0c33286.cb104"\r
+                "890fe4fa.c0f128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f2cb9e5.051a76",\r
+        "id": "ba3dff03.8dc24",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1152.50390625,\r
-        "y": 304.999990940094,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1121,\r
+        "y": 321.99999046325684,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e0c33286.cb104",\r
+        "id": "890fe4fa.c0f128",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1154.3609504699707,\r
-        "y": 344.9365029335022,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1122.8570442199707,\r
+        "y": 361.93650245666504,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "8b8b9efa.275ce",\r
-                "1791a391.e4fccc"\r
+                "3895380d.b43d08",\r
+                "ba2eca23.0f6508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1791a391.e4fccc",\r
+        "id": "ba2eca23.0f6508",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1307.059425354004,\r
-        "y": 314.55560162616894,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1275.555519104004,\r
+        "y": 331.5556011493318,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b8b9efa.275ce",\r
+        "id": "3895380d.b43d08",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1363.4879302978516,\r
-        "y": 367.7777314186096,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1331.9840240478516,\r
+        "y": 384.77773094177246,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "aaa91538.94bcc8"\r
+                "8202a636.7f9518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd3d2242.9164e",\r
+        "id": "51af10a6.1b1e3",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1587.1386604309082,\r
-        "y": 326.03178882598877,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1555.6347541809082,\r
+        "y": 343.0317883491516,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aaa91538.94bcc8",\r
+        "id": "8202a636.7f9518",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1638.7736511230469,\r
-        "y": 367.3492341041565,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1607.2697448730469,\r
+        "y": 384.34923362731934,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "a84edb80.0d80e8"\r
+                "ce7e5cca.15004"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a84edb80.0d80e8",\r
+        "id": "ce7e5cca.15004",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1539.503849029541,\r
-        "y": 425.92066526412964,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1507.999942779541,\r
+        "y": 442.9206647872925,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             [\r
-                "7ca646fd.066d78"\r
+                "7c5cfe61.fdc3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca646fd.066d78",\r
+        "id": "7c5cfe61.fdc3f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1687.2539520263672,\r
-        "y": 425.77785733295605,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 1655.7500457763672,\r
+        "y": 442.7778568561189,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40436b2a.16f614",\r
+        "id": "df7eb194.69b7e",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.site-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n",\r
         "comments": "",\r
-        "x": 790.8571014404297,\r
-        "y": 755.4962139129639,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 759.3531951904297,\r
+        "y": 772.4962134361267,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f9ca627.c38e7a",\r
+        "id": "76dbb250.b292cc",\r
         "type": "execute",\r
         "name": "execute generate-vf-module-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.site-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 799.1905975341797,\r
-        "y": 702.1629467010498,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 767.6866912841797,\r
+        "y": 719.1629462242126,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7e8dd90.c6661",\r
+        "id": "154ced05.a101f3",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 773.1905746459961,\r
-        "y": 648.1628403663635,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 741.6866683959961,\r
+        "y": 665.1628398895264,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "59e1bfa3.d11e4",\r
+        "id": "be0d3540.8ebb28",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 788.1902351379395,\r
-        "y": 538.1542210578918,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 756.6863288879395,\r
+        "y": 555.1542205810547,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c5585c5.9cdc3a",\r
+        "id": "788efb60.76f4a4",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-site-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 804.190544128418,\r
-        "y": 590.154402256012,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 772.686637878418,\r
+        "y": 607.1544017791748,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64771e44.2196d",\r
+        "id": "6868f266.5fe7ec",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.site-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 786.0039939880371,\r
-        "y": 806.0000591278076,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 754.5000877380371,\r
+        "y": 823.0000586509705,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb863987.8db5d8",\r
+        "id": "e78bb1b3.a529d",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
         "comments": "",\r
-        "x": 795.5040130615234,\r
-        "y": 854.9999685287476,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 764.0001068115234,\r
+        "y": 871.9999680519104,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     },\r
     {\r
-        "id": "670cd372.9429ec",\r
+        "id": "fd37bb03.271ec8",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` \" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 798.0039482116699,\r
-        "y": 900.4999747276306,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 766.5000419616699,\r
+        "y": 917.4999742507935,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4d453124.5225e",\r
+        "id": "395e35c1.a6a5fa",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' \n      key='site-resource.site-resource-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-site\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-sites/sdwan-site/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" /-->\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.0038909912109,\r
-        "y": 947.5000224113464,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 765.4999847412109,\r
+        "y": 964.5000219345093,\r
+        "z": "147f59c8.d7f266",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "462de6d9.81f588",\r
+        "id": "2b07f61e.bf4a1a",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 745.7264213562012,\r
-        "y": 993.6738653182983,\r
-        "z": "5099ec4c.e95b94",\r
+        "x": 714.2225151062012,\r
+        "y": 1010.6738648414612,\r
+        "z": "147f59c8.d7f266",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 244799a..c85d68f 100644 (file)
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "294747fd.2c2d98",\r
+        "id": "951a58ad.b622b8",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-activate",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 211.5,\r
-        "y": 201.99997901916504,\r
-        "z": "79a5b197.5d84",\r
+        "x": 274.00390625,\r
+        "y": 217.9999771118164,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "4068c2f3.520fdc"\r
+                "9f312de.ebe59d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cff9203f.6e7f7",\r
+        "id": "ce93efc.702d31",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 89.0713882446289,\r
-        "y": 38,\r
-        "z": "79a5b197.5d84",\r
+        "x": 151.5752944946289,\r
+        "y": 53.99999809265137,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "78d3821a.ddc91c"\r
+                "6be0f3e4.bbd19c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78d3821a.ddc91c",\r
+        "id": "6be0f3e4.bbd19c",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 188.35708618164062,\r
-        "y": 112.23810789268464,\r
-        "z": "79a5b197.5d84",\r
+        "x": 250.86099243164062,\r
+        "y": 128.238105985336,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "294747fd.2c2d98"\r
+                "951a58ad.b622b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4068c2f3.520fdc",\r
+        "id": "9f312de.ebe59d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 189.73804473876953,\r
-        "y": 373.66666814964265,\r
-        "z": "79a5b197.5d84",\r
+        "x": 252.24195098876953,\r
+        "y": 389.666666242294,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "3a6b0423.a0a0ac",\r
-                "d7b531c1.f5a86",\r
-                "29c1d8e.17e3128",\r
-                "206b62f4.ff1b8e",\r
-                "ac1ddf15.75241",\r
-                "fd35c3d4.a8e8a"\r
+                "94324bec.af0568",\r
+                "9e7bd407.d70c08",\r
+                "240a825d.6226de",\r
+                "c7c4dafb.a3de48",\r
+                "af4009d1.a698c8",\r
+                "db202f3e.dab93",\r
+                "5b908f22.f7f5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a6b0423.a0a0ac",\r
+        "id": "94324bec.af0568",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Active",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",\r
         "comments": "",\r
-        "x": 598.8850250244141,\r
-        "y": 446.67056941986084,\r
-        "z": "79a5b197.5d84",\r
+        "x": 667.3889236450195,\r
+        "y": 576.6705493927002,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7b531c1.f5a86",\r
+        "id": "9e7bd407.d70c08",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 519.0717163085938,\r
-        "y": 572.5971069335938,\r
-        "z": "79a5b197.5d84",\r
+        "x": 587.5756149291992,\r
+        "y": 702.5970869064331,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29c1d8e.17e3128",\r
+        "id": "240a825d.6226de",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 605.0716705322266,\r
-        "y": 394.5968236923218,\r
-        "z": "79a5b197.5d84",\r
+        "x": 673.575569152832,\r
+        "y": 524.5968036651611,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
     },\r
     {\r
-        "id": "206b62f4.ff1b8e",\r
+        "id": "c7c4dafb.a3de48",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 619.5000610351562,\r
-        "y": 263.00000545661896,\r
-        "z": "79a5b197.5d84",\r
+        "x": 682.0039672851562,\r
+        "y": 279.00000354927033,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "510e4a8b.ead204",\r
-                "c779a013.c610f",\r
-                "7ee910c1.660bf"\r
+                "f4d8522c.a4d9b",\r
+                "2bef8938.25fbd6",\r
+                "4701274a.571b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ee910c1.660bf",\r
+        "id": "4701274a.571b48",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 878.4689559936523,\r
-        "y": 224.96876499336213,\r
-        "z": "79a5b197.5d84",\r
+        "x": 940.9728622436523,\r
+        "y": 240.9687630860135,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "a7558172.b2121"\r
+                "fd0fb6fb.9706b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7558172.b2121",\r
+        "id": "fd0fb6fb.9706b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1033.2778434753418,\r
-        "y": 243.88903352897614,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1095.7817497253418,\r
+        "y": 259.8890316216275,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
     },\r
     {\r
-        "id": "510e4a8b.ead204",\r
+        "id": "f4d8522c.a4d9b",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 871.5000953674316,\r
-        "y": 264.00008651893586,\r
-        "z": "79a5b197.5d84",\r
+        "x": 934.0040016174316,\r
+        "y": 280.0000846115872,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "a7558172.b2121"\r
+                "fd0fb6fb.9706b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c779a013.c610f",\r
+        "id": "2bef8938.25fbd6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 864.5005035400391,\r
-        "y": 297.0000903336331,\r
-        "z": "79a5b197.5d84",\r
+        "x": 927.0044097900391,\r
+        "y": 313.0000884262845,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "6aaa180d.7575b8"\r
+                "f298ba1.2d54c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6aaa180d.7575b8",\r
+        "id": "f298ba1.2d54c48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1011.7700462341309,\r
-        "y": 297.55473539512604,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1074.2739524841309,\r
+        "y": 313.5547334877774,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "46580136.d7c0b"\r
+                "5f9416f7.4477e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46580136.d7c0b",\r
+        "id": "5f9416f7.4477e8",\r
         "type": "for",\r
         "name": "for vidx..service-data.vnfs.vnf_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1257.7861633300781,\r
-        "y": 304.4286558357999,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1320.2900695800781,\r
+        "y": 320.42865392845124,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "a66fcd87.a077a"\r
+                "d1140903.826428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a66fcd87.a077a",\r
+        "id": "d1140903.826428",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1477.1357955932617,\r
-        "y": 303.9687359062955,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1539.6397018432617,\r
+        "y": 319.96873399894685,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "ba7c0ee7.d144d"\r
+                "634303dc.2373ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba7c0ee7.d144d",\r
+        "id": "634303dc.2373ac",\r
         "type": "switchNode",\r
         "name": "switch vnfid found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1631.2153930664062,\r
-        "y": 303.67881796043366,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1693.7192993164062,\r
+        "y": 319.67881605308503,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "a9157f30.c0f4f"\r
+                "acd02e3d.622b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9157f30.c0f4f",\r
+        "id": "acd02e3d.622b7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1807.1675148010254,\r
-        "y": 303.57150003593415,\r
-        "z": "79a5b197.5d84",\r
+        "x": 1869.6714210510254,\r
+        "y": 319.5714981285855,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             [\r
-                "e051341c.b94158"\r
+                "eb3ae849.6809a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e051341c.b94158",\r
+        "id": "eb3ae849.6809a8",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
         "comments": "",\r
-        "x": 2016.6998901367188,\r
-        "y": 305.3216001717374,\r
-        "z": "79a5b197.5d84",\r
+        "x": 2079.2037963867188,\r
+        "y": 321.32159826438874,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac1ddf15.75241",\r
+        "id": "af4009d1.a698c8",\r
         "type": "save",\r
         "name": "update AnAI - vnf-instance.orchestration-status",\r
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 624.5000305175781,\r
-        "y": 513.0103950500488,\r
-        "z": "79a5b197.5d84",\r
+        "x": 693.0039291381836,\r
+        "y": 643.0103750228882,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fd35c3d4.a8e8a",\r
+        "id": "db202f3e.dab93",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
         "comments": "",\r
-        "x": 603.5001449584961,\r
-        "y": 344.010356426239,\r
-        "z": "79a5b197.5d84",\r
+        "x": 672.0040435791016,\r
+        "y": 474.01033639907837,\r
+        "z": "e44dd5e7.6a1128",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "5b908f22.f7f5a",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-level-oper-status",\r
+        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 658.75390625,\r
+        "y": 379.00390625,\r
+        "z": "e44dd5e7.6a1128",\r
+        "wires": [\r
+            [\r
+                "5ccb4fe0.99339",\r
+                "814ec70c.a8b9c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5ccb4fe0.99339",\r
+        "type": "outcome",\r
+        "name": "outcome Created",\r
+        "xml": "<outcome value='Created'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 904.5872001647949,\r
+        "y": 380.1150040626526,\r
+        "z": "e44dd5e7.6a1128",\r
+        "wires": [\r
+            [\r
+                "e3b020d0.17a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "814ec70c.a8b9c8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 882.5872192382812,\r
+        "y": 430.1150155067444,\r
+        "z": "e44dd5e7.6a1128",\r
+        "wires": [\r
+            [\r
+                "50309b2.08dbf64"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "50309b2.08dbf64",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
+        "comments": "",\r
+        "x": 1042.086986541748,\r
+        "y": 433.11501455307007,\r
+        "z": "e44dd5e7.6a1128",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e3b020d0.17a88",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1114.8935737609863,\r
+        "y": 391.44017934799194,\r
+        "z": "e44dd5e7.6a1128",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index af26289..65c2f0e 100644 (file)
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "668a4a6a.11fb74",\r
+        "id": "4d340fd2.1d47a",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-create",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 260.0104064941406,\r
-        "y": 185.0104217529297,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 251.00390625,\r
+        "y": 191.9999925820157,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "f0e43a5a.fb4558"\r
+                "dd995ca6.5527c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61b91100.d7ede",\r
+        "id": "83ce2cf0.a21b",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 136.581787109375,\r
-        "y": 37.010429170913994,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 127.57528686523438,\r
+        "y": 44,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "bc2b5176.73e7e"\r
+                "d4e5788.5ad9988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc2b5176.73e7e",\r
+        "id": "d4e5788.5ad9988",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 238.86749267578125,\r
-        "y": 95.24853324890137,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 229.86099243164062,\r
+        "y": 102.23810407798737,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "668a4a6a.11fb74"\r
+                "4d340fd2.1d47a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0e43a5a.fb4558",\r
+        "id": "dd995ca6.5527c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 240.24845123291016,\r
-        "y": 356.6770935058594,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 231.24195098876953,\r
+        "y": 363.6666643349454,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "6dab251c.49205c",\r
-                "10940ab9.a5fb85",\r
-                "2aab9019.e3a45",\r
-                "be0c443b.256188",\r
-                "46389e76.c8e6",\r
-                "89f88258.b891f",\r
-                "dc405c48.cda4b",\r
-                "1170677a.a70a49",\r
-                "997721e4.3b61b",\r
-                "71ec508c.bf2e1",\r
-                "60143a97.af1404"\r
+                "9e4483c6.3ac77",\r
+                "a13164e4.2addc8",\r
+                "3a6751cb.2db1fe",\r
+                "deb0deb9.10aa8",\r
+                "8f8480.f469fb8",\r
+                "f27c92ed.2a351",\r
+                "4152c1db.9724f",\r
+                "34769e57.986742",\r
+                "27f27223.64947e",\r
+                "5e423ee5.be879",\r
+                "dfdcb682.501ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10940ab9.a5fb85",\r
+        "id": "a13164e4.2addc8",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Created",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
         "comments": "",\r
-        "x": 674.3952026367188,\r
-        "y": 610.6810224326327,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 665.3887023925781,\r
+        "y": 617.6705932617188,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6dab251c.49205c",\r
+        "id": "9e4483c6.3ac77",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
         "comments": "",\r
-        "x": 666.2483901977539,\r
-        "y": 505.67727449256927,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 657.2418899536133,\r
+        "y": 512.6668453216553,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46389e76.c8e6",\r
+        "id": "8f8480.f469fb8",\r
         "type": "execute",\r
         "name": "execute generate-vnf-index",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 654.5818939208984,\r
-        "y": 455.34385850746185,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 645.5753936767578,\r
+        "y": 462.33342933654785,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "60143a97.af1404",\r
+        "id": "dfdcb682.501ff8",\r
         "type": "set",\r
         "name": "set vnf-index to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 665.5819702148438,\r
-        "y": 562.3438623221591,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 656.5754699707031,\r
+        "y": 569.3334331512451,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2aab9019.e3a45",\r
+        "id": "3a6751cb.2db1fe",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 669.5817718505859,\r
-        "y": 235.34378507453948,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 660.5752716064453,\r
+        "y": 242.3333559036255,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "214b38d8.c822d8",\r
-                "308ac75b.244168"\r
+                "2c3f6b93.ddbca4",\r
+                "29bbdb18.cfe584"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "214b38d8.c822d8",\r
+        "id": "2c3f6b93.ddbca4",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 904.2961578369141,\r
-        "y": 230.48660543281585,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 895.2896575927734,\r
+        "y": 237.47617626190186,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "bcebd76e.5a08d8"\r
+                "8e783130.b1886"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcebd76e.5a08d8",\r
+        "id": "8e783130.b1886",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1064.5818634033203,\r
-        "y": 230.48669698555022,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1055.5753631591797,\r
+        "y": 237.47626781463623,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "308ac75b.244168",\r
+        "id": "29bbdb18.cfe584",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 900.7246971130371,\r
-        "y": 263.77243688423187,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 891.7181968688965,\r
+        "y": 270.76200771331787,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "af41a2cb.7d1be"\r
+                "64bc2d84.970e54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6ca1095.8fc32",\r
+        "id": "c816157.792fce8",\r
         "type": "set",\r
         "name": "set vnf-index = vnf_length",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
         "comments": "",\r
-        "x": 1293.5819396972656,\r
-        "y": 242.05816247779876,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1284.575439453125,\r
+        "y": 249.04773330688477,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1df9f5.ae8c56",\r
+        "id": "a9c0fb1a.4ae688",\r
         "type": "for",\r
         "name": "for each existing VNF",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1282.0105590820312,\r
-        "y": 277.0581343444064,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1273.0040588378906,\r
+        "y": 284.04770517349243,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "6e99eb9c.1d2854"\r
+                "e4810c54.16f7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af41a2cb.7d1be",\r
+        "id": "64bc2d84.970e54",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1035.438980102539,\r
-        "y": 265.77240636665374,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1026.4324798583984,\r
+        "y": 272.76197719573975,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "c6ca1095.8fc32",\r
-                "c1df9f5.ae8c56"\r
+                "c816157.792fce8",\r
+                "a9c0fb1a.4ae688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e99eb9c.1d2854",\r
+        "id": "e4810c54.16f7c",\r
         "type": "switchNode",\r
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1675.2962951660156,\r
-        "y": 277.62961843330413,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1666.289794921875,\r
+        "y": 284.61918926239014,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "b8a872f3.280e3"\r
+                "d88564b1.978518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8a872f3.280e3",\r
+        "id": "d88564b1.978518",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1956.5819969177246,\r
-        "y": 276.20102384407073,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1947.575496673584,\r
+        "y": 283.19059467315674,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             [\r
-                "2b05b5cd.40cb0a"\r
+                "eb2d673c.26d6e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bd5d19c.ac71ae",\r
+        "id": "5a4256cd.31fdd8",\r
         "type": "comment",\r
         "name": "make sure this vnf-id doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1644.4389114379883,\r
-        "y": 241.2010104926303,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1635.4324111938477,\r
+        "y": 248.1905813217163,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be0c443b.256188",\r
+        "id": "deb0deb9.10aa8",\r
         "type": "set",\r
         "name": "set new vnf_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 626.5818939208984,\r
-        "y": 403.34385516960174,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 617.5753936767578,\r
+        "y": 410.33342599868774,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89f88258.b891f",\r
+        "id": "f27c92ed.2a351",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 613.5818557739258,\r
-        "y": 873.607373979874,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 604.5753555297852,\r
+        "y": 880.59694480896,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71ec508c.bf2e1",\r
+        "id": "5e423ee5.be879",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-resource.vpn-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" /-->",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 676.2486267089844,\r
-        "y": 820.6072671683505,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 667.2421264648438,\r
+        "y": 827.5968379974365,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc405c48.cda4b",\r
+        "id": "4152c1db.9724f",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
-        "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />",\r
+        "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 667.5818862915039,\r
-        "y": 651.6072929175571,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 658.5753860473633,\r
+        "y": 658.5968637466431,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1170677a.a70a49",\r
+        "id": "34769e57.986742",\r
         "type": "set",\r
         "name": "set vnf-request-input.",\r
         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 632.5815277099609,\r
-        "y": 354.33522775489837,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 623.5750274658203,\r
+        "y": 361.3247985839844,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b05b5cd.40cb0a",\r
+        "id": "eb2d673c.26d6e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 2085.153366088867,\r
-        "y": 327.2010381491855,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 2076.1468658447266,\r
+        "y": 334.1906089782715,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8463cd7c.a7a22",\r
+        "id": "6aca9b4.e7d1e64",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1378.5819778442383,\r
-        "y": 330.67710473854095,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 1369.5754776000977,\r
+        "y": 337.66667556762695,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecfeb487.443888",\r
+        "id": "301883bc.025f5c",\r
         "type": "comment",\r
         "name": "TODO: change AAI models",\r
         "info": "",\r
         "comments": "",\r
-        "x": 656.1924514770508,\r
-        "y": 720.9847257407382,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 647.1859512329102,\r
+        "y": 727.9742965698242,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "997721e4.3b61b",\r
+        "id": "27f27223.64947e",\r
         "type": "save",\r
         "name": "save AnAI - vnf-instance.orchestration-status",\r
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-index\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 722.5561904907227,\r
-        "y": 761.2575099738315,\r
-        "z": "872ff8dd.fe5e78",\r
+        "x": 713.549690246582,\r
+        "y": 768.2470808029175,\r
+        "z": "b6e8aa45.a03d48",\r
         "wires": [\r
             []\r
         ]\r
index 3d26891..41f88c4 100644 (file)
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "eafcb830.49a558",\r
+        "id": "a34c8b72.7caca8",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-delete",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 207,\r
-        "y": 214,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 244.00390625,\r
+        "y": 243.9999988079071,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "d02b15b4.dd4488"\r
+                "54a7ab4c.cd61a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a64a79.788248",\r
+        "id": "d8d59f04.fbf0d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 151.57138061523438,\r
-        "y": 38,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 188.57528686523438,\r
+        "y": 67.9999988079071,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "188a7052.71591"\r
+                "115026d6.80ce89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "188a7052.71591",\r
+        "id": "115026d6.80ce89",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 226.85708618164062,\r
-        "y": 78.23811149597168,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 263.8609924316406,\r
+        "y": 108.23811030387878,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "eafcb830.49a558"\r
+                "a34c8b72.7caca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2640aa8.7edda8",\r
+        "id": "e3e6f054.e2739",\r
         "type": "comment",\r
         "name": "site-vnf-topology-operation-delete",\r
         "info": "",\r
         "comments": "",\r
-        "x": 600.9162979125977,\r
-        "y": 111.58639907836914,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 637.9202041625977,\r
+        "y": 141.58639788627625,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d02b15b4.dd4488",\r
+        "id": "54a7ab4c.cd61a4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 228.23804473876953,\r
-        "y": 339.6666717529297,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 265.24195098876953,\r
+        "y": 369.6666705608368,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ac2e49a1.5e8568",\r
-                "4d83bd7.fa4f844",\r
-                "8cb0635e.d8e2c",\r
-                "faf06bed.cf0a38",\r
-                "c3cf9f4.9560f6",\r
-                "5c51b14f.3f60b",\r
-                "84b98584.0b5d68",\r
-                "64b20017.f4e26",\r
-                "c1ccb47b.c48ef8",\r
-                "dfa19665.762578",\r
-                "f3ab3fd1.f188e"\r
+                "5cec27dc.b4f998",\r
+                "e053b514.a7c2a8",\r
+                "538824d6.c6a6fc",\r
+                "a69377b.4606688",\r
+                "3ec3b469.7cc4ec",\r
+                "25ca64f5.0561dc",\r
+                "7d20c9cf.4fef58",\r
+                "4cc92ad1.2ef524",\r
+                "c339a825.6ccfe8",\r
+                "dd31e4a5.a51148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "faf06bed.cf0a38",\r
+        "id": "a69377b.4606688",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 689.6660842895508,\r
-        "y": 273.26117038726807,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 717.6699981689453,\r
+        "y": 287.2611780166626,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7bb61b60.8ccfe4",\r
-                "6a78f7f6.d96ae8"\r
+                "4a61f22a.1420fc",\r
+                "5dae927c.612acc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bb61b60.8ccfe4",\r
+        "id": "4a61f22a.1420fc",\r
         "type": "other",\r
         "name": "outcome Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 954.3883972167969,\r
-        "y": 255.81679248809814,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 982.3923110961914,\r
+        "y": 269.8168001174927,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ded5f144.4823a"\r
+                "2a103cd5.07a2e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ded5f144.4823a",\r
+        "id": "2a103cd5.07a2e4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1135.3882675170898,\r
-        "y": 250.81667041778564,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1163.3921813964844,\r
+        "y": 264.8166780471802,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a78f7f6.d96ae8",\r
+        "id": "5dae927c.612acc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 939.8883972167969,\r
-        "y": 307.8167552947998,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 967.8923110961914,\r
+        "y": 321.81676292419434,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "4b9e2f73.508cd"\r
+                "84a26be6.b55a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b9e2f73.508cd",\r
+        "id": "84a26be6.b55a98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1111.8881034851074,\r
-        "y": 307.8167533874512,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1139.892017364502,\r
+        "y": 321.8167610168457,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "247799a9.6130f6",\r
-                "84b938cb.78bee8"\r
+                "43c53e66.48eab",\r
+                "bc2744ca.9b7c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84b938cb.78bee8",\r
+        "id": "bc2744ca.9b7c98",\r
         "type": "switchNode",\r
         "name": "switch tmp.nidx ",\r
         "xml": "<switch test=\"`$tmp.nidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1286.8882751464844,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1314.892189025879,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7a17688b.c98ab8"\r
+                "36fbace6.f16d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cb0635e.d8e2c",\r
+        "id": "538824d6.c6a6fc",\r
         "type": "switchNode",\r
         "name": "switch vnf-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 660.0550842285156,\r
-        "y": 347.70563411712646,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 688.0589981079102,\r
+        "y": 361.705641746521,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "6f0effe.88561",\r
-                "4d0008ab.c847c8"\r
+                "9a7aa2ec.10efc",\r
+                "8c012c8c.5b9ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f0effe.88561",\r
+        "id": "9a7aa2ec.10efc",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 936.888427734375,\r
-        "y": 350.8167338371277,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 964.8923416137695,\r
+        "y": 364.8167414665222,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "1d4d444b.bf117c"\r
+                "bf8c6806.a7bce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0008ab.c847c8",\r
+        "id": "8c012c8c.5b9ba",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 897.8884124755859,\r
-        "y": 396.816782951355,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 925.8923263549805,\r
+        "y": 410.8167905807495,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "640a50b6.3e86d"\r
+                "1ed98412.25294c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "640a50b6.3e86d",\r
+        "id": "1ed98412.25294c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
         "comments": "",\r
-        "x": 1046.388126373291,\r
-        "y": 395.81676292419434,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1074.3920402526855,\r
+        "y": 409.81677055358887,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3cf9f4.9560f6",\r
-        "type": "switchNode",\r
-        "name": "switch vnf-id",\r
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 625.8884010314941,\r
-        "y": 228.81676387786865,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": [\r
-            [\r
-                "6f94c17f.e94a6"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6f94c17f.e94a6",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 823.8884658813477,\r
-        "y": 218.81677627563477,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": [\r
-            [\r
-                "723f2fa7.6d1e3"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "723f2fa7.6d1e3",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-request-input.vnf-input-parameters.name is a required input\" />\n",\r
-        "comments": "",\r
-        "x": 990.3883514404297,\r
-        "y": 215.81677055358887,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "5c51b14f.3f60b",\r
+        "id": "3ec3b469.7cc4ec",\r
         "type": "execute",\r
         "name": "execute requiredParameters",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 683.3884582519531,\r
-        "y": 168.81676292419434,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 704.392333984375,\r
+        "y": 230.8167576789856,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "247799a9.6130f6",\r
+        "id": "43c53e66.48eab",\r
         "type": "for",\r
         "name": "for nidx..service-data.vnfs.vnf[]",\r
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1347.3882789611816,\r
-        "y": 262.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1375.3921928405762,\r
+        "y": 276.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "b01b8e2f.7dbb9"\r
+                "d2baa75f.a56cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b01b8e2f.7dbb9",\r
+        "id": "d2baa75f.a56cd8",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1603.388298034668,\r
-        "y": 262.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1631.3922119140625,\r
+        "y": 276.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "357169.84af7e98"\r
+                "16946d10.c0e503"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "357169.84af7e98",\r
+        "id": "16946d10.c0e503",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1779.8883514404297,\r
-        "y": 265.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1807.8922653198242,\r
+        "y": 279.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "38f16832.2c5d68"\r
+                "c1f09a0b.fa73f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f16832.2c5d68",\r
+        "id": "c1f09a0b.fa73f8",\r
         "type": "set",\r
         "name": "set tmp.nidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",\r
         "comments": "",\r
-        "x": 1946.8883666992188,\r
-        "y": 326.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1974.8922805786133,\r
+        "y": 340.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc674990.6f1398",\r
+        "id": "841f20a7.73592",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1592.3882904052734,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1620.392204284668,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a17688b.c98ab8",\r
+        "id": "36fbace6.f16d84",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.8882904052734,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1482.892204284668,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "fc674990.6f1398"\r
+                "841f20a7.73592"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac2e49a1.5e8568",\r
+        "id": "5cec27dc.b4f998",\r
         "type": "set",\r
         "name": "set vnfId and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",\r
         "comments": "",\r
-        "x": 646.9051055908203,\r
-        "y": 562.333676815033,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 674.9090194702148,\r
+        "y": 576.3336844444275,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d83bd7.fa4f844",\r
+        "id": "e053b514.a7c2a8",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 603.0162582397461,\r
-        "y": 639.8892359733582,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 631.0201721191406,\r
+        "y": 653.8892436027527,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d4d444b.bf117c",\r
+        "id": "bf8c6806.a7bce8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1132.1947860717773,\r
-        "y": 358.141939163208,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1160.1986999511719,\r
+        "y": 372.14194679260254,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84b98584.0b5d68",\r
+        "id": "25ca64f5.0561dc",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",\r
         "comments": "",\r
-        "x": 629.0000762939453,\r
-        "y": 398.00006914138794,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 657.0039901733398,\r
+        "y": 412.00007677078247,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64b20017.f4e26",\r
+        "id": "7d20c9cf.4fef58",\r
         "type": "for",\r
         "name": "for lidx..service-data.vnfs.vnf[]",\r
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 653.0000610351562,\r
-        "y": 440.00006771087646,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 681.0039749145508,\r
+        "y": 454.000075340271,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ac122a7c.345458"\r
+                "69a35263.2a030c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac122a7c.345458",\r
+        "id": "69a35263.2a030c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 914.0001373291016,\r
-        "y": 444.000102519989,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 942.0040512084961,\r
+        "y": 458.00011014938354,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7381e65e.fc3b68"\r
+                "a4d1dd60.ffc74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381e65e.fc3b68",\r
+        "id": "a4d1dd60.ffc74",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106.0000839233398,\r
-        "y": 453.0001468658447,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1134.0039978027344,\r
+        "y": 467.00015449523926,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "61719a57.800f34"\r
+                "4e20e907.55e038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61719a57.800f34",\r
+        "id": "4e20e907.55e038",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1292.000099182129,\r
-        "y": 437.0000333786011,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1320.0040130615234,\r
+        "y": 451.0000410079956,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "9df0dc24.7346c"\r
+                "58cf5365.23557c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9df0dc24.7346c",\r
+        "id": "58cf5365.23557c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1443.0000228881836,\r
-        "y": 438.0000696182251,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1471.0039367675781,\r
+        "y": 452.00007724761963,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "c661d6a.46dd528",\r
-                "142b6671.1e430a"\r
+                "b99c095f.2dd4a8",\r
+                "9d68eef8.da1f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c661d6a.46dd528",\r
+        "id": "b99c095f.2dd4a8",\r
         "type": "set",\r
         "name": "set  vnf data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",\r
         "comments": "",\r
-        "x": 1610.0001907348633,\r
-        "y": 412.000253200531,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1638.0041046142578,\r
+        "y": 426.00026082992554,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "142b6671.1e430a",\r
+        "id": "9d68eef8.da1f9",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",\r
         "comments": "",\r
-        "x": 1630.0001182556152,\r
-        "y": 469.00018882751465,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1658.0040321350098,\r
+        "y": 483.0001964569092,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1ccb47b.c48ef8",\r
+        "id": "4cc92ad1.2ef524",\r
         "type": "set",\r
         "name": "set new vnf length",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",\r
         "comments": "",\r
-        "x": 621.1014747619629,\r
-        "y": 483.80442094802856,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 649.1053886413574,\r
+        "y": 497.8044285774231,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dfa19665.762578",\r
+        "id": "c339a825.6ccfe8",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",\r
         "comments": "",\r
-        "x": 651.000244140625,\r
-        "y": 522.0002040863037,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 679.0041580200195,\r
+        "y": 536.0002117156982,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f3ab3fd1.f188e",\r
+        "id": "dd31e4a5.a51148",\r
         "type": "save",\r
         "name": "delete AnAI - vnf-instance.orchestration-status",\r
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 708.0066375732422,\r
-        "y": 599.0106163024902,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 736.0105514526367,\r
+        "y": 613.0106239318848,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
index 808070f..9211d48 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
             </for>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \r
+               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \r
                     depth = '1'"\r
         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                 <outcome value='success'>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
-                <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+                <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='Active' />\r
-                <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />\r
+                <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\r
             </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
index d13f680..e4bdd6f 100644 (file)
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \r
+      key='site-resource.site-resource-id = $prop.site-vf-index' >\r
+                <parameter name='site-resource-id' value='`$prop.site-vf-index`' />\r
+                <parameter name='site-resource-name' value='`$prop.site.name`' />\r
+                <parameter name='description' value='`$prop.site.description`' />\r
+                <parameter name='type' value='`$prop.site.type`' />\r
+                <parameter name='role' value='`$prop.site.role`' />\r
+                <parameter name='operational-status' value='Created' />\r
+                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
+                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\r
+                <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` " />\r
+            </save>\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
+      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
+      force="true" pfx="tmp.AnAI-data">\r
+                <parameter name="relationship-list.relationship[0].related-to" value="site-resource" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/site-resources/site-resource/' + $prop.site-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="site-resource.site-resource-id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.site-vf-index`" />\r
+            </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r
index 32fa9b2..86099f3 100644 (file)
                     </block>\r
                 </outcome>\r
             </switch>\r
+            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\r
+                <outcome value='Created'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <set>\r
-                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
index f7847c7..b730b32 100644 (file)
                 <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                <parameter name="ctx-destination" value="prop.vnf-index"/>\r
+                <parameter name="ctx-destination" value="prop.vnf-id"/>\r
             </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
@@ -47,7 +47,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\r
             </set>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
             </set>\r
             <set>\r
-                <parameter name='vnfId' value='`$prop.vnf-index`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` " />\r
+                <parameter name='vnfId' value='`$prop.vnf-id`' />\r
+                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf"   \r
-               key="generic-vnf.vnf-id = $prop.vnf-index" >\r
+               key="generic-vnf.vnf-id = $prop.vnf-id" >\r
                 <parameter name="orchestration-status" value="create" />\r
                 <parameter name="vnf-type" value="some vnf-type" />\r
             </save>\r
          AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
       force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" />\r
-                <!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
-      force="true" pfx="tmp.AnAI-data"><parameter name="relationship-list.relationship[0].related-to" value="vpn-resource" /><parameter name="relationship-list.relationship[0].related-link" value="`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="vpn-resource.vpn-resource-id" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" /-->\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
index 41bab8f..87e6c52 100644 (file)
@@ -6,15 +6,6 @@
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\r
                 <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>\r
             </execute>\r
-            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
                 <outcome value=''>\r
                     <return status='failure'>\r