SDWAN tenant auth DG 05/85805/3
authorshashikanth.vh <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 11:06:47 +0000 (11:06 +0000)
committerShashikanth VH <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 13:09:53 +0000 (13:09 +0000)
json file not merged with proper DG in previous commit
reverting the change

Change-Id: If6bbb5f81a96d78c9e01aeb8165900e986646839
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 8759135ce1c25d9602ae5674da74c5d1f95e6967

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml

index 8a5d8f9..801b57c 100644 (file)
 [\r
     {\r
-        "id": "3eca748a.ef817c",\r
-        "type": "dgstart",\r
-        "name": "DGSTART",\r
-        "outputs": 1,\r
-        "x": 123,\r
-        "y": 75,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "350fb0d5.88723"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "350fb0d5.88723",\r
-        "type": "service-logic",\r
-        "name": "GENERIC-RESOURCE-API ${project.version}",\r
-        "module": "GENERIC-RESOURCE-API",\r
-        "version": "${project.version}",\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": 368.2857131958008,\r
-        "y": 74.23807907104492,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "7fecfee8.d291b"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7fecfee8.d291b",\r
-        "type": "method",\r
-        "name": "validate-sdwan-vf-vpn-input-parameters",\r
-        "xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",\r
+        "id": "a64f3290.a6791",\r
+        "type": "get-resource",\r
+        "name": "get-resource service-subscription",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.subscription-service-type\n        AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">\n      \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 451.9166946411133,\r
-        "y": 209.25301837921143,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "8f6f1f8b.897a9"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8f6f1f8b.897a9",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 735.9167022705078,\r
-        "y": 197.25304317474365,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 641.03125,\r
+        "y": 413.09522104263306,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "634b7128.2e84d",\r
-                "adb8eda0.ca986",\r
-                "bc20a4d8.66ea78",\r
-                "376a189c.5eea28"\r
+                "d8117fcb.f28fc",\r
+                "d8ad970.7e76268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "634b7128.2e84d",\r
+        "id": "a43b0986.72aee8",\r
         "type": "switchNode",\r
-        "name": "switch  svc-action",\r
-        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
+        "name": "switch temp-ub-sub-account-id",\r
+        "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 995.916633605957,\r
-        "y": 45.25303936004639,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1053.0313415527344,\r
+        "y": 377.84530210494995,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "183ac3e9.257bcc"\r
+                "5fa9cabc.5c37a4",\r
+                "625dfb34.3c2da4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "183ac3e9.257bcc",\r
+        "id": "5fa9cabc.5c37a4",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1186.6309356689453,\r
-        "y": 46.2530403137207,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "65be383e.39b058"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "65be383e.39b058",\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=\"sdnc-request-header.svc-request-id is a required input\" />\n",\r
-        "comments": "",\r
-        "x": 1361.0594863891602,\r
-        "y": 45.25303268432617,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "adb8eda0.ca986",\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": 332.9166564941406,\r
-        "y": 468.2530336380005,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "83c4de98.01196",\r
-                "ce7e74f7.3c86c8",\r
-                "147fd5d9.68de3a",\r
-                "1561519f.abda0e",\r
-                "d7c5bf00.510dc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "83c4de98.01196",\r
-        "type": "outcome",\r
-        "name": "create",\r
-        "xml": "<outcome value='create'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 526.5000228881836,\r
-        "y": 297.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "363f7231.506cbe"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "363f7231.506cbe",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 687.5000228881836,\r
-        "y": 297.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "46be34f.5b2c7cc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ce7e74f7.3c86c8",\r
-        "type": "outcome",\r
-        "name": "deactivate",\r
-        "xml": "<outcome value='deactivate'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 499.4920120239258,\r
-        "y": 906.428539276123,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "aec7db3f.798358"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "147fd5d9.68de3a",\r
-        "type": "outcome",\r
-        "name": "delete",\r
-        "xml": "<outcome value='delete'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 503.20639419555664,\r
-        "y": 1077.1430969238281,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "c7708172.24701"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "1561519f.abda0e",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 502.9682846069336,\r
-        "y": 1250.571382522583,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1245.745792388916,\r
+        "y": 351.84534311294556,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "b6252f6e.c1321"\r
+                "cc0fb2fe.338bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6252f6e.c1321",\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=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",\r
-        "comments": "",\r
-        "x": 686.5398178100586,\r
-        "y": 1251.190523147583,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "46be34f.5b2c7cc",\r
-        "type": "switchNode",\r
-        "name": "switch request-action",\r
-        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 888,\r
-        "y": 295.6666797399521,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "3528f63.34e230a",\r
-                "82048a2c.348118"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3528f63.34e230a",\r
+        "id": "625dfb34.3c2da4",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1073.4999923706055,\r
-        "y": 323.66667652130127,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1246.0313568115234,\r
+        "y": 406.8453059196472,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "3198409.3ebdec"\r
+                "f90c9031.98073"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3198409.3ebdec",\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=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",\r
-        "comments": "",\r
-        "x": 1224.0000228881836,\r
-        "y": 317.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "ee1459dc.d090c8",\r
-        "type": "other",\r
-        "name": "DeleteSDWANVpnInstance",\r
-        "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
+        "id": "d8117fcb.f28fc",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 945.0634384155273,\r
-        "y": 1073.698395729065,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 851.5311126708984,\r
+        "y": 385.84127950668335,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "773b0668.3dfda8"\r
+                "a43b0986.72aee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "640b4312.a9c5ac",\r
-        "type": "other",\r
-        "name": "Other",\r
-        "xml": "<outcome value='Other'>",\r
+        "id": "d8ad970.7e76268",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.6189804077148,\r
-        "y": 1149.920636177063,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 845.2097015380859,\r
+        "y": 438.0555911064148,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "20eafb56.ca5e14"\r
+                "3d299dd2.2779d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20eafb56.ca5e14",\r
+        "id": "3d299dd2.2779d2",\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=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",\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": 1020.9524002075195,\r
-        "y": 1152.0317735671997,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 997.9597015380859,\r
+        "y": 437.80565214157104,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "773b0668.3dfda8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1168.9523086547852,\r
-        "y": 1079.9206190109253,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "b3df3a7b.216bd8",\r
-                "eb92e3d.8a6ff2"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d7c5bf00.510dc",\r
-        "type": "outcome",\r
-        "name": "activate",\r
-        "xml": "<outcome value='activate'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 520.4285774230957,\r
-        "y": 560.7143135070801,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "aa89a015.4408d"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "aa89a015.4408d",\r
-        "type": "switchNode",\r
-        "name": "switch request-action",\r
-        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 703.2857437133789,\r
-        "y": 557.8571634292603,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "c1f6d379.b3eef",\r
-                "89075fc5.672ae"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c1f6d379.b3eef",\r
-        "type": "other",\r
-        "name": "ActivateSDWANVpnInstance",\r
-        "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
+        "id": "22ec666.190639a",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\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": 956.5000228881836,\r
-        "y": 537.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 221.03125,\r
+        "y": 140.23810720443726,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "ce665d03.3901d"\r
+                "8abe47ad.c27bd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89075fc5.672ae",\r
-        "type": "other",\r
-        "name": "Other",\r
-        "xml": "<outcome value='Other'>",\r
-        "comments": "",\r
+        "id": "3762da11.93d966",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 886.5000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 141.74554443359375,\r
+        "y": 77.99999761581421,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "c6e2911c.5f916"\r
+                "22ec666.190639a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6e2911c.5f916",\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=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",\r
-        "comments": "",\r
-        "x": 1044.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "ce665d03.3901d",\r
+        "id": "6b7a2ebd.00d69",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1187.5000228881836,\r
-        "y": 537.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "b3df3a7b.216bd8",\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "57bd5824.2497c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c598159a.7423c8",\r
-        "type": "other",\r
-        "name": "DeactivateSDWANVpnInstance",\r
-        "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 942.9206390380859,\r
-        "y": 908.1429328918457,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 374.98365020751953,\r
+        "y": 376.8095316886902,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "50af0272.e02a9c"\r
+                "a64f3290.a6791",\r
+                "4bfcb671.50b358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e01173d7.fe6b9",\r
-        "type": "other",\r
-        "name": "Other",\r
-        "xml": "<outcome value='Other'>",\r
+        "id": "8abe47ad.c27bd8",\r
+        "type": "method",\r
+        "name": "method sdwan-get-tenant-auth",\r
+        "xml": "<method rpc='sdwan-get-tenant-auth' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 857.9206314086914,\r
-        "y": 977.1429405212402,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 232.74554443359375,\r
+        "y": 234.58633947372437,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
             [\r
-                "d14295e9.c68018"\r
+                "6b7a2ebd.00d69"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d14295e9.c68018",\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=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",\r
+        "id": "f90c9031.98073",\r
+        "type": "set",\r
+        "name": "set prop.tenant-id",\r
+        "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",\r
         "comments": "",\r
-        "x": 1038.9206466674805,\r
-        "y": 978.1429405212402,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1423.888427734375,\r
+        "y": 405.9523615837097,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aec7db3f.798358",\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": 679.7776947021484,\r
-        "y": 910.6188039779663,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "c598159a.7423c8",\r
-                "e01173d7.fe6b9"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c7708172.24701",\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": 683.5554962158203,\r
-        "y": 1076.9523208141327,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "ee1459dc.d090c8",\r
-                "640b4312.a9c5ac"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "50af0272.e02a9c",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1202.888786315918,\r
-        "y": 910.9523277282715,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "b3df3a7b.216bd8",\r
-                "c2db488a.b105a8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "82048a2c.348118",\r
-        "type": "other",\r
-        "name": "CreateSDWANVpnInstance",\r
-        "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1172.499984741211,\r
-        "y": 276.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "7a0b5551.c75d9c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7a0b5551.c75d9c",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1407.49995803833,\r
-        "y": 275.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "3f52a78f.7ab728"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3f52a78f.7ab728",\r
-        "type": "for",\r
-        "name": "for loop i - vpn vf input parameters",\r
-        "xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1638.000015258789,\r
-        "y": 276.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "d37b6b2c.71fb38"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d37b6b2c.71fb38",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "id": "4bfcb671.50b358",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create tenant auth",\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/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"tenant-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": 1846.5000228881836,\r
-        "y": 277.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 668.5312805175781,\r
+        "y": 515.988030910492,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": [\r
-            [\r
-                "9ec108e6.32a3b8",\r
-                "a16aa1da.005f3",\r
-                "3a20c40b.dcc4cc"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "9ec108e6.32a3b8",\r
-        "type": "set",\r
-        "name": "clear tmp-data",\r
-        "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",\r
-        "comments": "",\r
-        "x": 2029.5000228881836,\r
-        "y": 237.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "a16aa1da.005f3",\r
-        "type": "set",\r
-        "name": "set tmp-data",\r
-        "xml": "<set>\n<parameter name='tmp.name' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`\"/>\n",\r
-        "comments": "",\r
-        "x": 2024.0000228881836,\r
-        "y": 277.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "3a20c40b.dcc4cc",\r
-        "type": "switchNode",\r
-        "name": "switch name",\r
-        "xml": "<switch test=\"`$tmp.name`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2024.0000228881836,\r
-        "y": 317.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "3280408b.66ab3",\r
-                "63ad3611.30c718",\r
-                "2eab978e.1492a8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d22ab892.eef718",\r
-        "type": "switchNode",\r
-        "name": "switch value",\r
-        "xml": "<switch test=\"`$tmp.value`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2484.0001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "b07f67fa.6ab208"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2eab978e.1492a8",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2243.500358581543,\r
-        "y": 335.66667902469635,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "5967794c.72e8b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "5967794c.72e8b8",\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=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",\r
-        "comments": "",\r
-        "x": 2418.5003623962402,\r
-        "y": 334.66667902469635,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "3280408b.66ab3",\r
-        "type": "other",\r
-        "name": "name",\r
-        "xml": "<outcome value='name'>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2243.500358581543,\r
-        "y": 219.66667330265045,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "d22ab892.eef718"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "63ad3611.30c718",\r
-        "type": "other",\r
-        "name": "topology",\r
-        "xml": "<outcome value='topology'>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2255.500114440918,\r
-        "y": 273.333335518837,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "d22ab892.eef718"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b07f67fa.6ab208",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2627.5001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "3ecabf5c.8d652"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3ecabf5c.8d652",\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=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",\r
-        "comments": "",\r
-        "x": 2785.5001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b3df3a7b.216bd8",\r
-        "type": "switchNode",\r
-        "name": "switch service-data.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": 1479.3889541625977,\r
-        "y": 576.9999761581421,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "37913775.d258a8",\r
-                "8c9e338f.0d83c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "37913775.d258a8",\r
-        "type": "other",\r
-        "name": "outcome Null",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1748.0000228881836,\r
-        "y": 556.666711807251,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "7c4231f0.9cbb7"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7c4231f0.9cbb7",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
-        "comments": "",\r
-        "x": 1924.0000228881836,\r
-        "y": 557.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "8c9e338f.0d83c",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1726.5000228881836,\r
-        "y": 597.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "b6f61e8c.9dd35"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b6f61e8c.9dd35",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1887.5000228881836,\r
-        "y": 597.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "9317c153.6ccad",\r
-                "bdedbaa4.65e588"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "9317c153.6ccad",\r
-        "type": "for",\r
-        "name": "for nidx..service-data.vf-modules.vf-module[]",\r
-        "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2150.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "1fade275.78b10e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "1fade275.78b10e",\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[$nidx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n    \n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2436.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "99a1d82a.9dd8c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "99a1d82a.9dd8c8",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2606.5000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "39ae6a67.1c8296"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "70e3cfee.6e895",\r
-        "type": "set",\r
-        "name": "set tmp.nidx and ctx.network-data",\r
-        "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",\r
-        "comments": "",\r
-        "x": 3007.50008392334,\r
-        "y": 574.6667140722275,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "1412cffb.8d463",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
-        "comments": "",\r
-        "x": 2364.0000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "fbeeeb3e.43c3b8",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2226.5000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "1412cffb.8d463"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "bdedbaa4.65e588",\r
-        "type": "switchNode",\r
-        "name": "switch tmp.nidx ",\r
-        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2072.5000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "fbeeeb3e.43c3b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "57bd5824.2497c8",\r
-        "type": "switchNode",\r
-        "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1451.6667098999023,\r
-        "y": 656.5555486679077,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "719dd138.28ef4",\r
-                "2dca8a18.a65586"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "719dd138.28ef4",\r
-        "type": "outcome",\r
-        "name": "outcome Created",\r
-        "xml": "<outcome value='Created'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1748.5001258850098,\r
-        "y": 656.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "94e9cf1a.6c399"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2dca8a18.a65586",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1716.5001258850098,\r
-        "y": 696.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "2c8432e2.7a0b8e"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2c8432e2.7a0b8e",\r
+        "id": "cc0fb2fe.338bf",\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=\"`'vf-module is not in appropriate state for activate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
-        "comments": "",\r
-        "x": 1874.0001258850098,\r
-        "y": 696.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b4bebf6c.2b4fa",\r
-        "type": "switchNode",\r
-        "name": "switch vf-module-id",\r
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1398.5000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "9ad9b806.2c19b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "9ad9b806.2c19b8",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1626.5000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "b7b28733.f37c08"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b7b28733.f37c08",\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=\"network-request-input.network-input-parameters.name is a required input\" />\n",\r
-        "comments": "",\r
-        "x": 1764.0000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "30507c3b.465aa4",\r
-        "type": "execute",\r
-        "name": "execute requiredParameters",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vf-module-topology-operation-input.vf-module-information.vf-module-id\" value=\"$vf-module-topology-operation-input.vf-module-information.vf-module-id\"/>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1433.0000228881836,\r
-        "y": 477.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "c2db488a.b105a8",\r
-        "type": "switchNode",\r
-        "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1479.8332748413086,\r
-        "y": 906.5555257797241,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "cf4b307b.b1b04",\r
-                "acc49742.fd0df8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "cf4b307b.b1b04",\r
-        "type": "outcome",\r
-        "name": "outcome Active",\r
-        "xml": "<outcome value='Active'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1753.166648864746,\r
-        "y": 880.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "e31a54a2.3ff1f8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "acc49742.fd0df8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1723.166648864746,\r
-        "y": 920.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "bc3125bf.c135a8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "bc3125bf.c135a8",\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=\"`'vf-module is not in appropriate state for deactivate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n    ",\r
-        "comments": "",\r
-        "x": 1889.166648864746,\r
-        "y": 922.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "eb92e3d.8a6ff2",\r
-        "type": "switchNode",\r
-        "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1468.7221908569336,\r
-        "y": 1077.6666097640991,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "4005e1e5.db606",\r
-                "3f0b16e4.30f1ca"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4005e1e5.db606",\r
-        "type": "outcome",\r
-        "name": "outcome PendingDelete",\r
-        "xml": "<outcome value='PendingDelete'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1768.7222518920898,\r
-        "y": 1045.444405555725,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "e99f233c.ef676"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3f0b16e4.30f1ca",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1712.055564880371,\r
-        "y": 1092.1110677719116,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "26e244b4.b2362c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "26e244b4.b2362c",\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=\"`'vf-module is not in appropriate state for delete. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
-        "comments": "",\r
-        "x": 1878.055564880371,\r
-        "y": 1094.1110677719116,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "94e9cf1a.6c399",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1940.5001029968262,\r
-        "y": 657.6666488647461,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "e31a54a2.3ff1f8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1953.1665267944336,\r
-        "y": 879.1481161117554,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "e99f233c.ef676",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1984.277732849121,\r
-        "y": 1045.8147420883179,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "39ae6a67.1c8296",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2756.666534423828,\r
-        "y": 574.0000190734863,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "70e3cfee.6e895"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "bc20a4d8.66ea78",\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": 971.0065307617188,\r
-        "y": 121.24849605560303,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "ae64d058.26533"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ae64d058.26533",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1151.0065116882324,\r
-        "y": 120.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "d4c5df8d.2e7e3"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d4c5df8d.2e7e3",\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 entry not found in service-data\" />\n",\r
-        "comments": "",\r
-        "x": 1300.4352378845215,\r
-        "y": 121.39140319824219,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "376a189c.5eea28",\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": 951.0379104614258,\r
-        "y": 183.51763439178467,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "891fced5.d7d06"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "891fced5.d7d06",\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": 1189.0065269470215,\r
-        "y": 183.2484917640686,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "2828372d.9354b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2828372d.9354b8",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1404.0065116882324,\r
-        "y": 181.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
-        "wires": [\r
-            [\r
-                "56c573f0.8eef8c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "56c573f0.8eef8c",\r
-        "type": "set",\r
-        "name": "set vnf-index",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\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": 1568.0065116882324,\r
-        "y": 176.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1428.1740341186523,\r
+        "y": 351.6666522026062,\r
+        "z": "734fbe9e.c17a1",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 2fc01cf..491efef 100644 (file)
@@ -5,7 +5,7 @@
         <block atomic="true">\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="service-subscription" \r
-        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.subscription-service-type \r
+        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.subscription-service-type\r
         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.global-customer-id'\r
       force="true" pfx="tmp.AnAI-data-tenant">\r
                 <outcome value='success'>\r
@@ -34,7 +34,7 @@
             </get-resource>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`" />\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