Merge "Update to use released 1.2.2 parent"
authorDavid Stilwell <stilwelld@att.com>
Tue, 30 Apr 2019 15:06:11 +0000 (15:06 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 30 Apr 2019 15:06:11 +0000 (15:06 +0000)
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
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-wanport-activate.json
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
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-wanport-activate.xml
platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json [new file with mode: 0644]

index b8819dd..ca33609 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "8a97ec5a.e8724",\r
+        "id": "e2f973ad.8a873",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 147.01040649414062,\r
-        "y": 86.41365575790405,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 167.00390625,\r
+        "y": 86.41365623474121,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "7092e500.65d96c"\r
+                "7f6ab737.fa2438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7092e500.65d96c",\r
+        "id": "7f6ab737.fa2438",\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": 260.2961120605469,\r
-        "y": 126.65176725387573,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 280.28961181640625,\r
+        "y": 126.65176773071289,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "975074db.12b248"\r
+                "df90c884.26f4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "975074db.12b248",\r
+        "id": "df90c884.26f4c8",\r
         "type": "method",\r
         "name": "method vf-module-topology-operation",\r
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 234.43903350830078,\r
-        "y": 166.41365003585815,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 254.43253326416016,\r
+        "y": 166.4136505126953,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "6ba66072.d698d"\r
+                "2b567398.54b65c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5d72244.65ac2",\r
+        "id": "3f06cd40.babeb2",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation",\r
         "info": "",\r
         "comments": "",\r
-        "x": 541.3552627563477,\r
-        "y": 33.99999952316284,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 484.34873962402344,\r
+        "y": 68.99999809265137,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ba66072.d698d",\r
+        "id": "2b567398.54b65c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 216.51044464111328,\r
-        "y": 405.77382802963257,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 236.50394439697266,\r
+        "y": 405.7738285064697,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "bff84223.52b62",\r
-                "bb77dcde.97b13",\r
-                "71a0804b.8983d"\r
+                "61e93cec.112784",\r
+                "fa9f0d60.462fa",\r
+                "d2d6e69c.591818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bff84223.52b62",\r
+        "id": "61e93cec.112784",\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": 502.01043701171875,\r
-        "y": 579.2712168693542,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 522.0039367675781,\r
+        "y": 579.2712173461914,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb77dcde.97b13",\r
+        "id": "fa9f0d60.462fa",\r
         "type": "switchNode",\r
         "name": "switch svc-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 512.9150466918945,\r
-        "y": 403.9850525856018,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 532.9085464477539,\r
+        "y": 403.98505306243896,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "d56401a4.01d66",\r
-                "ad92b387.5520d",\r
-                "9ce981c8.a135f",\r
-                "aabf716e.1d0df",\r
-                "4bf064de.ff298c",\r
-                "a756f30b.6c1cb",\r
-                "201f4d37.e91032",\r
-                "2b26c4c1.602edc"\r
+                "218f133.db017ec",\r
+                "ebbe7026.8821f",\r
+                "37c0b9bd.94d7c6",\r
+                "c54da833.e1f678",\r
+                "47601bcd.b936b4",\r
+                "86bac2cf.d6b39",\r
+                "1207cb15.bda8a5",\r
+                "5b101188.1d177"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d56401a4.01d66",\r
+        "id": "218f133.db017ec",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 722.3913269042969,\r
-        "y": 294.2708897590637,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 742.3848266601562,\r
+        "y": 294.2708902359009,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "481f6fe3.cdf5a"\r
+                "b8e37d82.b39ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad92b387.5520d",\r
+        "id": "ebbe7026.8821f",\r
         "type": "outcome",\r
         "name": "unassign",\r
         "xml": "<outcome value='unassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 730.7723121643066,\r
-        "y": 440.46158170700073,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 750.765811920166,\r
+        "y": 440.4615821838379,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "bb1cd6a8.6e06d8"\r
+                "4071fcbf.00f444"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ce981c8.a135f",\r
+        "id": "37c0b9bd.94d7c6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 670.486686706543,\r
-        "y": 1670.985191822052,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 690.4801864624023,\r
+        "y": 1670.9851922988892,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "c834b9f2.d6f188"\r
+                "ab03e6ef.4f7e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c834b9f2.d6f188",\r
+        "id": "ab03e6ef.4f7e98",\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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",\r
         "comments": "",\r
-        "x": 864.6771125793457,\r
-        "y": 1670.9852604866028,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 884.6706123352051,\r
+        "y": 1670.98526096344,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71a0804b.8983d",\r
+        "id": "d2d6e69c.591818",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 632.0936889648438,\r
-        "y": 243.79471254348755,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 652.0871887207031,\r
+        "y": 243.7947130203247,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "481f6fe3.cdf5a",\r
+        "id": "b8e37d82.b39ed",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1094.5341606140137,\r
-        "y": 293.84235429763794,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1114.527660369873,\r
+        "y": 293.8423547744751,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7175f3d.aa415",\r
+        "id": "a7b23d9b.67752",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106.5341186523438,\r
-        "y": 390.50899744033813,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1126.5276184082031,\r
+        "y": 390.5089979171753,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bb1cd6a8.6e06d8",\r
+        "id": "4071fcbf.00f444",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1100.867389678955,\r
-        "y": 440.17571687698364,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1120.8608894348145,\r
+        "y": 440.1757173538208,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7404f76.f0514",\r
+        "id": "9cef98f6.bb64a8",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734.8674049377441,\r
-        "y": 391.17567110061646,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 754.8609046936035,\r
+        "y": 391.1756715774536,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "a7175f3d.aa415"\r
+                "a7b23d9b.67752"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aabf716e.1d0df",\r
+        "id": "c54da833.e1f678",\r
         "type": "outcome",\r
         "name": "changeassign",\r
         "xml": "<outcome value='changeassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 745.3437271118164,\r
-        "y": 488.08031129837036,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 765.3372268676758,\r
+        "y": 488.0803117752075,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "8e6a8b07.9cfd08"\r
+                "64ada87a.babb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e6a8b07.9cfd08",\r
+        "id": "64ada87a.babb08",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1114.4387969970703,\r
-        "y": 487.7944474220276,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1134.4322967529297,\r
+        "y": 487.79444789886475,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4bf064de.ff298c",\r
+        "id": "47601bcd.b936b4",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 731.0104064941406,\r
-        "y": 686.413655757904,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 751.00390625,\r
+        "y": 686.4136562347412,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "856b20f2.dd3e"\r
+                "41360f4.fa56df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a0f3f1f.e154f",\r
+        "id": "24ce8e0e.e18a02",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 969.3440093994141,\r
-        "y": 694.0000189244747,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 989.3375091552734,\r
+        "y": 694.0000194013119,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "61a8036d.49151c",\r
-                "9df20938.7cb218",\r
-                "e668ec20.ba224",\r
-                "e9946938.94da68",\r
-                "17aebe0e.08da62",\r
-                "6c28f181.61b7c"\r
+                "cd28feb2.78356",\r
+                "b0c495a7.239ed8",\r
+                "4e5328da.0fb598",\r
+                "cf0037c3.323858",\r
+                "9773ede5.0ea13",\r
+                "d780b057.46e04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9df20938.7cb218",\r
+        "id": "b0c495a7.239ed8",\r
         "type": "outcome",\r
-        "name": "CreateSiteInstance",\r
-        "xml": "<outcome value='CreateSiteInstance'>",\r
+        "name": "CreateSDWANSiteInstance",\r
+        "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1226.8203773498535,\r
-        "y": 603.4793815612793,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1279.8138275146484,\r
+        "y": 602.4793882369995,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "c35bc84f.6dd758"\r
+                "835bb83.144cf48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a8036d.49151c",\r
+        "id": "cd28feb2.78356",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1169.7247924804688,\r
-        "y": 777.8572821617126,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1189.7182922363281,\r
+        "y": 777.8572826385498,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "35631ae7.723fc6"\r
+                "2ac9864e.b3ecca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "856b20f2.dd3e",\r
+        "id": "41360f4.fa56df",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 917.3439254760742,\r
-        "y": 614.0000205039978,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 937.3374252319336,\r
+        "y": 614.000020980835,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "4a0f3f1f.e154f",\r
-                "e795cb52.6c6f98"\r
+                "24ce8e0e.e18a02",\r
+                "cf6851c.b8328b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c35bc84f.6dd758",\r
+        "id": "835bb83.144cf48",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1683.3442001342773,\r
-        "y": 601.0001640319824,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1703.3376998901367,\r
+        "y": 601.0001645088196,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "35631ae7.723fc6",\r
+        "id": "2ac9864e.b3ecca",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1323.0104446411133,\r
-        "y": 777.9136786460876,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1343.0039443969727,\r
+        "y": 777.9136791229248,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e668ec20.ba224",\r
+        "id": "4e5328da.0fb598",\r
         "type": "outcome",\r
         "name": "CreateSDWANPortInstance",\r
         "xml": "<outcome value='CreateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.6771850585938,\r
-        "y": 736.247172832489,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1253.6706848144531,\r
+        "y": 736.2471733093262,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "93c38881.fc6c68"\r
+                "60d39409.313dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93c38881.fc6c68",\r
+        "id": "60d39409.313dec",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1706.2008819580078,\r
-        "y": 735.767924785614,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1726.1943817138672,\r
+        "y": 735.7679252624512,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e9946938.94da68",\r
+        "id": "cf0037c3.323858",\r
         "type": "outcome",\r
         "name": "CreateSDWANDeviceInstance",\r
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1242.0415077209473,\r
-        "y": 656.4451332092285,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1262.0350074768066,\r
+        "y": 656.4451336860657,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "f8aa9b06.01e4b8"\r
+                "aa20e20c.3c0b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8aa9b06.01e4b8",\r
+        "id": "aa20e20c.3c0b5",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1697.5652961730957,\r
-        "y": 655.9660024642944,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1717.558795928955,\r
+        "y": 655.9660029411316,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "17aebe0e.08da62",\r
+        "id": "9773ede5.0ea13",\r
         "type": "outcome",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1272.010425567627,\r
-        "y": 555.4137077331543,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1292.0039253234863,\r
+        "y": 555.4137082099915,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "3571e5b5.b5fc8a"\r
+                "7667e896.f38bf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3571e5b5.b5fc8a",\r
+        "id": "7667e896.f38bf8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1680.5341987609863,\r
-        "y": 552.9344749450684,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1700.5276985168457,\r
+        "y": 552.9344754219055,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a756f30b.6c1cb",\r
+        "id": "86bac2cf.d6b39",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 721.0104064941406,\r
-        "y": 881.7469687461853,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 741.00390625,\r
+        "y": 881.7469692230225,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "3edd603.8e265a"\r
+                "dcb59eb.f680a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5f22e70.04f1a",\r
+        "id": "7ef3c11c.de325",\r
         "type": "outcome",\r
-        "name": "ActivateSiteInstance",\r
-        "xml": "<outcome value='ActivateSiteInstance'>",\r
+        "name": "ActivateSDWANSiteInstance",\r
+        "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1212.153434753418,\r
-        "y": 881.6458888053894,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1271.146957397461,\r
+        "y": 884.6459226608276,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "ce7332d1.0ac03"\r
+                "d260e542.de2768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3edd603.8e265a",\r
+        "id": "dcb59eb.f680a6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 901.6771774291992,\r
-        "y": 877.166645526886,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 921.6706771850586,\r
+        "y": 877.1666460037231,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "91a235a8.4c9e08"\r
+                "e18a049.97ec9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce7332d1.0ac03",\r
+        "id": "d260e542.de2768",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1585.6772384643555,\r
-        "y": 880.1666712760925,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1683.6708450317383,\r
+        "y": 878.1667051315308,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f2fcfc7e.d1ffa",\r
+        "id": "23af3ff8.e62a2",\r
         "type": "outcome",\r
         "name": "ActivateSDWANDeviceInstance",\r
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1240.343894958496,\r
-        "y": 930.6667108535767,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1260.3373947143555,\r
+        "y": 930.6667113304138,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "c9db1dea.dfbf5"\r
+                "d9fbf850.8eb808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9db1dea.dfbf5",\r
+        "id": "d9fbf850.8eb808",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1675.8675918579102,\r
-        "y": 930.1874833106995,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1695.8610916137695,\r
+        "y": 930.1874837875366,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f410619e.7b2af",\r
+        "id": "f7b99e1b.e28fb",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1674.3437194824219,\r
-        "y": 1015.6666650772095,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1694.3372192382812,\r
+        "y": 1015.6666655540466,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b65d5517.761218",\r
+        "id": "ddf229e7.82bf38",\r
         "type": "outcome",\r
         "name": "ActivateSDWANPortInstance",\r
         "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1238.8200225830078,\r
-        "y": 1016.1458926200867,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1258.8135223388672,\r
+        "y": 1016.1458930969238,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "f410619e.7b2af"\r
+                "f7b99e1b.e28fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91a235a8.4c9e08",\r
+        "id": "e18a049.97ec9f8",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.0104064941406,\r
-        "y": 943.7469687461853,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 998.00390625,\r
+        "y": 943.7469692230225,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "a5f22e70.04f1a",\r
-                "f2fcfc7e.d1ffa",\r
-                "b65d5517.761218",\r
-                "631e788a.5ef948",\r
-                "b5cf8a8f.31ae38",\r
-                "25d6d260.b0230e"\r
+                "7ef3c11c.de325",\r
+                "23af3ff8.e62a2",\r
+                "ddf229e7.82bf38",\r
+                "d6b4380a.e6fc68",\r
+                "bea21a7.81c0de8",\r
+                "346cc8c9.1c2778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "631e788a.5ef948",\r
+        "id": "d6b4380a.e6fc68",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1170.581886291504,\r
-        "y": 1064.958477973938,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1190.5753860473633,\r
+        "y": 1064.9584784507751,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "c987f934.5e8db8"\r
+                "6f89102d.f2093"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5cf8a8f.31ae38",\r
+        "id": "bea21a7.81c0de8",\r
         "type": "outcome",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1254.0104064941406,\r
-        "y": 839.7469687461853,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1274.00390625,\r
+        "y": 839.7469692230225,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "e540db1.fcd5d28"\r
+                "938a7e9e.1488b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e540db1.fcd5d28",\r
+        "id": "938a7e9e.1488b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1669.5342102050781,\r
-        "y": 833.2677454948425,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1689.5277099609375,\r
+        "y": 833.2677459716797,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "201f4d37.e91032",\r
+        "id": "1207cb15.bda8a5",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 705.0103988647461,\r
-        "y": 1167.7470617294312,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 725.0038986206055,\r
+        "y": 1167.7470622062683,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "389867bf.2284f8"\r
+                "44d3e67.69f5d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7aad7d3.fb5618",\r
+        "id": "257dcf4a.baf63",\r
         "type": "outcome",\r
-        "name": "DeactivateSiteInstance",\r
-        "xml": "<outcome value='DeactivateSiteInstance'>",\r
+        "name": "DeactivateSDWANSiteInstance",\r
+        "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1196.1534271240234,\r
-        "y": 1167.6459817886353,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1263.1470184326172,\r
+        "y": 1167.646032333374,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "4675b373.48835c"\r
+                "762704d.9dc17fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "389867bf.2284f8",\r
+        "id": "44d3e67.69f5d18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 885.6771697998047,\r
-        "y": 1163.1667385101318,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 905.6706695556641,\r
+        "y": 1163.166738986969,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "80dc1053.718dc"\r
+                "6d4f8b47.fe5794"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4675b373.48835c",\r
+        "id": "762704d.9dc17fc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1569.677230834961,\r
-        "y": 1166.1667642593384,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1680.670783996582,\r
+        "y": 1169.16676902771,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f75c0513.6c8168",\r
+        "id": "75979eed.fc0b",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANDeviceInstance",\r
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1224.3438873291016,\r
-        "y": 1216.6668038368225,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1244.337387084961,\r
+        "y": 1216.6668043136597,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "85958e69.f32bb"\r
+                "e1999526.f6ec28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85958e69.f32bb",\r
+        "id": "e1999526.f6ec28",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1659.8675842285156,\r
-        "y": 1216.1875762939453,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1679.861083984375,\r
+        "y": 1216.1875767707825,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "73d40202.c78c6c",\r
+        "id": "7940dddb.23f774",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1657.3437957763672,\r
-        "y": 1294.666778087616,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1677.3372955322266,\r
+        "y": 1294.6667785644531,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "da717258.8698a",\r
+        "id": "b7bae25f.1012c",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1221.8200988769531,\r
-        "y": 1295.1460056304932,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1241.8135986328125,\r
+        "y": 1295.1460061073303,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "73d40202.c78c6c"\r
+                "7940dddb.23f774"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80dc1053.718dc",\r
+        "id": "6d4f8b47.fe5794",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.0103988647461,\r
-        "y": 1229.7470617294312,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 982.0038986206055,\r
+        "y": 1229.7470622062683,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "c7aad7d3.fb5618",\r
-                "f75c0513.6c8168",\r
-                "da717258.8698a",\r
-                "903da395.919c3",\r
-                "82d33324.e23e3",\r
-                "1b1f1da6.c2e872"\r
+                "257dcf4a.baf63",\r
+                "75979eed.fc0b",\r
+                "b7bae25f.1012c",\r
+                "fcda1e4c.615a4",\r
+                "8473a82c.4877f8",\r
+                "1f1b01c5.6b73be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "903da395.919c3",\r
+        "id": "fcda1e4c.615a4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1157.5818328857422,\r
-        "y": 1344.958568096161,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1177.5753326416016,\r
+        "y": 1344.958568572998,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "e8c4be82.d0b16"\r
+                "33eff1fb.6065ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82d33324.e23e3",\r
+        "id": "8473a82c.4877f8",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1238.010398864746,\r
-        "y": 1125.7470617294312,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1258.0038986206055,\r
+        "y": 1125.7470622062683,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "2b4b6274.20abbe"\r
+                "4ad61465.b466cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b4b6274.20abbe",\r
+        "id": "4ad61465.b466cc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1653.5342025756836,\r
-        "y": 1119.2678384780884,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1673.527702331543,\r
+        "y": 1119.2678389549255,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e8c4be82.d0b16",\r
+        "id": "33eff1fb.6065ee",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1496.010513305664,\r
-        "y": 1345.4137787818909,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1516.0040130615234,\r
+        "y": 1345.413779258728,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c987f934.5e8db8",\r
+        "id": "6f89102d.f2093",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1501.010398864746,\r
-        "y": 1062.4136877059937,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1521.0038986206055,\r
+        "y": 1062.4136881828308,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9ee92290.b08c",\r
+        "id": "a47671f0.7d05a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1099.0103645324707,\r
-        "y": 341.41364336013794,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1119.00386428833,\r
+        "y": 341.4136438369751,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d58a6905.f3a7f8",\r
+        "id": "3cda3fef.0d9d8",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 727.0103492736816,\r
-        "y": 342.0803208351135,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 747.003849029541,\r
+        "y": 342.0803213119507,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "9ee92290.b08c"\r
+                "a47671f0.7d05a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b26c4c1.602edc",\r
+        "id": "5b101188.1d177",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668.0104446411133,\r
-        "y": 1513.0803904533386,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 688.0039443969727,\r
+        "y": 1513.0803909301758,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "b6813743.434d08"\r
+                "114b4b9d.5295d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "325c1f9a.af3de",\r
+        "id": "ff0a1131.810f4",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 907.3439636230469,\r
-        "y": 1513.666757106781,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 927.3374633789062,\r
+        "y": 1513.6667575836182,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "f978524b.49dc8",\r
-                "ee8589f0.103678",\r
-                "ef71212e.bc228",\r
-                "c42f06a0.286dc8",\r
-                "c4490e9c.34e51",\r
-                "747ce36c.3de7fc"\r
+                "1ad48c77.fd16f4",\r
+                "c2daaecd.bf1de",\r
+                "96d040fc.c73ab",\r
+                "61982dc8.6271b4",\r
+                "71ed2a12.125604",\r
+                "c389a69c.23d3e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee8589f0.103678",\r
+        "id": "c2daaecd.bf1de",\r
         "type": "outcome",\r
-        "name": "DeleteSiteInstance",\r
-        "xml": "<outcome value='DeleteSiteInstance'>",\r
+        "name": "DeleteSDWANSiteInstance",\r
+        "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1176.820457458496,\r
-        "y": 1447.1461582183838,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1212.8140106201172,\r
+        "y": 1447.1461572647095,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "e685df53.12b53"\r
+                "1180e635.2cc73a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f978524b.49dc8",\r
+        "id": "1ad48c77.fd16f4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106.7248306274414,\r
-        "y": 1604.5240168571472,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1126.7183303833008,\r
+        "y": 1604.5240173339844,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "9ea10b9d.acf658"\r
+                "f97fd7f3.6f7498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6813743.434d08",\r
+        "id": "114b4b9d.5295d4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 854.3439636230469,\r
-        "y": 1440.6667551994324,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 874.3374633789062,\r
+        "y": 1440.6667556762695,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "325c1f9a.af3de"\r
+                "ff0a1131.810f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e685df53.12b53",\r
+        "id": "1180e635.2cc73a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1596.344123840332,\r
-        "y": 1442.6670017242432,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1616.3376235961914,\r
+        "y": 1442.6670022010803,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9ea10b9d.acf658",\r
+        "id": "f97fd7f3.6f7498",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.010482788086,\r
-        "y": 1604.5804133415222,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1280.0039825439453,\r
+        "y": 1604.5804138183594,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ef71212e.bc228",\r
+        "id": "96d040fc.c73ab",\r
         "type": "outcome",\r
         "name": "DeleteSDWANPortInstance",\r
         "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1170.6772232055664,\r
-        "y": 1562.9139075279236,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1190.6707229614258,\r
+        "y": 1562.9139080047607,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "64a82c2b.8bd464"\r
+                "14aa28f6.f665e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64a82c2b.8bd464",\r
+        "id": "14aa28f6.f665e7",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1643.2009201049805,\r
-        "y": 1562.4346594810486,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1663.1944198608398,\r
+        "y": 1562.4346599578857,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c42f06a0.286dc8",\r
+        "id": "61982dc8.6271b4",\r
         "type": "outcome",\r
         "name": "DeleteSDWANDeviceInstance",\r
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1195.041618347168,\r
-        "y": 1486.111795425415,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1215.0351181030273,\r
+        "y": 1486.1117959022522,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "4d9adbda.eda754"\r
+                "18b71adb.f193b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d9adbda.eda754",\r
+        "id": "18b71adb.f193b5",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1609.5654373168945,\r
-        "y": 1481.6326999664307,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1629.558937072754,\r
+        "y": 1481.6327004432678,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c4490e9c.34e51",\r
+        "id": "71ed2a12.125604",\r
         "type": "outcome",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1199.0104751586914,\r
-        "y": 1406.0804076194763,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1219.0039749145508,\r
+        "y": 1406.0804080963135,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "8af6e006.bfec5"\r
+                "f0f97b33.560518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8af6e006.bfec5",\r
+        "id": "f0f97b33.560518",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1592.534278869629,\r
-        "y": 1406.6011753082275,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1612.5277786254883,\r
+        "y": 1406.6011757850647,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e795cb52.6c6f98",\r
+        "id": "cf6851c.b8328b",\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/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1058.7604064941406,\r
-        "y": 563.0039051473141,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1078.75390625,\r
+        "y": 563.0039056241512,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c28f181.61b7c",\r
+        "id": "d780b057.46e04",\r
         "type": "outcome",\r
         "name": "CreateSDWANLanPortInstance",\r
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1235.75390625,\r
-        "y": 697.25390625,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1255.7474060058594,\r
+        "y": 697.2539067268372,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "1169c073.b7816"\r
+                "87c41ab9.dcc0d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1169c073.b7816",\r
+        "id": "87c41ab9.dcc0d8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1708.277603149414,\r
-        "y": 696.774658203125,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1728.2711029052734,\r
+        "y": 696.7746586799622,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "25d6d260.b0230e",\r
+        "id": "346cc8c9.1c2778",\r
         "type": "outcome",\r
         "name": "ActivateSDWANLanPortInstance",\r
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1247.75390625,\r
-        "y": 974.50390625,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1267.7474060058594,\r
+        "y": 974.5039067268372,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "ec26a8f0.36bb88"\r
+                "c932f0f5.6bc3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec26a8f0.36bb88",\r
+        "id": "c932f0f5.6bc3c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1665.2775573730469,\r
-        "y": 974.0246677398682,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1685.2710571289062,\r
+        "y": 974.0246682167053,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1b1f1da6.c2e872",\r
+        "id": "1f1b01c5.6b73be",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANLanPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.75390625,\r
-        "y": 1260.75390625,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1253.7474060058594,\r
+        "y": 1260.7539067268372,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "dabaac5b.2c0a7"\r
+                "91614e8f.0048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dabaac5b.2c0a7",\r
+        "id": "91614e8f.0048",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1651.2775573730469,\r
-        "y": 1260.2746677398682,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1671.2710571289062,\r
+        "y": 1260.2746682167053,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "747ce36c.3de7fc",\r
+        "id": "c389a69c.23d3e8",\r
         "type": "outcome",\r
         "name": "DeleteSDWANLanPortInstance",\r
         "xml": "<outcome value='DleteSDWANLanPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1197.75390625,\r
-        "y": 1523.75390625,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1217.7474060058594,\r
+        "y": 1523.7539067268372,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             [\r
-                "19220770.af1c39"\r
+                "9f681b9b.624d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19220770.af1c39",\r
+        "id": "9f681b9b.624d78",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1615.2775573730469,\r
-        "y": 1523.2746677398682,\r
-        "z": "85ee3913.3987f8",\r
+        "x": 1635.2710571289062,\r
+        "y": 1523.2746682167053,\r
+        "z": "62f71b5.55c86e4",\r
         "wires": [\r
             []\r
         ]\r
index dfb0b20..ca09d52 100644 (file)
@@ -1,38 +1,38 @@
 [\r
     {\r
-        "id": "449f76b2.35ecd8",\r
+        "id": "62a2b375.b0142c",\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": 651.00390625,\r
-        "y": 351.99999046325684,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 631.00390625,\r
+        "y": 358.9999910593033,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "398bb19.252604e",\r
-                "b6d1d1d8.bb9ed",\r
-                "62a6e293.8703bc"\r
+                "2ce296c7.89a92a",\r
+                "286b40a1.270d8",\r
+                "a5e09c26.33e85"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ae00491.8f60fc",\r
+        "id": "274a6c23.93af74",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 188.00390243530273,\r
-        "y": 43,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 185.00391006469727,\r
+        "y": 38.00000190734863,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "cd3d997.ba35068"\r
+                "d19a3d29.13e6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd3d997.ba35068",\r
+        "id": "d19a3d29.13e6c",\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": 257.2896041870117,\r
-        "y": 106.23810958862305,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 237.28960418701172,\r
+        "y": 113.2381101846695,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "42625ee9.60cf8"\r
+                "f2cc8408.469028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42625ee9.60cf8",\r
+        "id": "f2cc8408.469028",\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": 269.00389862060547,\r
-        "y": 200.58634185791016,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 249.00389862060547,\r
+        "y": 207.5863424539566,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "3ec2bae1.a772e6"\r
+                "b1463b24.6fe0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ec2bae1.a772e6",\r
+        "id": "b1463b24.6fe0e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\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
+        "x": 249.67057037353516,\r
+        "y": 463.6667095422745,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "303d2cf.b399dd4",\r
+                "d51e952d.52f938",\r
+                "62a2b375.b0142c",\r
+                "c2a7f215.4af7c",\r
+                "e1a9154.b1471e8",\r
+                "67323544.ab409c",\r
+                "b8bc82a8.8f71c",\r
+                "af677f19.b868e",\r
+                "5684b01b.2cc86",\r
+                "3b06c257.27b87e",\r
+                "f005bd73.83921",\r
+                "e03228a1.7c0b08",\r
+                "b83326ad.562c28",\r
+                "d5b2bc3d.8d9a6",\r
+                "292717fc.ce9118",\r
+                "a812fb94.72ecd8",\r
+                "b9762c75.21e69",\r
+                "c04f18a6.eec778",\r
+                "bb7f5a63.9f3828",\r
+                "a98e7add.71df78",\r
+                "955e1b88.3ac648",\r
+                "f78f25c0.9e44a8",\r
+                "e3c5f502.462e18",\r
+                "2a5aae1a.c1b0a2",\r
+                "b74ec81a.384238"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d51e952d.52f938",\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": 616.0352668762207,\r
-        "y": 222.26914596557617,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 596.0352668762207,\r
+        "y": 229.26914656162262,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7ea5c9a1.849a58"\r
+                "1705b3b3.be9e2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "788af4bb.4d81cc",\r
+        "id": "303d2cf.b399dd4",\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": 621.0039215087891,\r
-        "y": 161.00001525878906,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 601.0039215087891,\r
+        "y": 168.0000158548355,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "eddbe91d.071158"\r
+                "ae5f28f0.d5a908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eddbe91d.071158",\r
+        "id": "ae5f28f0.d5a908",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 801.0039024353027,\r
-        "y": 160.00000476837158,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 781.0039024353027,\r
+        "y": 167.00000536441803,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "43ffd7ae.190158"\r
+                "60302d9b.78d214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43ffd7ae.190158",\r
+        "id": "60302d9b.78d214",\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": 950.4326286315918,\r
-        "y": 161.14292240142822,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 930.4326286315918,\r
+        "y": 168.14292299747467,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ea5c9a1.849a58",\r
+        "id": "1705b3b3.be9e2c",\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": 839.0039176940918,\r
-        "y": 223.00001096725464,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 819.0039176940918,\r
+        "y": 230.0000115633011,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "63b5b6be.7bb648"\r
+                "1f9e74ab.0ce8fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63b5b6be.7bb648",\r
+        "id": "1f9e74ab.0ce8fb",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1054.0039024353027,\r
-        "y": 221.00000476837158,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1034.0039024353027,\r
+        "y": 228.00000536441803,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "395d7249.60aa0e"\r
+                "67d2b453.3ade6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "395d7249.60aa0e",\r
+        "id": "67d2b453.3ade6c",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1218.0039024353027,\r
-        "y": 216.00000476837158,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1198.0039024353027,\r
+        "y": 223.00000536441803,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6d1d1d8.bb9ed",\r
+        "id": "286b40a1.270d8",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 873.0038986206055,\r
-        "y": 386,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 853.0038986206055,\r
+        "y": 393.00000059604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "284a993a.df0816"\r
+                "9beeb53f.32d368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "398bb19.252604e",\r
+        "id": "2ce296c7.89a92a",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 878.0038948059082,\r
-        "y": 332.9999990463257,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 858.0038948059082,\r
+        "y": 339.99999964237213,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "284a993a.df0816"\r
+                "9beeb53f.32d368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "284a993a.df0816",\r
+        "id": "9beeb53f.32d368",\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": 1036.0038986206055,\r
-        "y": 346,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1016.0038986206055,\r
+        "y": 353.00000059604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62a6e293.8703bc",\r
+        "id": "a5e09c26.33e85",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 873.0038986206055,\r
-        "y": 447,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 853.0038986206055,\r
+        "y": 454.00000059604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f366b8b5.961cc8"\r
+                "e1d84972.4ad0c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb04cf04.061eb",\r
+        "id": "fd2ead86.4408b",\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": 1227.0039138793945,\r
-        "y": 445.0000139474869,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1207.0039138793945,\r
+        "y": 452.0000145435333,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f366b8b5.961cc8",\r
+        "id": "e1d84972.4ad0c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1034.0039443969727,\r
-        "y": 443.99999141693115,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1014.0039443969727,\r
+        "y": 450.9999920129776,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "cb04cf04.061eb",\r
-                "19000243.abd3ee"\r
+                "fd2ead86.4408b",\r
+                "a0db8178.b9fc1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19000243.abd3ee",\r
+        "id": "a0db8178.b9fc1",\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": 1246.0038833618164,\r
-        "y": 497.99999046325684,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1226.0038833618164,\r
+        "y": 504.9999910593033,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7d37972f.257a38"\r
+                "d2a74f27.76a7b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d37972f.257a38",\r
+        "id": "d2a74f27.76a7b",\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": 1489.0038986206055,\r
-        "y": 493,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1469.0038986206055,\r
+        "y": 500.00000059604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "377bfea7.613792"\r
+                "b730478a.e23168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "377bfea7.613792",\r
+        "id": "b730478a.e23168",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1687.003927230835,\r
-        "y": 480.0000066757202,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1667.003927230835,\r
+        "y": 487.00000727176666,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "18c55aa5.f966a5"\r
+                "e50ff701.4c8a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18c55aa5.f966a5",\r
+        "id": "e50ff701.4c8a98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1839.0038986206055,\r
-        "y": 482,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1819.0038986206055,\r
+        "y": 489.00000059604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "d08221fe.a8a22",\r
-                "f8638c60.50c2c",\r
-                "4e4f3655.251b48"\r
+                "9ab17191.831f",\r
+                "5290285b.0a9238",\r
+                "718a2bc4.09e914"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d08221fe.a8a22",\r
+        "id": "9ab17191.831f",\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": 2067.0040130615234,\r
-        "y": 424.00000381469727,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2047.0040130615234,\r
+        "y": 431.0000044107437,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8638c60.50c2c",\r
+        "id": "5290285b.0a9238",\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": 2071.0040130615234,\r
-        "y": 478.00000381469727,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2051.0040130615234,\r
+        "y": 485.0000044107437,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c153d6a.4cf43",\r
+        "id": "c2a7f215.4af7c",\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": 585.0040168762207,\r
-        "y": 2093.501151561737,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 580.0040740966797,\r
+        "y": 2308.5012640953064,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4e4f3655.251b48",\r
+        "id": "718a2bc4.09e914",\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": 2101.4590377807617,\r
-        "y": 529.0104961395264,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2081.4590377807617,\r
+        "y": 536.0104967355728,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2dd1b5ff.e9de3a",\r
+        "id": "8567646d.1060f8",\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": 1358.2580871582031,\r
-        "y": 557.0040807723999,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1338.2580871582031,\r
+        "y": 564.0040813684464,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "afb4aa7c.d42128"\r
+                "ac4f7552.ac0308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc24bdbf.b7fae",\r
+        "id": "80043aea.5219e8",\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": 1429.25830078125,\r
-        "y": 630.0042104721069,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1409.25830078125,\r
+        "y": 637.0042110681534,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "3a56a654.531a3a"\r
+                "2efabc06.34d0a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afb4aa7c.d42128",\r
+        "id": "ac4f7552.ac0308",\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": 1644.2579345703125,\r
-        "y": 559.0041646957397,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1624.2579345703125,\r
+        "y": 566.0041652917862,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "258487d9.bf18e8"\r
+                "fb5d6670.5ef758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a56a654.531a3a",\r
+        "id": "2efabc06.34d0a4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1649.2580242156982,\r
-        "y": 631.0042181015015,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1629.2580242156982,\r
+        "y": 638.0042186975479,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "c2e2f4ae.3e81f8"\r
+                "f29692e0.539f3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2e2f4ae.3e81f8",\r
+        "id": "f29692e0.539f3",\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": 1894.2581024169922,\r
-        "y": 631.0041356086731,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1874.2581024169922,\r
+        "y": 638.0041362047195,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "1b295fc8.1fb94"\r
+                "da95560e.179868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b295fc8.1fb94",\r
+        "id": "da95560e.179868",\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": 2202.2583770751953,\r
-        "y": 614.0041036605835,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2182.2583770751953,\r
+        "y": 621.00410425663,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "35a3cdd9.9a70d2"\r
+                "78aec0a1.e1723"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35a3cdd9.9a70d2",\r
+        "id": "78aec0a1.e1723",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2411.258415222168,\r
-        "y": 616.004096031189,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2391.258415222168,\r
+        "y": 623.0040966272354,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "219f921f.088efe"\r
+                "df2e3f53.8ca7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "219f921f.088efe",\r
+        "id": "df6bb2fa.c17ef",\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": 2588.2583808898926,\r
-        "y": 612.0042867660522,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2764.258441925049,\r
+        "y": 559.0042743682861,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46f7cea6.503f1",\r
+        "id": "e1a9154.b1471e8",\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": 612.2578125,\r
-        "y": 424.00404262542725,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 592.2578125,\r
+        "y": 431.0040432214737,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "8fd527ce.0b2738"\r
+                "ae8078e2.85aab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa35d7b.bbc16",\r
+        "id": "cea7983f.defeb8",\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": 1249.008186340332,\r
-        "y": 741.0039882659912,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1229.008186340332,\r
+        "y": 748.0039888620377,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "d9309324.f3584"\r
+                "aa05a333.09241"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a222fcd.73c1e",\r
+        "id": "1a7b39b6.722626",\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": 895.0080261230469,\r
-        "y": 708.0040283203125,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 875.0080261230469,\r
+        "y": 715.004028916359,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7ba15821.578698"\r
+                "6936e75f.9c21b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3174dd24.ba8ab2",\r
+        "id": "292717fc.ce9118",\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": 646.0078811645508,\r
-        "y": 639.0039081573486,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 626.0078811645508,\r
+        "y": 646.0039087533951,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7a222fcd.73c1e"\r
+                "1a7b39b6.722626"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9309324.f3584",\r
+        "id": "aa05a333.09241",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471.0081024169922,\r
-        "y": 741.0040698051453,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1451.0081024169922,\r
+        "y": 748.0040704011917,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "6e42570c.9e97d8"\r
+                "45b20afa.d404e4"\r
             ]\r
         ]\r
     },\r
     {\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": 1552.2581100463867,\r
-        "y": 815.5040712356567,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "8eb63937.68f308"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 1935.2584686279297,\r
-        "y": 822.5041785240173,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "69e745ff.0d272c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "69e745ff.0d272c",\r
+        "id": "5020b41b.37af8c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2112.258487701416,\r
-        "y": 825.5040187835693,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3003.2584648132324,\r
+        "y": 835.5040974617004,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f03a8e8e.83fe2"\r
+                "285e8b02.5f5364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dee78c9f.5dd72",\r
+        "id": "f8bdb397.3f361",\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
+        "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[$sidx].value`' />\n",\r
         "comments": "",\r
-        "x": 2496.2589950561523,\r
-        "y": 799.5040702819824,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3394.259147644043,\r
+        "y": 788.5041995048523,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f03a8e8e.83fe2",\r
+        "id": "285e8b02.5f5364",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2271.5086784362793,\r
-        "y": 821.0040588378906,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "dee78c9f.5dd72",\r
-                "43b17553.c7382c",\r
-                "36d57da.c3bd682",\r
-                "1a9cf10f.4a8b1f"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 1930.0078430175781,\r
-        "y": 1338.5039596557617,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "45a4d258.24544c",\r
-                "cb543421.e8e548",\r
-                "f2ddc8f8.67f5b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "45a4d258.24544c",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2174.0079040527344,\r
-        "y": 1302.5039596557617,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "73860a6b.6e7a64"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 2176.4987869262695,\r
-        "y": 1338.0779962539673,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3162.5086555480957,\r
+        "y": 831.0041375160217,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "57b80d68.fd6804"\r
+                "f8bdb397.3f361",\r
+                "ca69f782.4f6db8",\r
+                "91acccd4.f9b4d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2ddc8f8.67f5b8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2171.8317947387695,\r
-        "y": 1374.4113550186157,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "114f2452.7c39bc"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 2325.6042861938477,\r
-        "y": 1371.8504419326782,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\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": 2322.070182800293,\r
-        "y": 1336.3636837005615,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\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": 2334.508014678955,\r
-        "y": 1300.5038995742798,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\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": 1943.9460754394531,\r
-        "y": 1441.6250534057617,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "277e96cc.23f53a",\r
-                "d503dd86.6b851"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "277e96cc.23f53a",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2178.946201324463,\r
-        "y": 1427.62504196167,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "7b5e2570.2698cc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d503dd86.6b851",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2178.196201324463,\r
-        "y": 1463.267949104309,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "198d65d8.c721ba"\r
-            ]\r
-        ]\r
-    },\r
-    {\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": 2326.9462089538574,\r
-        "y": 1464.0180311203003,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\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": 2320.9462089538574,\r
-        "y": 1426.6250429153442,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "41672a48.274fe4",\r
+        "id": "b9762c75.21e69",\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": 647.03515625,\r
-        "y": 1213.0782289505005,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 669.0351696014404,\r
+        "y": 1681.0783828496933,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "74d5de9e.64c39",\r
-                "95bf4540.859768"\r
+                "2da7ca99.c33e76",\r
+                "294e6b7c.164174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74d5de9e.64c39",\r
+        "id": "2da7ca99.c33e76",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 896.0352153778076,\r
-        "y": 1227.0784349441528,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 915.035228729248,\r
+        "y": 1695.0785164833069,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "446d7b16.686f54"\r
+                "78f113d9.71ae5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95bf4540.859768",\r
+        "id": "294e6b7c.164174",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 896.0352153778076,\r
-        "y": 1189.0782704353333,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 915.035228729248,\r
+        "y": 1657.0783519744873,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "5b043775.82b438"\r
+                "bdca7d72.89f35"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b043775.82b438",\r
+        "id": "bdca7d72.89f35",\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": 1040.0355491638184,\r
-        "y": 1188.078269958496,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1059.0355625152588,\r
+        "y": 1656.0783514976501,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "446d7b16.686f54",\r
+        "id": "78f113d9.71ae5c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1043.0352268218994,\r
-        "y": 1228.0782737731934,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1062.0352401733398,\r
+        "y": 1696.0783553123474,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fcbf2fc7.b018d",\r
+        "id": "67323544.ab409c",\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": 589.6924171447754,\r
-        "y": 1266.1794338226318,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 608.6924304962158,\r
+        "y": 1734.179515361786,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b76fce1f.c41d6",\r
+        "id": "52d8036.d8251fc",\r
         "type": "comment",\r
         "name": "Create port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 548.7010955810547,\r
-        "y": 1179.522253036499,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 567.7011089324951,\r
+        "y": 1647.522334575653,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "455e901d.d7497",\r
+        "id": "a812fb94.72ecd8",\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": 595.7010955810547,\r
-        "y": 1128.1886892318726,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 606.7011108398438,\r
+        "y": 1418.1887378692627,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4fc0e57c.93c3fc",\r
+        "id": "49f7e1ca.47a1d",\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": 1069.6854057312012,\r
-        "y": 1308.188857793808,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1088.6854190826416,\r
+        "y": 1776.188939332962,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "fe4c3471.1ff888",\r
-                "5d7f5544.360c1c"\r
+                "90e9cae2.8856e8",\r
+                "e415727a.32568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe4c3471.1ff888",\r
+        "id": "90e9cae2.8856e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1390.685432434082,\r
-        "y": 1325.1891782283783,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1409.6854457855225,\r
+        "y": 1793.1892597675323,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "ab1e6271.60b9c"\r
+                "e9c18e15.5844e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d7f5544.360c1c",\r
+        "id": "e415727a.32568",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1393.685459136963,\r
-        "y": 1290.1889598369598,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1412.6854724884033,\r
+        "y": 1758.189041376114,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "cee492db.e0603"\r
+                "7758ee8.0aa2e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cee492db.e0603",\r
+        "id": "7758ee8.0aa2e1",\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": 1596.685848236084,\r
-        "y": 1286.1890671253204,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1615.6858615875244,\r
+        "y": 1754.1891486644745,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab1e6271.60b9c",\r
+        "id": "e9c18e15.5844e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1597.6854133605957,\r
-        "y": 1321.1889336109161,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1616.6854267120361,\r
+        "y": 1789.1890151500702,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e47a1f03.1d40d",\r
+        "id": "5596dd8.d4db124",\r
         "type": "comment",\r
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1013.3512992858887,\r
-        "y": 1274.6330835819244,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1032.351312637329,\r
+        "y": 1742.6331651210785,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "505ed63f.24baa8",\r
+        "id": "b8bc82a8.8f71c",\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": 569.4628715515137,\r
-        "y": 1309.855489730835,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 588.4628849029541,\r
+        "y": 1777.855571269989,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f3a0568f.15eb08"\r
+                "9b68044d.8003c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3a0568f.15eb08",\r
+        "id": "9b68044d.8003c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 748.4629020690918,\r
-        "y": 1309.966812133789,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 767.4629154205322,\r
+        "y": 1777.9668936729431,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "4fc0e57c.93c3fc"\r
+                "49f7e1ca.47a1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94404e6f.e8fde",\r
+        "id": "af677f19.b868e",\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": 594.0078659057617,\r
-        "y": 1409.7540397644043,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 610.0079498291016,\r
+        "y": 1125.75403881073,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "8f41cbf5.215278",\r
-                "e159f50d.926278"\r
+                "818ce376.62233",\r
+                "94450d41.00936"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e159f50d.926278",\r
+        "id": "94450d41.00936",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 795.007884979248,\r
-        "y": 1387.7540311813354,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 811.0079689025879,\r
+        "y": 1103.7540302276611,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f5bbd137.51f5f"\r
+                "bdf6adef.1a65c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f41cbf5.215278",\r
+        "id": "818ce376.62233",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 795.0078887939453,\r
-        "y": 1428.7540349960327,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 811.0079727172852,\r
+        "y": 1144.7540340423584,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "b8b52f84.e55ad"\r
+                "9306915f.667d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5bbd137.51f5f",\r
+        "id": "bdf6adef.1a65c",\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": 992.0079040527344,\r
-        "y": 1385.7540311813354,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1008.0079879760742,\r
+        "y": 1101.7540302276611,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8b52f84.e55ad",\r
+        "id": "9306915f.667d1",\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": 950.0078964233398,\r
-        "y": 1425.7540340423584,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 966.0079803466797,\r
+        "y": 1141.754033088684,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9835abaa.deb1b8",\r
+        "id": "a7eaad12.8d234",\r
         "type": "comment",\r
         "name": "Create wan port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 567.0177421569824,\r
-        "y": 1362.7640895843506,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 586.0177555084229,\r
+        "y": 1830.7641711235046,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "707a08a2.84bfc8",\r
+        "id": "1c53f052.63589",\r
         "type": "comment",\r
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 991.0175361633301,\r
-        "y": 1347.9343032836914,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1010.0175495147705,\r
+        "y": 1815.9343848228455,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "58693560.f55b6c",\r
+        "id": "b74ec81a.384238",\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": 652.7792358398438,\r
-        "y": 1485.8749294281006,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 676.7792358398438,\r
+        "y": 1898.8749904632568,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "e01d8566.26a208",\r
-                "b77c647.be67698"\r
+                "23e6b6aa.7344ca",\r
+                "c063d0d7.3d16a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b77c647.be67698",\r
+        "id": "c063d0d7.3d16a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921.7792663574219,\r
-        "y": 1472.8749017715454,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 945.7792663574219,\r
+        "y": 1885.8749628067017,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7b6fdd20.906734"\r
+                "8e16c4db.999008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e01d8566.26a208",\r
+        "id": "23e6b6aa.7344ca",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 918.779239654541,\r
-        "y": 1507.8751201629639,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 942.779239654541,\r
+        "y": 1920.8751811981201,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "a2642272.8a0b"\r
+                "c72550d5.e3c3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b6fdd20.906734",\r
+        "id": "8e16c4db.999008",\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": 1074.7796478271484,\r
-        "y": 1468.8751277923584,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1098.7796478271484,\r
+        "y": 1881.8751888275146,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2642272.8a0b",\r
+        "id": "c72550d5.e3c3a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1065.7792205810547,\r
-        "y": 1508.8748760223389,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1089.7792205810547,\r
+        "y": 1921.8749370574951,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "e06f7472.e95f98"\r
+                "4df7140a.3b523c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e06f7472.e95f98",\r
+        "id": "4df7140a.3b523c",\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": 1272.6683235168457,\r
-        "y": 1511.208342552185,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1296.6683235168457,\r
+        "y": 1924.2084035873413,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c1e06fc.eec57a",\r
+        "id": "bb7f5a63.9f3828",\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
+        "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.vpnId + '/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": 669.2896881103516,\r
-        "y": 1665.3338165283203,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 674.2896537780762,\r
+        "y": 1587.5840225219727,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "5e387a3e.4fd8a4",\r
-                "e4302470.9e4168"\r
+                "5f34ded5.63106",\r
+                "676b6124.5f3ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4302470.9e4168",\r
+        "id": "676b6124.5f3ce",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 917.289571762085,\r
-        "y": 1691.333193898201,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 922.2895374298096,\r
+        "y": 1613.5833998918533,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "1a5d2b85.cc6d14"\r
+                "f979e24a.e1f45"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5d2b85.cc6d14",\r
+        "id": "f979e24a.e1f45",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1087.2895107269287,\r
-        "y": 1694.333193898201,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1092.2894763946533,\r
+        "y": 1616.5833998918533,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5ab2794a.636098",\r
+        "id": "cc2c04a4.b165e8",\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": 1087.2896327972412,\r
-        "y": 1650.333193898201,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1092.2895984649658,\r
+        "y": 1572.5833998918533,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e387a3e.4fd8a4",\r
+        "id": "5f34ded5.63106",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 920.2895107269287,\r
-        "y": 1650.333193898201,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 925.2894763946533,\r
+        "y": 1572.5833998918533,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "5ab2794a.636098"\r
+                "cc2c04a4.b165e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69c506db.344ae8",\r
+        "id": "c04f18a6.eec778",\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": 640.288013458252,\r
-        "y": 1575.8328762054443,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 645.2879791259766,\r
+        "y": 1498.0830821990967,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "e0d8f775.adb548",\r
-                "1307c84a.e256c8"\r
+                "97764cff.1f5ea",\r
+                "ea83fcec.06662"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1307c84a.e256c8",\r
+        "id": "ea83fcec.06662",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.2879161834717,\r
-        "y": 1597.8328419923782,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 866.2878818511963,\r
+        "y": 1520.0830479860306,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "845c9ffd.b87b7"\r
+                "70ae34b5.54dd0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "845c9ffd.b87b7",\r
+        "id": "70ae34b5.54dd0c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1031.2878551483154,\r
-        "y": 1600.8328419923782,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1036.28782081604,\r
+        "y": 1523.0830479860306,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de430292.51fa5",\r
+        "id": "98836605.c54338",\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": 1031.287977218628,\r
-        "y": 1556.8328419923782,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1036.2879428863525,\r
+        "y": 1479.0830479860306,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e0d8f775.adb548",\r
+        "id": "97764cff.1f5ea",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 864.2878551483154,\r
-        "y": 1556.8328419923782,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 869.28782081604,\r
+        "y": 1479.0830479860306,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "de430292.51fa5"\r
+                "98836605.c54338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b10096b.8cb7e8",\r
+        "id": "51c264bd.1cd0cc",\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": 1227.2898406982422,\r
-        "y": 862.3332567214966,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1235.2898559570312,\r
+        "y": 900.3332679271698,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "43a6f166.ec09e"\r
+                "425067a.9f0ee98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ba15821.578698",\r
+        "id": "6936e75f.9c21b8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984.6229438781738,\r
-        "y": 791.3333368301392,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 964.6229438781738,\r
+        "y": 798.3333374261856,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "daa35d7b.bbc16",\r
-                "8b10096b.8cb7e8"\r
+                "cea7983f.defeb8",\r
+                "51c264bd.1cd0cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43a6f166.ec09e",\r
+        "id": "425067a.9f0ee98",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1322.9563522338867,\r
-        "y": 936.3333377838135,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1330.9563674926758,\r
+        "y": 974.3333489894867,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f4ccb599.a134d8"\r
+                "c1956959.4be878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4ccb599.a134d8",\r
+        "id": "c1956959.4be878",\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": 1537.2062377929688,\r
-        "y": 937.8333144187927,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1545.2062530517578,\r
+        "y": 975.8333256244659,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "f6720c82.39b5d"\r
+                "d2a805b2.ac7b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6720c82.39b5d",\r
+        "id": "2b39b5dd.e8366a",\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": 1784.2062759399414,\r
-        "y": 932.8333973884583,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1942.2064056396484,\r
+        "y": 993.8333772420883,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "460bb48a.240e2c"\r
+                "3ae5efa1.57a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "460bb48a.240e2c",\r
+        "id": "3ae5efa1.57a7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1934.9562301635742,\r
-        "y": 934.3333129882812,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2092.9563598632812,\r
+        "y": 995.3332928419113,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "ac3fc038.e0007"\r
+                "3180f641.87c8ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac3fc038.e0007",\r
+        "id": "3180f641.87c8ba",\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
+        "name": "set prop.vpnId",\r
+        "xml": "<set>\n<parameter name='prop.vpnId' 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": 2108.9569778442383,\r
-        "y": 934.3333714008331,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2266.9571075439453,\r
+        "y": 995.3333512544632,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43b17553.c7382c",\r
+        "id": "ca69f782.4f6db8",\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": 2539.290351867676,\r
-        "y": 840.3333714008331,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3430.290397644043,\r
+        "y": 843.333466053009,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36d57da.c3bd682",\r
+        "id": "91acccd4.f9b4d",\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": 2570.2902450561523,\r
-        "y": 883.3333377838135,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3461.2902221679688,\r
+        "y": 893.3334164619446,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16a0b0ad.e2c3df",\r
+        "id": "5684b01b.2cc86",\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": 656.2896194458008,\r
-        "y": 588.333330154419,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 636.2896194458008,\r
+        "y": 595.3333307504654,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\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": 1769.623275756836,\r
-        "y": 816.3333358764648,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            [\r
-                "f89ede9f.dfe34",\r
-                "fe16c8cc.020428",\r
-                "9d46cf63.0dcd9"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fe16c8cc.020428",\r
+        "id": "e157d21e.75dc",\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": 1931.9562072753906,\r
-        "y": 747.3333349227905,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2172.956443786621,\r
+        "y": 731.3333559036255,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "7b19ac17.f7b154"\r
+                "91af0190.6f383"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b19ac17.f7b154",\r
+        "id": "91af0190.6f383",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2094.956211090088,\r
-        "y": 742.3333358764648,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2336.9564476013184,\r
+        "y": 731.3333559036255,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "5fca6bb6.2ad174"\r
+                "71599403.d1a60c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fca6bb6.2ad174",\r
+        "id": "71599403.d1a60c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2262.956253051758,\r
-        "y": 736.3333339691162,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2524.956615447998,\r
+        "y": 716.3333549499512,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "fa5fdce5.2309f",\r
-                "d71b47e7.ba0928",\r
-                "368fa25d.21f04e"\r
+                "7213abe2.551d54",\r
+                "f3a9e626.ca5db8",\r
+                "a1885c07.3d09a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d71b47e7.ba0928",\r
+        "id": "f3a9e626.ca5db8",\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": 2457.956382751465,\r
-        "y": 697.3333253860474,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2719.956745147705,\r
+        "y": 677.3333463668823,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "4c9e170f.05bda8"\r
+                "de11bb23.ad1648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa5fdce5.2309f",\r
+        "id": "7213abe2.551d54",\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
+        "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 == 'dsvpn-hub'`\">\n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2454.9564895629883,\r
-        "y": 752.333340883255,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2716.9568519592285,\r
+        "y": 732.33336186409,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "a41f3558.9efd38"\r
+                "19121485.c6be8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f17f745.17ddb8",\r
+        "id": "cab86296.3a26c",\r
         "type": "set",\r
         "name": "set spoke role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",\r
         "comments": "",\r
-        "x": 2787.9565048217773,\r
-        "y": 691.3333711624146,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3049.9568672180176,\r
+        "y": 671.3333921432495,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44a0a864.8cd1d8",\r
+        "id": "856c6a7c.0a9268",\r
         "type": "set",\r
         "name": "set hub role",\r
         "xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",\r
         "comments": "",\r
-        "x": 2786.9562644958496,\r
-        "y": 746.3333549499512,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 3048.95662689209,\r
+        "y": 726.3333759307861,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4c9e170f.05bda8",\r
+        "id": "de11bb23.ad1648",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2627.9563522338867,\r
-        "y": 693,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2889.956714630127,\r
+        "y": 673.000020980835,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "8f17f745.17ddb8"\r
+                "cab86296.3a26c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a41f3558.9efd38",\r
+        "id": "19121485.c6be8b",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2631.9563522338867,\r
-        "y": 748,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 2893.956714630127,\r
+        "y": 728.000020980835,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "44a0a864.8cd1d8"\r
+                "856c6a7c.0a9268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b87c5ca2.4198d",\r
+        "id": "a98e7add.71df78",\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='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": 640.3208885192871,\r
-        "y": 2012.031280040741,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 635.3209457397461,\r
+        "y": 2227.0313925743103,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b4355150.f8381",\r
+        "id": "e03228a1.7c0b08",\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": 634.9559097290039,\r
-        "y": 1957.126205444336,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 629.9559669494629,\r
+        "y": 2172.1263179779053,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea89a3cd.96c6c",\r
+        "id": "f005bd73.83921",\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": 670.9559097290039,\r
-        "y": 1910.6261444091797,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 665.9559669494629,\r
+        "y": 2125.626256942749,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e352097b.fa56f8",\r
+        "id": "3b06c257.27b87e",\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": 634.9558601379395,\r
-        "y": 1858.876064300537,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 629.9559173583984,\r
+        "y": 2073.8761768341064,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f914b2c.f63948",\r
+        "id": "d5b2bc3d.8d9a6",\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": 641.3209266662598,\r
-        "y": 1752.0314636230469,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 636.3209838867188,\r
+        "y": 1967.0315761566162,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f60fe.f5fa6f",\r
+        "id": "b83326ad.562c28",\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": 627.3208503723145,\r
-        "y": 1806.0312767028809,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 622.3209075927734,\r
+        "y": 2021.0313892364502,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\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": 2464.3209915161133,\r
-        "y": 928.5312805175781,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\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": 2433.321002960205,\r
-        "y": 659.531247138977,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\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": 1927.3208541870117,\r
-        "y": 691.53125,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "62b5eb93.96f0e4",\r
-        "type": "comment",\r
-        "name": "**revert the changes",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 1328.3208808898926,\r
-        "y": 697.0312824249268,\r
-        "z": "a60b8cc5.55e8f",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "4995fb6d.83aaf4",\r
+        "id": "b435bcc5.258",\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": 871.5038909912109,\r
-        "y": 511.25390625,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 851.5038909912109,\r
+        "y": 518.2539068460464,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "208d9618.3a993a"\r
+                "6bafbe6f.aa9fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "208d9618.3a993a",\r
+        "id": "6bafbe6f.aa9fa",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.50390625,\r
-        "y": 562.25390625,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 957.50390625,\r
+        "y": 569.2539068460464,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "fd503aa4.1469a8"\r
+                "6df05552.51f26c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fd527ce.0b2738",\r
+        "id": "ae8078e2.85aab8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 671.7539138793945,\r
-        "y": 472.0039048194885,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 651.7539138793945,\r
+        "y": 479.003905415535,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "4995fb6d.83aaf4"\r
+                "b435bcc5.258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd503aa4.1469a8",\r
+        "id": "6df05552.51f26c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1129.753890991211,\r
-        "y": 559.0039281845093,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1109.753890991211,\r
+        "y": 566.0039287805557,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "2dd1b5ff.e9de3a"\r
+                "8567646d.1060f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "258487d9.bf18e8",\r
+        "id": "fb5d6670.5ef758",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1873.5039710998535,\r
-        "y": 557.0039119720459,\r
-        "z": "a60b8cc5.55e8f",\r
+        "x": 1853.5039710998535,\r
+        "y": 564.0039125680923,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "bc24bdbf.b7fae"\r
+                "80043aea.5219e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63f09f8.86bc26",\r
+        "id": "6484dde4.eec674",\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
+        "x": 889.2539329528809,\r
+        "y": 1200.7540191113949,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "6c04212d.63f27"\r
+                "a1390712.a62bc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3737121.de6a3",\r
+        "id": "ad9df864.da7a08",\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
+        "x": 892.7448997497559,\r
+        "y": 1248.3280547559261,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "b8053b7f.3dfe58"\r
+                "90fe71ad.3f6b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b40d4802.cec768",\r
+        "id": "eb0b9e44.3ab32",\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
+        "x": 888.0779075622559,\r
+        "y": 1289.6613677442074,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "11f26c3c.e24064"\r
+                "71113a16.58bf04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8053b7f.3dfe58",\r
+        "id": "90fe71ad.3f6b8",\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
+        "x": 1069.3163108825684,\r
+        "y": 1236.6137908399105,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11f26c3c.e24064",\r
+        "id": "71113a16.58bf04",\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
+        "x": 1075.8504638671875,\r
+        "y": 1285.100560516119,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9f93820.627df8",\r
+        "id": "dee3d47e.3afa78",\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
+        "x": 891.2540054321289,\r
+        "y": 1343.7540493011475,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "ea0a2431.4fcee8"\r
+                "511dbf29.862b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b6f89c7.7da458",\r
+        "id": "1b95ad69.b293e3",\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
+        "x": 883.5040054321289,\r
+        "y": 1397.3969326019287,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "10698363.0892ad"\r
+                "b6fcc0f6.ed652"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea0a2431.4fcee8",\r
+        "id": "511dbf29.862b4",\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
+        "x": 1041.2539329528809,\r
+        "y": 1344.754017829895,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10698363.0892ad",\r
+        "id": "b6fcc0f6.ed652",\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
+        "x": 1036.254005432129,\r
+        "y": 1397.146993637085,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c04212d.63f27",\r
+        "id": "a1390712.a62bc8",\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
+        "x": 1084.7540130615234,\r
+        "y": 1195.754023551941,\r
+        "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97edc5d7.68c598",\r
+        "id": "f78f25c0.9e44a8",\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
+        "x": 642.2539825439453,\r
+        "y": 1366.754126548767,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "b9f93820.627df8",\r
-                "4b6f89c7.7da458"\r
+                "dee3d47e.3afa78",\r
+                "1b95ad69.b293e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13f149d1.1db0a6",\r
+        "id": "955e1b88.3ac648",\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
+        "x": 627.2540512084961,\r
+        "y": 1247.75403881073,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
-                "63f09f8.86bc26",\r
-                "b3737121.de6a3",\r
-                "b40d4802.cec768"\r
+                "6484dde4.eec674",\r
+                "ad9df864.da7a08",\r
+                "eb0b9e44.3ab32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "deaed14.de5b43",\r
+        "id": "e3c5f502.462e18",\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
+        "x": 611.00390625,\r
+        "y": 298.50390684604645,\r
+        "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "df2e3f53.8ca7",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2552.5039863586426,\r
+        "y": 587.7539157867432,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "df6bb2fa.c17ef",\r
+                "f982878a.d924a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f982878a.d924a8",\r
+        "type": "set",\r
+        "name": "set site-vnf-index",\r
+        "xml": "<set>\n<parameter name='site-vnf-index' value='`$vnfidx`' />\n",\r
+        "comments": "",\r
+        "x": 2761.50390625,\r
+        "y": 605.75390625,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2a5aae1a.c1b0a2",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 631.0000305175781,\r
+        "y": 954.6667243242264,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "a16d9ee5.ca4f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a16d9ee5.ca4f8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 732.614933013916,\r
+        "y": 1050.9960061311722,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "b25dce73.2318a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b25dce73.2318a",\r
+        "type": "switchNode",\r
+        "name": "switch ActivateSDWANSiteInstance",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 997.0001754760742,\r
+        "y": 1000.6666575670242,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "d392cd81.71967"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d392cd81.71967",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1219.0000915527344,\r
+        "y": 1000.6667391061783,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "fbfbcd34.6e005"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fbfbcd34.6e005",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].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": 1300.250099182129,\r
+        "y": 1075.1667405366898,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "14eee879.fb0a98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "14eee879.fb0a98",\r
+        "type": "block",\r
+        "name": "block atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1517.6152648925781,\r
+        "y": 1075.9960051774979,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "3e0dbda2.f3d102"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3e0dbda2.f3d102",\r
+        "type": "switchNode",\r
+        "name": "switch siteId",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].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": 1683.2504577636719,\r
+        "y": 1082.1668478250504,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "d2a4cdf0.bc75d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d2a4cdf0.bc75d",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1860.2504768371582,\r
+        "y": 1085.1666880846024,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "62ddf11d.87106"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "62ddf11d.87106",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2019.5006675720215,\r
+        "y": 1080.6667281389236,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "f40c1288.f6e07"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f40c1288.f6e07",\r
+        "type": "set",\r
+        "name": "set prop.attach.siteId",\r
+        "xml": "<set>\n<parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].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": 2244.2509841918945,\r
+        "y": 1059.1667395830154,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d2a805b2.ac7b88",\r
+        "type": "block",\r
+        "name": "block atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1768.0000610351562,\r
+        "y": 972.3333503007889,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "2b39b5dd.e8366a",\r
+                "15adf9ee.e16a86",\r
+                "2697c7b2.0ecdf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15adf9ee.e16a86",\r
+        "type": "switchNode",\r
+        "name": "switch name",\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 == 'name'`\">\n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1943.000015258789,\r
+        "y": 942.333323597908,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "76044b62.8da524"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76044b62.8da524",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2093.749969482422,\r
+        "y": 943.833239197731,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "dfeb8378.a414f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dfeb8378.a414f",\r
+        "type": "set",\r
+        "name": "set prop.name",\r
+        "xml": "<set>\n<parameter name='prop.name' 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": 2267.750717163086,\r
+        "y": 943.8332976102829,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3e65957b.505a7a",\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": 1935.2583618164062,\r
+        "y": 730.5041723251343,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "e157d21e.75dc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6306e7ef.6a3048",\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[$sidx].name == 'siteId'`\">\n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2826.258445739746,\r
+        "y": 832.5042572021484,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "5020b41b.37af8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "45b20afa.d404e4",\r
+        "type": "block",\r
+        "name": "block atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1649.5312805175781,\r
+        "y": 756.0312795639038,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "3e65957b.505a7a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a1885c07.3d09a",\r
+        "type": "for",\r
+        "name": "for vf-modules.vf-module_length",\r
+        "xml": "<for index='sidx' 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": 2579.5310440063477,\r
+        "y": 826.0312752723694,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "6306e7ef.6a3048"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2697c7b2.0ecdf8",\r
+        "type": "switchNode",\r
+        "name": "switch topology",\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 == 'topology'`\">\n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1941.50390625,\r
+        "y": 882.75390625,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "55a98d99.b2ebc4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55a98d99.b2ebc4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2092.253860473633,\r
+        "y": 884.253821849823,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "115c12c5.b366ad"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "115c12c5.b366ad",\r
+        "type": "set",\r
+        "name": "set prop.topology",\r
+        "xml": "<set>\n<parameter name='prop.topology' 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": 2266.254608154297,\r
+        "y": 884.2538802623749,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": []\r
     }\r
-]
\ No newline at end of file
+]\r
index 380dfd0..d15b6f4 100644 (file)
         "id": "384abebf.660182",\r
         "type": "switchNode",\r
         "name": "switch ActivateSiteInstance",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    ",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1658.5078411102295,\r
         "id": "e72e5636.3932b8",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",\r
+        "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",\r
         "comments": "",\r
         "x": 2257.29248046875,\r
         "y": 1043.8992919921875,\r
         "id": "413a8e72.8c216",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",\r
         "comments": "",\r
         "x": 2254.754150390625,\r
         "y": 1158,\r
index fb12ca3..e9b3965 100644 (file)
@@ -26,7 +26,7 @@
                             <outcome value='CreateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='CreateSiteInstance'>\r
+                            <outcome value='CreateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='CreateSDWANDeviceInstance'>\r
@@ -50,7 +50,7 @@
                             <outcome value='ActivateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='ActivateSiteInstance'>\r
+                            <outcome value='ActivateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='ActivateSDWANDeviceInstance'>\r
@@ -74,7 +74,7 @@
                             <outcome value='DeactivateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='DeactivateSiteInstance'>\r
+                            <outcome value='DeactivateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='DeactivateSDWANDeviceInstance'>\r
@@ -98,7 +98,7 @@
                             <outcome value='DeleteSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='DeleteSiteInstance'>\r
+                            <outcome value='DeleteSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='DeleteSDWANDeviceInstance'>\r
index 9211d48..45a9bce 100644 (file)
                                                     <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`' >\r
                                                         <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'`">\r
                                                             <outcome value='true'>\r
-                                                                <set>\r
-                                                                    <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`' />\r
-                                                                </set>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <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`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='site-vnf-index' value='`$vnfidx`' />\r
+                                                                    </set>\r
+                                                                </block>\r
                                                             </outcome>\r
                                                         </switch>\r
                                                     </for>\r
                     <block>\r
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                             <outcome value='true'>\r
-                                <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`' >\r
-                                    <block atomic="true">\r
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic23.log"/>\r
-                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                            <parameter name="field2" value="param-name"/>\r
-                                            <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`'/>\r
-                                        </record>\r
+                                <block atomic="true">\r
+                                    <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`' >\r
                                         <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'`">\r
                                             <outcome value='true'>\r
                                                 <block atomic="true">\r
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic22.log"/>\r
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                        <parameter name="field2" value="set spoke role"/>\r
-                                                    </record>\r
                                                     <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'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
-                                                    <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'`">\r
+                                                    <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 == 'dsvpn-hub'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <parameter name='prop.role' value="hub" />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
+                                                    <for index='sidx' 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`' >\r
+                                                        <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[$sidx].name == 'siteId'`">\r
+                                                            <outcome value='true'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <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[$sidx].value`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
+                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
+                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
+                                                                    </set>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
                                                 </block>\r
                                             </outcome>\r
                                         </switch>\r
-                                        <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'`">\r
-                                            <outcome value='true'>\r
-                                                <block atomic="true">\r
-                                                    <set>\r
-                                                        <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`' />\r
-                                                    </set>\r
-                                                    <set>\r
-                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
-                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
-                                                    </set>\r
-                                                    <set>\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
-                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
-                                                    </set>\r
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic21.log"/>\r
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                        <parameter name="field2" value="prop.attach.siteId"/>\r
-                                                        <parameter name="field3" value='`$prop.attach.siteId`'/>\r
-                                                    </record>\r
-                                                </block>\r
-                                            </outcome>\r
-                                        </switch>\r
-                                    </block>\r
-                                </for>\r
+                                    </for>\r
+                                </block>\r
                             </outcome>\r
                         </switch>\r
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
                             <outcome value='true'>\r
                                 <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`' >\r
-                                    <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'`">\r
-                                        <outcome value='true'>\r
-                                            <set>\r
-                                                <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`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </switch>\r
+                                    <block atomic="true">\r
+                                        <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 == 'topology'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.topology' 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`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                        <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 == 'name'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.name' 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`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                        <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'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.vpnId' 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`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                    </block>\r
                                 </for>\r
                             </outcome>\r
                         </switch>\r
                     </block>\r
                 </for>\r
             </for>\r
+            <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
+                <block>\r
+                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
+                        <outcome value='true'>\r
+                            <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                <block atomic="true">\r
+                                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">\r
+                                        <outcome value='true'>\r
+                                            <block atomic="true">\r
+                                                <set>\r
+                                                    <parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </for>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
+            </for>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
+                <parameter name="regex" value="/"/>\r
+                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='error-code' value='' />\r
+                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                    </return>\r
+                </outcome>\r
+            </execute>\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
                 </outcome>\r
             </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />\r
+                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                <parameter name="format" value="json"/>\r
+                <parameter name="httpMethod" value="put"/>\r
+                <parameter name="responsePrefix" value="vpn-result"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error executing Create vpn failed" />\r
+                    </return>\r
+                </outcome>\r
+                <outcome value='success'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+            </execute>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`" />\r
+                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                <parameter name="format" value="json"/>\r
+                <parameter name="httpMethod" value="put"/>\r
+                <parameter name="responsePrefix" value="vpn-result"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error executing Create vpn topology failed" />\r
+                    </return>\r
+                </outcome>\r
+                <outcome value='success'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
                     </execute>\r
                 </outcome>\r
             </switch>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
-                <parameter name="regex" value="/"/>\r
-                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
-                <outcome value='success'>\r
-                    <set>\r
-                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                    </set>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='error-code' value='' />\r
-                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`" />\r
                     </block>\r
                 </outcome>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
-                <parameter name="responsePrefix" value="vpn-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create vpn failed" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
-                <parameter name="responsePrefix" value="vpn-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create vpn topology failed" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
             <set>\r
                 <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' />\r
                 <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`' />\r
             </return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r
index 40b1896..288dd5d 100644 (file)
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
-                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">\r
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                 <outcome value='true'>\r
                                     <set>\r
                                         <parameter name='tmp.siteVidx' value='`$idx`' />\r
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />\r
-                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />\r
                                                 <parameter name='prop.wan.IpMode' value="static" />\r
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\r
                                                 <parameter name='prop.route.nextHopType' value="ip-address" />\r
-                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
                                             </set>\r
                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />\r
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="" />\r
+                                                <parameter name='prop.wan.ipAddress' value="" />\r
                                                 <parameter name='prop.wan.prefixLength' value="" />\r
                                                 <parameter name='prop.wan.providerIpAddress' value="" />\r
                                                 <parameter name='prop.wan.IpMode' value="DHCP" />\r
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json
new file mode 100644 (file)
index 0000000..b274c1b
--- /dev/null
@@ -0,0 +1,18 @@
+{
+    "ports": [
+        {
+            "portType": ${prop.wan.portType},
+            "portNumber": ${prop.wan.portNumber},
+            "deviceId": ${prop.wan.deviceId},
+            "portSwitch": "layer3-port",
+            "linkInfo": {
+                 "linkType": "Cellular",
+                 "cellular": {
+                     "apn" : ${prop.wan.apn-name}
+                 },
+                 "atm": null,
+                 "ethernet": null                 
+            }
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json
new file mode 100644 (file)
index 0000000..d24cf4f
--- /dev/null
@@ -0,0 +1,21 @@
+{
+    "ports": [
+        {
+            "portType": ${prop.wan.portType},
+            "portNumber": ${prop.wan.portNumber},
+            "deviceId": ${prop.wan.deviceId},
+            "portSwitch": "layer3-port",
+            "linkInfo": {
+                 "linkType": "Ethernet",
+                 "cellular": null,
+                 "atm": null,
+                 "ethernet": {
+                      "negotiationMode": "auto",
+                      "media": "copper",
+                      "duplex": "half",
+                      "speed": 10
+                 }
+            }
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json
new file mode 100644 (file)
index 0000000..58cf796
--- /dev/null
@@ -0,0 +1,45 @@
+{
+    "tnps": [
+        {
+            "name": ${prop.wan.name},
+            "siteId": ${prop.wan.siteId},
+            "deviceId": ${prop.wan.deviceId},
+            "portId": ${prop.wan.devicePortId},
+            "inSubInterface": false,
+            "vlanId": "null",            
+            "ipConnection": {
+                "ipv4": {
+                    "publicIP": null,
+                    "accessType": "IPoE",
+                    "ipMode": "DHCP",
+                    "customerAddress": "",
+                    "prefixLength": null,
+                    "providerAddress": "",
+                    "peerIp": null,
+                    "userName": null,
+                    "userKey": null
+                }
+             },
+             "transportNetworkInfo": {
+                 "transportNetworkId": ${prop.wan.transportNetworkId},
+                 "workMode": "active"
+             },
+            "attributes": {
+                "inputBandwidth": ${prop.wan.inputBandwidth},
+                "outputBandwidth": ${prop.wan.outputBandwidth},
+                "mtu": 1500,
+                "TCPmss": 1200
+            },
+                       "ntp": [
+              {
+                "serverIP": "11.11.11.11",
+                "authentication": false,
+                "mode": "MD5",
+                "authKey": "123456",
+                "authId": 123
+              }
+            ],
+            "description": ${prop.wan.description}
+        }
+    ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
new file mode 100644 (file)
index 0000000..9825b6e
--- /dev/null
@@ -0,0 +1,45 @@
+{
+    "tnps": [
+        {
+            "name": ${prop.wan.name},
+            "siteId": ${prop.wan.siteId},
+            "deviceId": ${prop.wan.deviceId},
+            "portId": ${prop.wan.devicePortId},
+            "inSubInterface": false,
+            "vlanId": "null",            
+            "ipConnection": {
+                "ipv4": {
+                    "publicIP": null,
+                    "accessType": "IPoE",
+                    "ipMode": "Static",
+                    "customerAddress": ${prop.wan.ip-address},
+                    "prefixLength": ${prop.wan.prefixLength},
+                    "providerAddress": ${prop.wan.providerIpAddress},
+                   "peerIp": null,
+                    "userName": null,
+                    "userKey": null
+                }
+             },
+             "transportNetworkInfo": {
+                 "transportNetworkId": ${prop.wan.transportNetworkId},
+                 "workMode": "active"
+             },
+            "attributes": {
+                "inputBandwidth": ${prop.wan.inputBandwidth},
+                "outputBandwidth": ${prop.wan.outputBandwidth},
+                "mtu": 1500,
+                "TCPmss": 1200
+            },
+                       "ntp": [
+              {
+                "serverIP": "11.11.11.11",
+                "authentication": false,
+                "mode": "MD5",
+                "authKey": "123456",
+                "authId": 123
+              }
+            ],
+            "description": ${prop.wan.description}
+        }
+    ]
+}