From: Dan Timoney <dtimoney@att.com>
Date: Tue, 16 Apr 2019 14:23:52 +0000 (+0000)
Subject: Merge "Device input parameter processing failed"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6748f871443426f8ac06a069ac602452b9a837bf;hp=663dbb29fe1b5335eaa16646b8eb6eb42136595d;p=sdnc%2Foam.git

Merge "Device input parameter processing failed"
---

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index ccddd944..2c0aa7be 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -51,6 +51,10 @@ function install_sdnrwt_features() {
   addToFeatureBoot "$SDNRWT_BOOTFEATURES" $SDNRWT_REPOSITORY
 }
 
+function install_sdnr_northbound_features() {
+  addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES" $SDNR_NORTHBOUND_REPOSITORY
+}
+
 function enable_odl_cluster(){
   if [ -z $SDNC_REPLICAS ]; then
      echo "SDNC_REPLICAS is not configured in Env field"
@@ -114,12 +118,16 @@ MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
 INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
 SDNRWT=${SDNRWT:-false}
 SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
+SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
+SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
 
 
 echo "Settings:"
 echo "  ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
 echo "  SDNC_REPLICAS=$SDNC_REPLICAS"
 echo "  SDNRWT=$SDNRWT"
+echo "  SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
+
 
 #
 # Wait for database
@@ -156,6 +164,8 @@ then
 
 	if $SDNRWT ; then install_sdnrwt_features ; fi
 
+  if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
+
 	echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
 fi
 
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json
index b51105eb..c1209fc0 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5781857d.34f10c",
+        "id": "21e79fdd.0452",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 188.03125,
-        "y": 43.031253814697266,
-        "z": "22c1b0cd.01617",
+        "x": 172,
+        "y": 78,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "34ea5d13.adf2e2"
+                "a56bff31.7def2"
             ]
         ]
     },
     {
-        "id": "34ea5d13.adf2e2",
+        "id": "a56bff31.7def2",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,535 +22,526 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 267.31695556640625,
-        "y": 105.26936340332031,
-        "z": "22c1b0cd.01617",
+        "x": 251.28570556640625,
+        "y": 140.23810958862305,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "7a350033.439ec"
+                "debd8cb4.849ed"
             ]
         ]
     },
     {
-        "id": "7a350033.439ec",
+        "id": "debd8cb4.849ed",
         "type": "method",
         "name": "method sdwan-vf-operation-vpn-activate",
         "xml": "<method rpc='sdwan-vf-operation-vpn-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 279.03125,
-        "y": 199.61759567260742,
-        "z": "22c1b0cd.01617",
+        "x": 263,
+        "y": 234.58634185791016,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "eae20948.900428"
+                "7513aa1e.16b4d4"
             ]
         ]
     },
     {
-        "id": "eae20948.900428",
+        "id": "7513aa1e.16b4d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 265.6979217529297,
-        "y": 384.6979675292969,
-        "z": "22c1b0cd.01617",
+        "x": 249.6666717529297,
+        "y": 419.6667137145996,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "94df5008.7b42f",
-                "7ed34394.611e1c",
-                "23e3b0bc.99c9d",
-                "3dc91e9a.3f3102",
-                "f95e37c5.b5e148",
-                "fc6cc049.08c93",
-                "b58620d0.ff986",
-                "b6f2d919.b74fa8",
-                "9597930d.e038d",
-                "ef79430c.f091e",
-                "fc543198.c0c2e",
-                "a41eacc.0c7475",
-                "d46578bf.5e8e58",
-                "21b0010b.c0a22e",
-                "5d9f4d8a.00ca04",
-                "48cf7750.d184d8",
-                "4efe1671.fc4788",
-                "d6a9c738.cde808"
+                "f032d4b7.491cc8",
+                "67bb10ae.0e353",
+                "c1332488.62fde8",
+                "e39bef36.4698d",
+                "774b89d9.c41338",
+                "73b6f7ab.0d36d8",
+                "5ccac719.bf4388",
+                "ab39c2ec.e041d",
+                "83763572.db11e8",
+                "5e0a24cd.c963fc",
+                "5dbdc6ec.868d28",
+                "5048db5.9599324",
+                "a8022531.9687b8",
+                "6aeee675.ba6f48",
+                "139e4c0f.50ddb4",
+                "64534896.fa8bc8",
+                "8cf38aaa.8f6988"
             ]
         ]
     },
     {
-        "id": "94df5008.7b42f",
+        "id": "f032d4b7.491cc8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 805.6980133056641,
-        "y": 222.03141355514526,
-        "z": "22c1b0cd.01617",
+        "x": 789.6667633056641,
+        "y": 257.000159740448,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "23e3b0bc.99c9d",
+        "id": "c1332488.62fde8",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 637.0625152587891,
-        "y": 310.06250381469727,
-        "z": "22c1b0cd.01617",
+        "x": 621.0312652587891,
+        "y": 345.03125,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ed34394.611e1c",
+        "id": "67bb10ae.0e353",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.7603912353516,
-        "y": 266.0624761581421,
-        "z": "22c1b0cd.01617",
+        "x": 585.7291412353516,
+        "y": 301.0312223434448,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7f983045.d243a",
+        "id": "57e47be3.8054b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 924.486083984375,
-        "y": 360.04166173934937,
-        "z": "22c1b0cd.01617",
+        "x": 908.454833984375,
+        "y": 395.0104079246521,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "875bfb0c.99b4c8",
-                "fda7ec02.f4fa3"
+                "d56b85ca.9481e8",
+                "d0693d28.80f9b"
             ]
         ]
     },
     {
-        "id": "875bfb0c.99b4c8",
+        "id": "d56b85ca.9481e8",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1108.4861907958984,
-        "y": 322.0416889190674,
-        "z": "22c1b0cd.01617",
+        "x": 1092.4549407958984,
+        "y": 357.0104351043701,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "2605efbe.66ab7"
+                "2748734c.684fac"
             ]
         ]
     },
     {
-        "id": "2605efbe.66ab7",
+        "id": "2748734c.684fac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1282.4863166809082,
-        "y": 322.04169273376465,
-        "z": "22c1b0cd.01617",
+        "x": 1266.4550666809082,
+        "y": 357.0104389190674,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "dadb2cf7.2ff69"
+                "6309dd22.f19b94"
             ]
         ]
     },
     {
-        "id": "dadb2cf7.2ff69",
+        "id": "6309dd22.f19b94",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1445.4862022399902,
-        "y": 321.6416873931885,
-        "z": "22c1b0cd.01617",
+        "x": 1429.4549522399902,
+        "y": 356.6104335784912,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "fda7ec02.f4fa3",
+        "id": "d0693d28.80f9b",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1118.9026908874512,
-        "y": 369.70831775665283,
-        "z": "22c1b0cd.01617",
+        "x": 1102.8714408874512,
+        "y": 404.67706394195557,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "3ae5ca3b.f74cc6"
+                "8fb95e7a.24168"
             ]
         ]
     },
     {
-        "id": "3ae5ca3b.f74cc6",
+        "id": "8fb95e7a.24168",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1292.902816772461,
-        "y": 369.7083215713501,
-        "z": "22c1b0cd.01617",
+        "x": 1276.871566772461,
+        "y": 404.67706775665283,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "4b92911a.56168"
+                "f7379751.d87ff8"
             ]
         ]
     },
     {
-        "id": "4b92911a.56168",
+        "id": "f7379751.d87ff8",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1455.902702331543,
-        "y": 369.3083162307739,
-        "z": "22c1b0cd.01617",
+        "x": 1439.871452331543,
+        "y": 404.27706241607666,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "3dc91e9a.3f3102",
+        "id": "e39bef36.4698d",
         "type": "for",
         "name": "for each network-input-parameters",
         "xml": "<for index='idx' start='0' end='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 672.6526527404785,
-        "y": 369.708309173584,
-        "z": "22c1b0cd.01617",
+        "x": 656.6214027404785,
+        "y": 404.6770553588867,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "7f983045.d243a"
+                "57e47be3.8054b4"
             ]
         ]
     },
     {
-        "id": "4efe1671.fc4788",
+        "id": "139e4c0f.50ddb4",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 669.4862022399902,
-        "y": 496.04168128967285,
-        "z": "22c1b0cd.01617",
+        "x": 653.4549522399902,
+        "y": 531.0104274749756,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "46f8b46c.58115c",
-                "a1d7d554.010ed8",
-                "21d4ff8e.d6051"
+                "3689f3fd.7221cc",
+                "d64da76b.209af8",
+                "17a9c1ef.c4208e"
             ]
         ]
     },
     {
-        "id": "46f8b46c.58115c",
+        "id": "3689f3fd.7221cc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 931.486083984375,
-        "y": 449.04166159033775,
-        "z": "22c1b0cd.01617",
+        "x": 915.454833984375,
+        "y": 484.0104077756405,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "df26ddf3.952"
+                "33d44e4e.88ac52"
             ]
         ]
     },
     {
-        "id": "a1d7d554.010ed8",
+        "id": "d64da76b.209af8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 934.97705078125,
-        "y": 496.615697234869,
-        "z": "22c1b0cd.01617",
+        "x": 918.94580078125,
+        "y": 531.5844434201717,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "c96d1e93.137b6"
+                "210fb3c2.b65bac"
             ]
         ]
     },
     {
-        "id": "21d4ff8e.d6051",
+        "id": "17a9c1ef.c4208e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 930.31005859375,
-        "y": 537.9490102231503,
-        "z": "22c1b0cd.01617",
+        "x": 914.27880859375,
+        "y": 572.917756408453,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "29af3383.039eac"
+                "7173d290.3a041c"
             ]
         ]
     },
     {
-        "id": "c96d1e93.137b6",
+        "id": "210fb3c2.b65bac",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1111.5484619140625,
-        "y": 484.9014333188534,
-        "z": "22c1b0cd.01617",
+        "x": 1095.5172119140625,
+        "y": 519.8701795041561,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "29af3383.039eac",
+        "id": "7173d290.3a041c",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1118.0826148986816,
-        "y": 533.3882029950619,
-        "z": "22c1b0cd.01617",
+        "x": 1102.0513648986816,
+        "y": 568.3569491803646,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "48cf7750.d184d8",
+        "id": "6aeee675.ba6f48",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 689.4861221313477,
-        "y": 615.0416851043701,
-        "z": "22c1b0cd.01617",
+        "x": 673.4548721313477,
+        "y": 650.0104312896729,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "47bd8a4e.743ee4",
-                "5c5772a6.eeb8ac"
+                "4fc3faa9.6dc304",
+                "f1aacba9.1de118"
             ]
         ]
     },
     {
-        "id": "47bd8a4e.743ee4",
+        "id": "4fc3faa9.6dc304",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 933.486156463623,
-        "y": 592.0416917800903,
-        "z": "22c1b0cd.01617",
+        "x": 917.454906463623,
+        "y": 627.0104379653931,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "91c9ef14.b46a4"
+                "16433351.3e777d"
             ]
         ]
     },
     {
-        "id": "5c5772a6.eeb8ac",
+        "id": "f1aacba9.1de118",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 925.736156463623,
-        "y": 645.6845750808716,
-        "z": "22c1b0cd.01617",
+        "x": 909.704906463623,
+        "y": 680.6533212661743,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             [
-                "b75502f5.e09e5"
+                "34937ca.3e30484"
             ]
         ]
     },
     {
-        "id": "91c9ef14.b46a4",
+        "id": "16433351.3e777d",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1083.486083984375,
-        "y": 593.0416603088379,
-        "z": "22c1b0cd.01617",
+        "x": 1067.454833984375,
+        "y": 628.0104064941406,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "b75502f5.e09e5",
+        "id": "34937ca.3e30484",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1078.486156463623,
-        "y": 645.4346361160278,
-        "z": "22c1b0cd.01617",
+        "x": 1062.454906463623,
+        "y": 680.4033823013306,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "df26ddf3.952",
+        "id": "33d44e4e.88ac52",
         "type": "set",
         "name": "set controller data",
         "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",
         "comments": "",
-        "x": 1128.9861450195312,
-        "y": 437.04166159033775,
-        "z": "22c1b0cd.01617",
+        "x": 1112.9548950195312,
+        "y": 472.0104077756405,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "5d9f4d8a.00ca04",
+        "id": "a8022531.9687b8",
         "type": "execute",
         "name": "execute RestApiCallNode Create vpn",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-create.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=\"post\"/>\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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 695.2254638671875,
-        "y": 728.721978187561,
-        "z": "22c1b0cd.01617",
+        "x": 679.1942138671875,
+        "y": 763.6907243728638,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "f95e37c5.b5e148",
+        "id": "774b89d9.c41338",
         "type": "set",
         "name": "set prop.vpn-id and prop.vpn1Id",
         "xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n",
         "comments": "",
-        "x": 680.2256622314453,
-        "y": 782.7221002578735,
-        "z": "22c1b0cd.01617",
+        "x": 664.1944122314453,
+        "y": 817.6908464431763,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "21b0010b.c0a22e",
+        "id": "5048db5.9599324",
         "type": "execute",
         "name": "execute RestApiCallNode Create vpn topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/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=\"post\"/>\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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 728.7254638671875,
-        "y": 825.7219481468201,
-        "z": "22c1b0cd.01617",
+        "x": 706.6942138671875,
+        "y": 865.6906909942627,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc6cc049.08c93",
-        "type": "set",
-        "name": "set tenant-id to service-data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n",
-        "comments": "",
-        "x": 670.7255401611328,
-        "y": 877.4720306396484,
-        "z": "22c1b0cd.01617",
-        "wires": []
-    },
-    {
-        "id": "b58620d0.ff986",
+        "id": "73b6f7ab.0d36d8",
         "type": "set",
         "name": "set  vpn-id to service-data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n",
+        "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='vpn-id' />\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.vpn-id`' />\n",
         "comments": "",
-        "x": 660.9754791259766,
-        "y": 976.2218685150146,
-        "z": "22c1b0cd.01617",
+        "x": 639.9442138671875,
+        "y": 927.1906471252441,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "b6f2d919.b74fa8",
+        "id": "5ccac719.bf4388",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 618.0352668762207,
-        "y": 1336.5354351997375,
-        "z": "22c1b0cd.01617",
+        "x": 604.004020690918,
+        "y": 1257.504249572754,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "d6a9c738.cde808",
+        "id": "64534896.fa8bc8",
         "type": "update",
         "name": "update SDWAN VPN status to AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 687.3649978637695,
-        "y": 1230.905207157135,
-        "z": "22c1b0cd.01617",
+        "x": 666.3337326049805,
+        "y": 1181.8739857673645,
+        "z": "1c1dd38f.89b8bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc543198.c0c2e",
+        "id": "5e0a24cd.c963fc",
         "type": "set",
         "name": "set vf-module-level-oper-status",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].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.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
+        "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`' />",
         "comments": "",
-        "x": 684.0000152587891,
-        "y": 1174.0000378815457,
-        "z": "22c1b0cd.01617",
+        "x": 662.96875,
+        "y": 1124.9688164917752,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "ef79430c.f091e",
+        "id": "83763572.db11e8",
         "type": "set",
         "name": "set vf-module-id and vf-module-object-path",
         "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",
         "comments": "",
-        "x": 718.0000152587891,
-        "y": 1125.5000369278714,
-        "z": "22c1b0cd.01617",
+        "x": 696.96875,
+        "y": 1076.468815538101,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "9597930d.e038d",
+        "id": "ab39c2ec.e041d",
         "type": "set",
         "name": "copy input data in service-data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].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.nidx].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.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
+        "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",
         "comments": "",
-        "x": 681.9999694824219,
-        "y": 1077.7499914169312,
-        "z": "22c1b0cd.01617",
+        "x": 660.9687042236328,
+        "y": 1028.7187700271606,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "a41eacc.0c7475",
+        "id": "5dbdc6ec.868d28",
         "type": "set",
         "name": "set  param-length + 1",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />",
+        "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_length' value='`$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 + 1`' />",
         "comments": "",
-        "x": 657.0000476837158,
-        "y": 1026.0000734329224,
-        "z": "22c1b0cd.01617",
+        "x": 635.9687824249268,
+        "y": 976.9688520431519,
+        "z": "1c1dd38f.89b8bc",
         "wires": []
     },
     {
-        "id": "d46578bf.5e8e58",
-        "type": "set",
-        "name": "set param length + 1",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />\n",
+        "id": "8cf38aaa.8f6988",
+        "type": "call",
+        "name": "call sdwan-get-tenant-auth",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
         "comments": "",
-        "x": 652.0000152587891,
-        "y": 922.0000267028809,
-        "z": "22c1b0cd.01617",
-        "wires": []
+        "outputs": 1,
+        "x": 655.00390625,
+        "y": 707.00390625,
+        "z": "1c1dd38f.89b8bc",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
index e8db0bf8..dd6f3215 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
@@ -1,37 +1,37 @@
 [
     {
-        "id": "5892697a.9c21d8",
+        "id": "2de211e6.98e23e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 482.03125,
-        "y": 382.00000220537186,
-        "z": "c6a9f1ad.d0abe",
+        "x": 468,
+        "y": 381.0000009536743,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "3419ca3e.28a196",
-                "18fb5a27.0012c6",
-                "987ea69b.4f3758",
-                "6b48247.18bfcdc",
-                "12914a5f.e6b036",
-                "5fd7b0fa.16e31",
-                "623a4487.e99e9c",
-                "4156b8b2.c36818",
-                "9723e968.8650b8",
-                "7be42a51.991f94",
-                "4a04380d.9f4fa8",
-                "ea1ae816.a77cc8",
-                "43b512b5.67ddbc",
-                "64fa1f85.6660d",
-                "37949d89.629082"
+                "6436367.bae22c8",
+                "1f79f37c.52109d",
+                "86c4e83c.6dd4c8",
+                "e7ab9a67.b605f8",
+                "1d935a3c.53bb66",
+                "9465c248.bcdbd",
+                "944e3f22.30053",
+                "240305a4.5a5a9a",
+                "5d2253aa.4bfbec",
+                "b6ddeb01.d7f708",
+                "83d0d62b.725028",
+                "8a6622c.9c3e9e",
+                "d3e9377a.b7b628",
+                "166cfcae.a53de3",
+                "4cde94b6.d8700c"
             ]
         ]
     },
     {
-        "id": "309bc096.5fac7",
+        "id": "489fcd29.cfaa34",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -39,616 +39,616 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 324.03126525878906,
-        "y": 165.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 310.00001525878906,
+        "y": 164.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "1f3522ef.5a48ed"
+                "105708eb.457607"
             ]
         ]
     },
     {
-        "id": "1f3522ef.5a48ed",
+        "id": "105708eb.457607",
         "type": "method",
         "name": "sdwan-vf-operation-vpn-create",
         "xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 323.03126525878906,
-        "y": 265.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 309.00001525878906,
+        "y": 264.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "5892697a.9c21d8"
+                "2de211e6.98e23e"
             ]
         ]
     },
     {
-        "id": "3582a035.23289",
+        "id": "a574a3fb.d3201",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153.53126525878906,
-        "y": 77.00000125169754,
-        "z": "c6a9f1ad.d0abe",
+        "x": 139.50001525878906,
+        "y": 76,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "309bc096.5fac7"
+                "489fcd29.cfaa34"
             ]
         ]
     },
     {
-        "id": "3419ca3e.28a196",
+        "id": "6436367.bae22c8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.3606719970703,
-        "y": 273.49612647295,
-        "z": "c6a9f1ad.d0abe",
+        "x": 768.3294219970703,
+        "y": 272.49612522125244,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e71de9cd.25e818"
+                "a118e404.bdd118"
             ]
         ]
     },
     {
-        "id": "e71de9cd.25e818",
+        "id": "a118e404.bdd118",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1034.3607635498047,
-        "y": 272.1627896428108,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1020.3295135498047,
+        "y": 271.1627883911133,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "637c1185.e9ab2"
+                "40e93eeb.bac38"
             ]
         ]
     },
     {
-        "id": "46c73b2c.401b84",
+        "id": "948c1668.1af8e8",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",
         "comments": "",
-        "x": 1406.0272521972656,
-        "y": 274.16279250383377,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1391.9960021972656,
+        "y": 273.16279125213623,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "637c1185.e9ab2",
+        "id": "40e93eeb.bac38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1252.6940803527832,
-        "y": 274.1627715229988,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1238.6628303527832,
+        "y": 273.16277027130127,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "46c73b2c.401b84"
+                "948c1668.1af8e8"
             ]
         ]
     },
     {
-        "id": "6b48247.18bfcdc",
+        "id": "e7ab9a67.b605f8",
         "type": "for",
         "name": "for loop idx - VF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 856.2814559936523,
-        "y": 495.6666596531868,
-        "z": "c6a9f1ad.d0abe",
+        "x": 842.2502059936523,
+        "y": 494.66665840148926,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "de525177.578e5"
+                "62290f8b.75c82"
             ]
         ]
     },
     {
-        "id": "de525177.578e5",
+        "id": "62290f8b.75c82",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1071.059799194336,
-        "y": 493.2222436070442,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1057.028549194336,
+        "y": 492.2222423553467,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f754a25f.6ce5b",
-                "a4e3fb1c.255518"
+                "59b05bb9.0b68b4",
+                "72944c92.a776a4"
             ]
         ]
     },
     {
-        "id": "f754a25f.6ce5b",
+        "id": "59b05bb9.0b68b4",
         "type": "execute",
         "name": "execute split parameterName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1267.3160018920898,
-        "y": 470.9703820347786,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1253.2847518920898,
+        "y": 469.97038078308105,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4e3fb1c.255518",
+        "id": "72944c92.a776a4",
         "type": "set",
         "name": "set parameterName",
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
         "comments": "",
-        "x": 1236.7604293823242,
-        "y": 507.9704983830452,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1222.7291793823242,
+        "y": 506.97049713134766,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "af1423f9.97927",
+        "id": "d0552bf7.11fd78",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1240.2816581726074,
-        "y": 430.3333280682564,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1226.2504081726074,
+        "y": 429.33332681655884,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "18fb5a27.0012c6",
+        "id": "1f79f37c.52109d",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 796.7812652587891,
-        "y": 228.99999552965164,
-        "z": "c6a9f1ad.d0abe",
+        "x": 782.7500152587891,
+        "y": 227.9999942779541,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f110968e.0e58a8"
+                "f848aa6e.cfe238"
             ]
         ]
     },
     {
-        "id": "f110968e.0e58a8",
+        "id": "f848aa6e.cfe238",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.4479446411133,
-        "y": 228.33329325914383,
-        "z": "c6a9f1ad.d0abe",
+        "x": 969.4166946411133,
+        "y": 227.3332920074463,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "241d819c.c8566e"
+                "63764309.2b5d2c"
             ]
         ]
     },
     {
-        "id": "241d819c.c8566e",
+        "id": "63764309.2b5d2c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",
         "comments": "",
-        "x": 1165.1145706176758,
-        "y": 228.33329325914383,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1151.0833206176758,
+        "y": 227.3332920074463,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "987ea69b.4f3758",
+        "id": "86c4e83c.6dd4c8",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.0312547683716,
-        "y": 348.99999648332596,
-        "z": "c6a9f1ad.d0abe",
+        "x": 824.0000047683716,
+        "y": 347.9999952316284,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f6ea0a95.1bfcf8",
-                "7969b2ec.a074ec"
+                "47ea1345.69aafc",
+                "1d47e1b9.b5ac9e"
             ]
         ]
     },
     {
-        "id": "f6ea0a95.1bfcf8",
+        "id": "47ea1345.69aafc",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 324.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1055.000015258789,
+        "y": 323.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "95e71927.be46c8"
+                "4b7cf824.56d218"
             ]
         ]
     },
     {
-        "id": "7969b2ec.a074ec",
+        "id": "1d47e1b9.b5ac9e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 364.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1055.000015258789,
+        "y": 363.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "53dfed7f.4e81b4"
+                "ff6c5552.af6328"
             ]
         ]
     },
     {
-        "id": "95e71927.be46c8",
+        "id": "4b7cf824.56d218",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1211.531265258789,
-        "y": 324.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1197.500015258789,
+        "y": 323.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "53dfed7f.4e81b4",
+        "id": "ff6c5552.af6328",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1213.3883094787598,
-        "y": 364.9365056157112,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1199.3570594787598,
+        "y": 363.9365043640137,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "bd7a9ede.140ae",
-                "804dd88d.6a51d8"
+                "34f94cf0.e3aea4",
+                "b3996c0f.5f9d2"
             ]
         ]
     },
     {
-        "id": "804dd88d.6a51d8",
+        "id": "b3996c0f.5f9d2",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
         "comments": "",
-        "x": 1366.086784362793,
-        "y": 334.55560430837795,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1352.055534362793,
+        "y": 333.5556030566804,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "bd7a9ede.140ae",
+        "id": "34f94cf0.e3aea4",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1422.5152893066406,
-        "y": 387.77773410081863,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1408.4840393066406,
+        "y": 386.7777328491211,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "549e64ff.4f02fc"
+                "441d1901.20ad48"
             ]
         ]
     },
     {
-        "id": "96b53f57.6e1a2",
+        "id": "f0d652ef.7b8d",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1646.1660194396973,
-        "y": 346.0317915081978,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1632.1347694396973,
+        "y": 345.03179025650024,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "549e64ff.4f02fc",
+        "id": "441d1901.20ad48",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1697.801010131836,
-        "y": 387.3492367863655,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1683.769760131836,
+        "y": 386.34923553466797,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "789deb75.f505c4"
+                "d51340c3.db8f7"
             ]
         ]
     },
     {
-        "id": "789deb75.f505c4",
+        "id": "d51340c3.db8f7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1598.53120803833,
-        "y": 445.92066794633865,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1584.49995803833,
+        "y": 444.9206666946411,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "60c9009a.34691"
+                "20af1164.21510e"
             ]
         ]
     },
     {
-        "id": "60c9009a.34691",
+        "id": "20af1164.21510e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 1746.2813110351562,
-        "y": 445.77786001516506,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1732.2500610351562,
+        "y": 444.7778587634675,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "4156b8b2.c36818",
+        "id": "240305a4.5a5a9a",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n\n",
         "comments": "",
-        "x": 851.8844451904297,
-        "y": 798.4962475895882,
-        "z": "c6a9f1ad.d0abe",
+        "x": 837.8531951904297,
+        "y": 797.4962463378906,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "623a4487.e99e9c",
+        "id": "944e3f22.30053",
         "type": "execute",
         "name": "execute generate-vf-module-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 863.218017578125,
-        "y": 751.162949860096,
-        "z": "c6a9f1ad.d0abe",
+        "x": 849.186767578125,
+        "y": 750.1629486083984,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fd7b0fa.16e31",
+        "id": "9465c248.bcdbd",
         "type": "set",
         "name": "set new vf-module_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 835.2180786132812,
-        "y": 702.162949860096,
-        "z": "c6a9f1ad.d0abe",
+        "x": 821.1868286132812,
+        "y": 701.1629486083984,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "12914a5f.e6b036",
+        "id": "1d935a3c.53bb66",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 835.2176055908203,
-        "y": 648.1542380452156,
-        "z": "c6a9f1ad.d0abe",
+        "x": 821.1863555908203,
+        "y": 647.1542367935181,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "9723e968.8650b8",
+        "id": "5d2253aa.4bfbec",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 845.5314331054688,
-        "y": 896.0000686645508,
-        "z": "c6a9f1ad.d0abe",
+        "x": 831.5001831054688,
+        "y": 895.0000674128532,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "64fa1f85.6660d",
+        "id": "166cfcae.a53de3",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 852.0312938690186,
-        "y": 941.5000165104866,
-        "z": "c6a9f1ad.d0abe",
+        "x": 838.0000438690186,
+        "y": 940.5000152587891,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "37949d89.629082",
-        "type": "save",
-        "name": "save service relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' \n      key='site-resource.site-resource-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-site\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-sites/sdwan-site/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" /-->\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 849.0312213897705,
-        "y": 987.500047981739,
-        "z": "c6a9f1ad.d0abe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7be42a51.991f94",
+        "id": "b6ddeb01.d7f708",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 799.7537670135498,
-        "y": 1034.6739071011543,
-        "z": "c6a9f1ad.d0abe",
+        "x": 785.7225170135498,
+        "y": 1033.6739058494568,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "4a04380d.9f4fa8",
+        "id": "83d0d62b.725028",
         "type": "for",
         "name": "for loop i - Network input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 863.2851715087891,
-        "y": 584.5039075016975,
-        "z": "c6a9f1ad.d0abe",
+        "x": 849.2539215087891,
+        "y": 583.50390625,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "b830a75.ba7e858"
+                "4fef64f6.74978c"
             ]
         ]
     },
     {
-        "id": "b830a75.ba7e858",
+        "id": "4fef64f6.74978c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1150.5080490112305,
-        "y": 584.726221382618,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1136.4767990112305,
+        "y": 583.7262201309204,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e85749e.f646cb8",
-                "44026e82.c4236"
+                "70539f79.6843b",
+                "69460cae.8c8bb4"
             ]
         ]
     },
     {
-        "id": "e85749e.f646cb8",
+        "id": "70539f79.6843b",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1338.729892730713,
-        "y": 567.0595255494118,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1324.698642730713,
+        "y": 566.0595242977142,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "b01f15f5.803658"
+                "63c5ecf6.3d2174"
             ]
         ]
     },
     {
-        "id": "44026e82.c4236",
+        "id": "69460cae.8c8bb4",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1349.5695533752441,
-        "y": 607.0595236420631,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1335.5383033752441,
+        "y": 606.0595223903656,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "9f894ed7.8915b"
+                "c6e54399.0667f"
             ]
         ]
     },
     {
-        "id": "b01f15f5.803658",
+        "id": "63c5ecf6.3d2174",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.729892730713,
-        "y": 563.0595255494118,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1511.698642730713,
+        "y": 562.0595242977142,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e28f739a.4fef3"
+                "7b7eb3bd.411e2c"
             ]
         ]
     },
     {
-        "id": "9f894ed7.8915b",
+        "id": "c6e54399.0667f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1519.5695533752441,
-        "y": 603.0595236420631,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1505.5383033752441,
+        "y": 602.0595223903656,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "3dd20fe.b268ef"
+                "660aadb7.bbfbd4"
             ]
         ]
     },
     {
-        "id": "e28f739a.4fef3",
+        "id": "7b7eb3bd.411e2c",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
         "comments": "",
-        "x": 1675.73002243042,
-        "y": 561.6595321297646,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1661.69877243042,
+        "y": 560.659530878067,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "3dd20fe.b268ef",
+        "id": "660aadb7.bbfbd4",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1706.9029941558838,
-        "y": 601.5206804871559,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1692.8717441558838,
+        "y": 600.5206792354584,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "ea1ae816.a77cc8",
+        "id": "8a6622c.9c3e9e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 964.5351715087891,
-        "y": 174.00390750169754,
-        "z": "c6a9f1ad.d0abe",
+        "x": 950.5039215087891,
+        "y": 173.00390625,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b512b5.67ddbc",
+        "id": "d3e9377a.b7b628",
         "type": "set",
         "name": "set vf-module-object-path",
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 837.5313110351562,
-        "y": 847.0312881469727,
-        "z": "c6a9f1ad.d0abe",
+        "x": 823.5000610351562,
+        "y": 846.0312868952751,
+        "z": "f1f197ca.402af8",
         "wires": []
+    },
+    {
+        "id": "4cde94b6.d8700c",
+        "type": "save",
+        "name": "save service relationship in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 838.0001220703125,
+        "y": 988.0001564025879,
+        "z": "f1f197ca.402af8",
+        "wires": [
+            []
+        ]
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
index 14263832..79b6cb77 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
@@ -1,34 +1,34 @@
 [
     {
-        "id": "702b97b3.8ee378",
+        "id": "87eb3467.67ef28",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.03125,
-        "y": 208.03125,
-        "z": "e3dba753.67e0f8",
+        "x": 797.00390625,
+        "y": 151.00015544891357,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "32955a69.c89b66",
+        "id": "6ff7ce0a.951ff",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 149.36448669433594,
-        "y": 29.031090259552002,
-        "z": "e3dba753.67e0f8",
+        "x": 158.33714294433594,
+        "y": 45,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "6d10fa5f.ef1ca4"
+                "74fd4f3a.4e853"
             ]
         ]
     },
     {
-        "id": "6d10fa5f.ef1ca4",
+        "id": "74fd4f3a.4e853",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -36,564 +36,520 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 228.6501922607422,
-        "y": 91.26919984817505,
-        "z": "e3dba753.67e0f8",
+        "x": 237.6228485107422,
+        "y": 107.23810958862305,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "90ef259f.4465b8"
+                "98288506.abeac8"
             ]
         ]
     },
     {
-        "id": "90ef259f.4465b8",
+        "id": "98288506.abeac8",
         "type": "method",
         "name": "method sdwan-vf-operation-vpn-deactivate",
         "xml": "<method rpc='sdwan-vf-operation-vpn-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 240.36448669433594,
-        "y": 185.61743211746216,
-        "z": "e3dba753.67e0f8",
+        "x": 249.33714294433594,
+        "y": 201.58634185791016,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "36593f98.16e3d"
+                "99dd38ea.772bf8"
             ]
         ]
     },
     {
-        "id": "36593f98.16e3d",
+        "id": "99dd38ea.772bf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 227.03115844726562,
-        "y": 370.6978039741516,
-        "z": "e3dba753.67e0f8",
+        "x": 239.0038185119629,
+        "y": 371.6667160987854,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "702b97b3.8ee378",
-                "2f3304e5.d7fd4c",
-                "6be98d9b.539ff4",
-                "a0c4b3e9.994a9",
-                "b323d31c.acd57",
-                "5f46d882.04a158",
-                "621066a9.944e88",
-                "e3e4d1bd.80fd7",
-                "b9de2d65.c5979",
-                "7f24be05.1cd31",
-                "c30bc7b4.1dd508",
-                "5edb2470.30880c",
-                "c2f4c0be.85e67",
-                "637b40e9.05bd1"
+                "87eb3467.67ef28",
+                "fbc323e1.e7c8",
+                "92efdb26.a1dc48",
+                "f685e9f.f092918",
+                "9692eb20.6e3eb8",
+                "4ed48d04.0548b4",
+                "14e78520.2f6ebb",
+                "5fa8f00b.d8012",
+                "e6e38299.18bf5",
+                "265552d2.b6286e",
+                "c10bc8e8.e761d8",
+                "8ab2d64c.eae3d8",
+                "1aef8aa3.927465",
+                "d5916e8b.c3632"
             ]
         ]
     },
     {
-        "id": "6be98d9b.539ff4",
+        "id": "92efdb26.a1dc48",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 598.395751953125,
-        "y": 296.062340259552,
-        "z": "e3dba753.67e0f8",
+        "x": 626.3683891296387,
+        "y": 227.03125858306885,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f3304e5.d7fd4c",
+        "id": "fbc323e1.e7c8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.0936279296875,
-        "y": 252.06231260299683,
-        "z": "e3dba753.67e0f8",
+        "x": 596.0662841796875,
+        "y": 188.03122329711914,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5ced122.5325a",
+        "id": "4bc65046.8972",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 874.8193664550781,
-        "y": 379.04149866104126,
-        "z": "e3dba753.67e0f8",
+        "x": 902.7920036315918,
+        "y": 310.0104169845581,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "3739b39c.50fc6c",
-                "ac6efceb.fbae4",
-                "f4c9064c.3cb418",
-                "6663d5f5.4132fc"
+                "39639513.9419aa",
+                "51ec0208.871a0c",
+                "de6a021a.2e26d"
             ]
         ]
     },
     {
-        "id": "3739b39c.50fc6c",
+        "id": "39639513.9419aa",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.8194274902344,
-        "y": 308.0415253639221,
-        "z": "e3dba753.67e0f8",
+        "x": 1097.792064666748,
+        "y": 239.01044368743896,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "5651b769.f6f788"
+                "17876ecb.2d9e11"
             ]
         ]
     },
     {
-        "id": "5651b769.f6f788",
+        "id": "17876ecb.2d9e11",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1243.8195533752441,
-        "y": 308.0415291786194,
-        "z": "e3dba753.67e0f8",
+        "x": 1271.7921905517578,
+        "y": 239.01044750213623,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "8feb29dd.764fe8"
+                "4587c6d7.80cd28"
             ]
         ]
     },
     {
-        "id": "8feb29dd.764fe8",
+        "id": "4587c6d7.80cd28",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1406.8194389343262,
-        "y": 307.6415238380432,
-        "z": "e3dba753.67e0f8",
+        "x": 1434.7920761108398,
+        "y": 238.61044216156006,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "ac6efceb.fbae4",
+        "id": "51ec0208.871a0c",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080.235927581787,
-        "y": 355.70815420150757,
-        "z": "e3dba753.67e0f8",
+        "x": 1108.2085647583008,
+        "y": 286.6770725250244,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "fffcbfb8.f2fa"
+                "e5e3dbe3.2a4648"
             ]
         ]
     },
     {
-        "id": "fffcbfb8.f2fa",
+        "id": "e5e3dbe3.2a4648",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254.2360534667969,
-        "y": 355.70815801620483,
-        "z": "e3dba753.67e0f8",
+        "x": 1282.2086906433105,
+        "y": 286.6770763397217,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "aba521f0.c2f18"
+                "a5f45824.51c398"
             ]
         ]
     },
     {
-        "id": "aba521f0.c2f18",
+        "id": "a5f45824.51c398",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1417.235939025879,
-        "y": 355.30815267562866,
-        "z": "e3dba753.67e0f8",
+        "x": 1445.2085762023926,
+        "y": 286.2770709991455,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "a0c4b3e9.994a9",
+        "id": "f685e9f.f092918",
         "type": "for",
         "name": "for each network-input-parameters",
         "xml": "<for index='idx' start='0' end='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.9858703613281,
-        "y": 381.70817041397095,
-        "z": "e3dba753.67e0f8",
+        "x": 663.9585075378418,
+        "y": 312.6770887374878,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "d5ced122.5325a"
+                "4bc65046.8972"
             ]
         ]
     },
     {
-        "id": "b9de2d65.c5979",
+        "id": "e6e38299.18bf5",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 649.8194122314453,
-        "y": 619.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 683.7920188903809,
+        "y": 444.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "962e611e.d3b8",
-                "d1b437fc.b72478",
-                "76cb6a63.2b7384"
+                "faf2ca26.f7d2e8",
+                "22680e7d.d029d2",
+                "dd46840b.db1198"
             ]
         ]
     },
     {
-        "id": "962e611e.d3b8",
+        "id": "faf2ca26.f7d2e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894.8194122314453,
-        "y": 565.0415081977844,
-        "z": "e3dba753.67e0f8",
+        "x": 928.7920188903809,
+        "y": 390.0104659497738,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "61f20284.b32c7c"
+                "45fec8c4.77c4d8"
             ]
         ]
     },
     {
-        "id": "d1b437fc.b72478",
+        "id": "22680e7d.d029d2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 898.3103790283203,
-        "y": 612.6155438423157,
-        "z": "e3dba753.67e0f8",
+        "x": 932.2829856872559,
+        "y": 437.58450159430504,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "d289f55.a1fa308"
+                "c85ef46f.17a478"
             ]
         ]
     },
     {
-        "id": "76cb6a63.2b7384",
+        "id": "dd46840b.db1198",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 893.6433868408203,
-        "y": 653.9488568305969,
-        "z": "e3dba753.67e0f8",
+        "x": 927.6159934997559,
+        "y": 478.9178145825863,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7041e417.d417bc"
+                "86e5bf28.74a63"
             ]
         ]
     },
     {
-        "id": "d289f55.a1fa308",
+        "id": "c85ef46f.17a478",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1074.8817901611328,
-        "y": 600.9012799263,
-        "z": "e3dba753.67e0f8",
+        "x": 1108.8543968200684,
+        "y": 425.8702376782894,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "7041e417.d417bc",
+        "id": "86e5bf28.74a63",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1081.415943145752,
-        "y": 649.3880496025085,
-        "z": "e3dba753.67e0f8",
+        "x": 1115.3885498046875,
+        "y": 474.3570073544979,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "7f24be05.1cd31",
+        "id": "265552d2.b6286e",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 657.8194122314453,
-        "y": 730.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 691.7920188903809,
+        "y": 555.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "4afad198.25387",
-                "f3670767.c4d1d8"
+                "2ff5851f.5a7bea",
+                "12d4ec03.6bbb94"
             ]
         ]
     },
     {
-        "id": "4afad198.25387",
+        "id": "2ff5851f.5a7bea",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 896.8194847106934,
-        "y": 708.041538387537,
-        "z": "e3dba753.67e0f8",
+        "x": 930.7920913696289,
+        "y": 533.0104961395264,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7f06af8d.b7446"
+                "674e737a.7db1dc"
             ]
         ]
     },
     {
-        "id": "f3670767.c4d1d8",
+        "id": "12d4ec03.6bbb94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 889.0694847106934,
-        "y": 761.6844216883183,
-        "z": "e3dba753.67e0f8",
+        "x": 923.0420913696289,
+        "y": 586.6533794403076,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "5cfe33a1.e2bc8c"
+                "436e486e.a66d38"
             ]
         ]
     },
     {
-        "id": "7f06af8d.b7446",
+        "id": "674e737a.7db1dc",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1046.8194122314453,
-        "y": 709.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 1080.7920188903809,
+        "y": 534.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "5cfe33a1.e2bc8c",
+        "id": "436e486e.a66d38",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1041.8194847106934,
-        "y": 761.4344827234745,
-        "z": "e3dba753.67e0f8",
+        "x": 1075.792091369629,
+        "y": 586.4034404754639,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "61f20284.b32c7c",
+        "id": "45fec8c4.77c4d8",
         "type": "set",
         "name": "set controller data",
         "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",
         "comments": "",
-        "x": 1092.3194732666016,
-        "y": 553.0415081977844,
-        "z": "e3dba753.67e0f8",
+        "x": 1126.292079925537,
+        "y": 378.0104659497738,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "b323d31c.acd57",
+        "id": "9692eb20.6e3eb8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 592.3685722351074,
-        "y": 1226.5350461006165,
-        "z": "e3dba753.67e0f8",
+        "x": 632.341157913208,
+        "y": 886.5040712356567,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "f4c9064c.3cb418",
+        "id": "de6a021a.2e26d",
         "type": "switchNode",
         "name": "switch vpn-id",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vpn-id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.368392944336,
-        "y": 405.284996509552,
-        "z": "e3dba753.67e0f8",
+        "x": 1105.3410301208496,
+        "y": 336.25391483306885,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7073b26f.c2162c"
+                "b18071f3.3ff89"
             ]
         ]
     },
     {
-        "id": "7073b26f.c2162c",
+        "id": "b18071f3.3ff89",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1259.3684253692627,
-        "y": 405.2849953174591,
-        "z": "e3dba753.67e0f8",
+        "x": 1287.3410625457764,
+        "y": 336.25391364097595,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "ec43e2d2.05e58"
+                "2b7fb28a.006dbe"
             ]
         ]
     },
     {
-        "id": "ec43e2d2.05e58",
+        "id": "2b7fb28a.006dbe",
         "type": "set",
         "name": "set prop.vpn-id",
         "xml": "<set>\n<parameter name='prop.vpn-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1424.3683586120605,
-        "y": 407.88499689102173,
-        "z": "e3dba753.67e0f8",
+        "x": 1452.3409957885742,
+        "y": 338.8539152145386,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "6663d5f5.4132fc",
-        "type": "switchNode",
-        "name": "switch tenant-id",
-        "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1088.1182556152344,
-        "y": 449.284996509552,
-        "z": "e3dba753.67e0f8",
-        "wires": [
-            [
-                "b0ecdc75.e86fd"
-            ]
-        ]
-    },
-    {
-        "id": "b0ecdc75.e86fd",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1257.1184558868408,
-        "y": 448.28499841690063,
-        "z": "e3dba753.67e0f8",
-        "wires": [
-            [
-                "aa1766f9.85f0b8"
-            ]
-        ]
-    },
-    {
-        "id": "aa1766f9.85f0b8",
-        "type": "set",
-        "name": "set prop.tenant-id",
-        "xml": "<set>\n<parameter name='prop.tenant-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
-        "comments": "",
-        "x": 1420.1183414459229,
-        "y": 447.88499307632446,
-        "z": "e3dba753.67e0f8",
-        "wires": []
-    },
-    {
-        "id": "c30bc7b4.1dd508",
+        "id": "c10bc8e8.e761d8",
         "type": "call",
         "name": "call sdwan-get-tenant-auth",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 626.3644866943359,
-        "y": 816.031090259552,
-        "z": "e3dba753.67e0f8",
+        "x": 662.337085723877,
+        "y": 606.0000734329224,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "5edb2470.30880c",
+        "id": "8ab2d64c.eae3d8",
         "type": "execute",
         "name": "execute RestApiCallNode delete vpn topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/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=\"delete\"/>\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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 685.364501953125,
-        "y": 874.6978039741516,
-        "z": "e3dba753.67e0f8",
+        "x": 724.3371391296387,
+        "y": 644.6667604446411,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2f4c0be.85e67",
+        "id": "1aef8aa3.927465",
         "type": "execute",
         "name": "execute RestApiCallNode delete vpn",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-delete.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn/action/batch-delete'`\" />\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=\"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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 662.8645172119141,
-        "y": 931.6980247497559,
-        "z": "e3dba753.67e0f8",
+        "x": 697.8371620178223,
+        "y": 685.6670351028442,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "637b40e9.05bd1",
+        "id": "d5916e8b.c3632",
         "type": "update",
         "name": "update SDWAN VPN status to AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
         "comments": "",
         "outputs": 1,
-        "x": 658.5832214355469,
-        "y": 1156.734342098236,
-        "z": "e3dba753.67e0f8",
+        "x": 692.5558166503906,
+        "y": 846.7032747268677,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f46d882.04a158",
+        "id": "4ed48d04.0548b4",
         "type": "set",
         "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].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.nidx].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.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
+        "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",
         "comments": "",
-        "x": 645,
-        "y": 998,
-        "z": "e3dba753.67e0f8",
+        "x": 682.9726409912109,
+        "y": 723.968991279602,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "621066a9.944e88",
+        "id": "14e78520.2f6ebb",
         "type": "set",
         "name": "set vf-module-object-path",
         "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",
         "comments": "",
-        "x": 628.6666564941406,
-        "y": 1039.416741847992,
-        "z": "e3dba753.67e0f8",
+        "x": 669.639274597168,
+        "y": 765.3856935501099,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "e3e4d1bd.80fd7",
+        "id": "5fa8f00b.d8012",
         "type": "set",
         "name": "set vf-module-oper-status to PendingDelete",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
+        "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='PendingDelete' />\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`' />\n",
         "comments": "",
-        "x": 684.1467742919922,
-        "y": 1089.0039992332458,
-        "z": "e3dba753.67e0f8",
+        "x": 721.1193695068359,
+        "y": 804.9730195999146,
+        "z": "ed1e44d2.195918",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
index 8a5d8f9e..b0816734 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "3eca748a.ef817c",
+        "id": "d157ce03.c3288",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 123,
-        "y": 75,
-        "z": "619b2b0c.b0ac74",
+        "x": 129,
+        "y": 64,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "350fb0d5.88723"
+                "5ddc2216.ec964c"
             ]
         ]
     },
     {
-        "id": "350fb0d5.88723",
+        "id": "5ddc2216.ec964c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1284 +22,1284 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 368.2857131958008,
-        "y": 74.23807907104492,
-        "z": "619b2b0c.b0ac74",
+        "x": 374.2857131958008,
+        "y": 63.23807907104492,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "7fecfee8.d291b"
+                "e97f46cc.0059c8"
             ]
         ]
     },
     {
-        "id": "7fecfee8.d291b",
+        "id": "e97f46cc.0059c8",
         "type": "method",
         "name": "validate-sdwan-vf-vpn-input-parameters",
         "xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 451.9166946411133,
-        "y": 209.25301837921143,
-        "z": "619b2b0c.b0ac74",
+        "x": 457.9166946411133,
+        "y": 198.25301837921143,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "8f6f1f8b.897a9"
+                "94a6ae40.767b3"
             ]
         ]
     },
     {
-        "id": "8f6f1f8b.897a9",
+        "id": "94a6ae40.767b3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 735.9167022705078,
-        "y": 197.25304317474365,
-        "z": "619b2b0c.b0ac74",
+        "x": 741.9167022705078,
+        "y": 186.25304317474365,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "634b7128.2e84d",
-                "adb8eda0.ca986",
-                "bc20a4d8.66ea78",
-                "376a189c.5eea28"
+                "c1b9af78.ff38c",
+                "5ab8336c.d30a1c",
+                "26ecbd16.18b922",
+                "f0d7fed2.a7f6e"
             ]
         ]
     },
     {
-        "id": "634b7128.2e84d",
+        "id": "c1b9af78.ff38c",
         "type": "switchNode",
         "name": "switch  svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 995.916633605957,
-        "y": 45.25303936004639,
-        "z": "619b2b0c.b0ac74",
+        "x": 1001.916633605957,
+        "y": 34.25303936004639,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "183ac3e9.257bcc"
+                "61401669.5d3bb8"
             ]
         ]
     },
     {
-        "id": "183ac3e9.257bcc",
+        "id": "61401669.5d3bb8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1186.6309356689453,
-        "y": 46.2530403137207,
-        "z": "619b2b0c.b0ac74",
+        "x": 1192.6309356689453,
+        "y": 35.2530403137207,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "65be383e.39b058"
+                "8deeb25a.a0c7a"
             ]
         ]
     },
     {
-        "id": "65be383e.39b058",
+        "id": "8deeb25a.a0c7a",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1361.0594863891602,
-        "y": 45.25303268432617,
-        "z": "619b2b0c.b0ac74",
+        "x": 1367.0594863891602,
+        "y": 34.25303268432617,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "adb8eda0.ca986",
+        "id": "5ab8336c.d30a1c",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 332.9166564941406,
-        "y": 468.2530336380005,
-        "z": "619b2b0c.b0ac74",
+        "x": 338.9166564941406,
+        "y": 457.2530336380005,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "83c4de98.01196",
-                "ce7e74f7.3c86c8",
-                "147fd5d9.68de3a",
-                "1561519f.abda0e",
-                "d7c5bf00.510dc"
+                "dd523414.2c6af8",
+                "3ab9ebd9.cb15a4",
+                "748e648b.48faec",
+                "364e12f1.bd272e",
+                "907aa46b.591888"
             ]
         ]
     },
     {
-        "id": "83c4de98.01196",
+        "id": "dd523414.2c6af8",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 526.5000228881836,
-        "y": 297.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 532.5000228881836,
+        "y": 286.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "363f7231.506cbe"
+                "b695319.fac5ed"
             ]
         ]
     },
     {
-        "id": "363f7231.506cbe",
+        "id": "b695319.fac5ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 687.5000228881836,
-        "y": 297.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 693.5000228881836,
+        "y": 286.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "46be34f.5b2c7cc"
+                "1c93366e.75aada"
             ]
         ]
     },
     {
-        "id": "ce7e74f7.3c86c8",
+        "id": "3ab9ebd9.cb15a4",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 499.4920120239258,
-        "y": 906.428539276123,
-        "z": "619b2b0c.b0ac74",
+        "x": 505.4920120239258,
+        "y": 895.428539276123,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "aec7db3f.798358"
+                "c38c9ea7.d32c"
             ]
         ]
     },
     {
-        "id": "147fd5d9.68de3a",
+        "id": "748e648b.48faec",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 503.20639419555664,
-        "y": 1077.1430969238281,
-        "z": "619b2b0c.b0ac74",
+        "x": 509.20639419555664,
+        "y": 1066.1430969238281,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "c7708172.24701"
+                "cfdfa9d2.e72008"
             ]
         ]
     },
     {
-        "id": "1561519f.abda0e",
+        "id": "364e12f1.bd272e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 502.9682846069336,
-        "y": 1250.571382522583,
-        "z": "619b2b0c.b0ac74",
+        "x": 508.9682846069336,
+        "y": 1239.571382522583,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "b6252f6e.c1321"
+                "1c142ebe.8cdf21"
             ]
         ]
     },
     {
-        "id": "b6252f6e.c1321",
+        "id": "1c142ebe.8cdf21",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 686.5398178100586,
-        "y": 1251.190523147583,
-        "z": "619b2b0c.b0ac74",
+        "x": 692.5398178100586,
+        "y": 1240.190523147583,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "46be34f.5b2c7cc",
+        "id": "1c93366e.75aada",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 888,
-        "y": 295.6666797399521,
-        "z": "619b2b0c.b0ac74",
+        "x": 894,
+        "y": 284.6666797399521,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "3528f63.34e230a",
-                "82048a2c.348118"
+                "ee1d7ddd.46ad1",
+                "3d1afbf1.1b7e64"
             ]
         ]
     },
     {
-        "id": "3528f63.34e230a",
+        "id": "ee1d7ddd.46ad1",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 1073.4999923706055,
-        "y": 323.66667652130127,
-        "z": "619b2b0c.b0ac74",
+        "x": 1079.4999923706055,
+        "y": 312.66667652130127,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "3198409.3ebdec"
+                "efe7d43a.e3e608"
             ]
         ]
     },
     {
-        "id": "3198409.3ebdec",
+        "id": "efe7d43a.e3e608",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1224.0000228881836,
-        "y": 317.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 1230.0000228881836,
+        "y": 306.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "ee1459dc.d090c8",
+        "id": "2418184c.a14ab8",
         "type": "other",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 945.0634384155273,
-        "y": 1073.698395729065,
-        "z": "619b2b0c.b0ac74",
+        "x": 945.0634078979492,
+        "y": 1062.6983680725098,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "773b0668.3dfda8"
+                "8c2f423e.95a5"
             ]
         ]
     },
     {
-        "id": "640b4312.a9c5ac",
+        "id": "ba1e9ce4.084c2",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 860.6189804077148,
-        "y": 1149.920636177063,
-        "z": "619b2b0c.b0ac74",
+        "x": 866.6189804077148,
+        "y": 1138.920636177063,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "20eafb56.ca5e14"
+                "29217d6f.264c52"
             ]
         ]
     },
     {
-        "id": "20eafb56.ca5e14",
+        "id": "29217d6f.264c52",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1020.9524002075195,
-        "y": 1152.0317735671997,
-        "z": "619b2b0c.b0ac74",
+        "x": 1026.9524002075195,
+        "y": 1141.0317735671997,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "773b0668.3dfda8",
+        "id": "8c2f423e.95a5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1168.9523086547852,
-        "y": 1079.9206190109253,
-        "z": "619b2b0c.b0ac74",
+        "x": 1174.9523086547852,
+        "y": 1068.9206190109253,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "30507c3b.465aa4",
-                "b4bebf6c.2b4fa",
-                "b3df3a7b.216bd8",
-                "eb92e3d.8a6ff2"
+                "5a51c09f.0dc8a",
+                "dac4a6bf.88b598",
+                "607c6dc9.f58224",
+                "5f5b8df.a6d8d74"
             ]
         ]
     },
     {
-        "id": "d7c5bf00.510dc",
+        "id": "907aa46b.591888",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 520.4285774230957,
-        "y": 560.7143135070801,
-        "z": "619b2b0c.b0ac74",
+        "x": 526.4285774230957,
+        "y": 549.7143135070801,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "aa89a015.4408d"
+                "eff709e7.55cc68"
             ]
         ]
     },
     {
-        "id": "aa89a015.4408d",
+        "id": "eff709e7.55cc68",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.2857437133789,
-        "y": 557.8571634292603,
-        "z": "619b2b0c.b0ac74",
+        "x": 709.2857437133789,
+        "y": 546.8571634292603,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "c1f6d379.b3eef",
-                "89075fc5.672ae"
+                "db4e4749.ac5c28",
+                "f7339987.1e66e8"
             ]
         ]
     },
     {
-        "id": "c1f6d379.b3eef",
+        "id": "db4e4749.ac5c28",
         "type": "other",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 956.5000228881836,
-        "y": 537.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 962.5000228881836,
+        "y": 526.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "ce665d03.3901d"
+                "90c3027e.ce76e"
             ]
         ]
     },
     {
-        "id": "89075fc5.672ae",
+        "id": "f7339987.1e66e8",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 886.5000228881836,
-        "y": 577.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 892.5000228881836,
+        "y": 566.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "c6e2911c.5f916"
+                "58df50e9.ec50f"
             ]
         ]
     },
     {
-        "id": "c6e2911c.5f916",
+        "id": "58df50e9.ec50f",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1044.0000228881836,
-        "y": 577.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1050.0000228881836,
+        "y": 566.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "ce665d03.3901d",
+        "id": "90c3027e.ce76e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1187.5000228881836,
-        "y": 537.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1193.5000228881836,
+        "y": 526.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "b3df3a7b.216bd8",
-                "30507c3b.465aa4",
-                "b4bebf6c.2b4fa",
-                "57bd5824.2497c8"
+                "607c6dc9.f58224",
+                "5a51c09f.0dc8a",
+                "dac4a6bf.88b598",
+                "befd23a0.20fa9"
             ]
         ]
     },
     {
-        "id": "c598159a.7423c8",
+        "id": "7d17bd6a.99ffe4",
         "type": "other",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 942.9206390380859,
-        "y": 908.1429328918457,
-        "z": "619b2b0c.b0ac74",
+        "x": 948.9206390380859,
+        "y": 897.1429328918457,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "50af0272.e02a9c"
+                "ae97c0e.69b144"
             ]
         ]
     },
     {
-        "id": "e01173d7.fe6b9",
+        "id": "754fd131.c0e1d",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 857.9206314086914,
-        "y": 977.1429405212402,
-        "z": "619b2b0c.b0ac74",
+        "x": 863.9206314086914,
+        "y": 966.1429405212402,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "d14295e9.c68018"
+                "e5085bda.bb5f08"
             ]
         ]
     },
     {
-        "id": "d14295e9.c68018",
+        "id": "e5085bda.bb5f08",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1038.9206466674805,
-        "y": 978.1429405212402,
-        "z": "619b2b0c.b0ac74",
+        "x": 1044.9206466674805,
+        "y": 967.1429405212402,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "aec7db3f.798358",
+        "id": "c38c9ea7.d32c",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 679.7776947021484,
-        "y": 910.6188039779663,
-        "z": "619b2b0c.b0ac74",
+        "x": 685.7776947021484,
+        "y": 899.6188039779663,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "c598159a.7423c8",
-                "e01173d7.fe6b9"
+                "7d17bd6a.99ffe4",
+                "754fd131.c0e1d"
             ]
         ]
     },
     {
-        "id": "c7708172.24701",
+        "id": "cfdfa9d2.e72008",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 683.5554962158203,
-        "y": 1076.9523208141327,
-        "z": "619b2b0c.b0ac74",
+        "x": 689.5554962158203,
+        "y": 1065.9523208141327,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "ee1459dc.d090c8",
-                "640b4312.a9c5ac"
+                "2418184c.a14ab8",
+                "ba1e9ce4.084c2"
             ]
         ]
     },
     {
-        "id": "50af0272.e02a9c",
+        "id": "ae97c0e.69b144",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1202.888786315918,
-        "y": 910.9523277282715,
-        "z": "619b2b0c.b0ac74",
+        "x": 1208.888786315918,
+        "y": 899.9523277282715,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "30507c3b.465aa4",
-                "b4bebf6c.2b4fa",
-                "b3df3a7b.216bd8",
-                "c2db488a.b105a8"
+                "5a51c09f.0dc8a",
+                "dac4a6bf.88b598",
+                "607c6dc9.f58224",
+                "2fee238f.bd0b7c"
             ]
         ]
     },
     {
-        "id": "82048a2c.348118",
+        "id": "3d1afbf1.1b7e64",
         "type": "other",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1172.499984741211,
-        "y": 276.6666679382324,
-        "z": "619b2b0c.b0ac74",
+        "x": 1178.499984741211,
+        "y": 265.6666679382324,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "7a0b5551.c75d9c"
+                "13930049.ada58"
             ]
         ]
     },
     {
-        "id": "7a0b5551.c75d9c",
+        "id": "13930049.ada58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1407.49995803833,
-        "y": 275.6666679382324,
-        "z": "619b2b0c.b0ac74",
+        "x": 1413.49995803833,
+        "y": 264.6666679382324,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "3f52a78f.7ab728"
+                "3daca227.0cf10e"
             ]
         ]
     },
     {
-        "id": "3f52a78f.7ab728",
+        "id": "3daca227.0cf10e",
         "type": "for",
         "name": "for loop i - vpn vf input parameters",
         "xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1638.000015258789,
-        "y": 276.6666679382324,
-        "z": "619b2b0c.b0ac74",
+        "x": 1644.000015258789,
+        "y": 265.6666679382324,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "d37b6b2c.71fb38"
+                "3ad26c2a.a0e034"
             ]
         ]
     },
     {
-        "id": "d37b6b2c.71fb38",
+        "id": "3ad26c2a.a0e034",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1846.5000228881836,
-        "y": 277.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 1852.5000228881836,
+        "y": 266.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "9ec108e6.32a3b8",
-                "a16aa1da.005f3",
-                "3a20c40b.dcc4cc"
+                "163fb823.6cab78",
+                "f1bf47ba.b34c38",
+                "c40dcf.883f423"
             ]
         ]
     },
     {
-        "id": "9ec108e6.32a3b8",
+        "id": "163fb823.6cab78",
         "type": "set",
         "name": "clear tmp-data",
         "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
         "comments": "",
-        "x": 2029.5000228881836,
-        "y": 237.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 2035.5000228881836,
+        "y": 226.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "a16aa1da.005f3",
+        "id": "f1bf47ba.b34c38",
         "type": "set",
         "name": "set tmp-data",
         "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",
         "comments": "",
-        "x": 2024.0000228881836,
-        "y": 277.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 2030.0000228881836,
+        "y": 266.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "3a20c40b.dcc4cc",
+        "id": "c40dcf.883f423",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$tmp.name`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024.0000228881836,
-        "y": 317.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 2030.0000228881836,
+        "y": 306.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "3280408b.66ab3",
-                "63ad3611.30c718",
-                "2eab978e.1492a8"
+                "1fcdbe0d.6c0992",
+                "9406085a.835ae8",
+                "bf4803e4.f6139"
             ]
         ]
     },
     {
-        "id": "d22ab892.eef718",
+        "id": "4dd6857a.0d98dc",
         "type": "switchNode",
         "name": "switch value",
         "xml": "<switch test=\"`$tmp.value`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2484.0001907348633,
-        "y": 269.66669142246246,
-        "z": "619b2b0c.b0ac74",
+        "x": 2490.0001907348633,
+        "y": 258.66669142246246,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "b07f67fa.6ab208"
+                "e0ccccd6.2db1b"
             ]
         ]
     },
     {
-        "id": "2eab978e.1492a8",
+        "id": "bf4803e4.f6139",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2243.500358581543,
-        "y": 335.66667902469635,
-        "z": "619b2b0c.b0ac74",
+        "x": 2249.500358581543,
+        "y": 324.66667902469635,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "5967794c.72e8b8"
+                "a6c05aa9.168a48"
             ]
         ]
     },
     {
-        "id": "5967794c.72e8b8",
+        "id": "a6c05aa9.168a48",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 2418.5003623962402,
-        "y": 334.66667902469635,
-        "z": "619b2b0c.b0ac74",
+        "x": 2424.5003623962402,
+        "y": 323.66667902469635,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "3280408b.66ab3",
+        "id": "1fcdbe0d.6c0992",
         "type": "other",
         "name": "name",
         "xml": "<outcome value='name'>",
         "comments": "",
         "outputs": 1,
-        "x": 2243.500358581543,
-        "y": 219.66667330265045,
-        "z": "619b2b0c.b0ac74",
+        "x": 2249.500358581543,
+        "y": 208.66667330265045,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "d22ab892.eef718"
+                "4dd6857a.0d98dc"
             ]
         ]
     },
     {
-        "id": "63ad3611.30c718",
+        "id": "9406085a.835ae8",
         "type": "other",
         "name": "topology",
         "xml": "<outcome value='topology'>",
         "comments": "",
         "outputs": 1,
-        "x": 2255.500114440918,
-        "y": 273.333335518837,
-        "z": "619b2b0c.b0ac74",
+        "x": 2261.500114440918,
+        "y": 262.333335518837,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "d22ab892.eef718"
+                "4dd6857a.0d98dc"
             ]
         ]
     },
     {
-        "id": "b07f67fa.6ab208",
+        "id": "e0ccccd6.2db1b",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2627.5001907348633,
-        "y": 269.66669142246246,
-        "z": "619b2b0c.b0ac74",
+        "x": 2633.5001907348633,
+        "y": 258.66669142246246,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "3ecabf5c.8d652"
+                "641a1c22.3dabc4"
             ]
         ]
     },
     {
-        "id": "3ecabf5c.8d652",
+        "id": "641a1c22.3dabc4",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 2785.5001907348633,
-        "y": 269.66669142246246,
-        "z": "619b2b0c.b0ac74",
+        "x": 2791.5001907348633,
+        "y": 258.66669142246246,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "b3df3a7b.216bd8",
+        "id": "607c6dc9.f58224",
         "type": "switchNode",
         "name": "switch service-data.vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.3889541625977,
-        "y": 576.9999761581421,
-        "z": "619b2b0c.b0ac74",
+        "x": 1485.3889541625977,
+        "y": 565.9999761581421,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "37913775.d258a8",
-                "8c9e338f.0d83c"
+                "9d62d332.6bdf1",
+                "5cba95a3.c5c61c"
             ]
         ]
     },
     {
-        "id": "37913775.d258a8",
+        "id": "9d62d332.6bdf1",
         "type": "other",
         "name": "outcome Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1748.0000228881836,
-        "y": 556.666711807251,
-        "z": "619b2b0c.b0ac74",
+        "x": 1754.0000228881836,
+        "y": 545.666711807251,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "7c4231f0.9cbb7"
+                "55bf1151.ede2f"
             ]
         ]
     },
     {
-        "id": "7c4231f0.9cbb7",
+        "id": "55bf1151.ede2f",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1924.0000228881836,
-        "y": 557.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1930.0000228881836,
+        "y": 546.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "8c9e338f.0d83c",
+        "id": "5cba95a3.c5c61c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1726.5000228881836,
-        "y": 597.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1732.5000228881836,
+        "y": 586.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "b6f61e8c.9dd35"
+                "b3715a78.6bb228"
             ]
         ]
     },
     {
-        "id": "b6f61e8c.9dd35",
+        "id": "b3715a78.6bb228",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1887.5000228881836,
-        "y": 597.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1893.5000228881836,
+        "y": 586.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "9317c153.6ccad",
-                "bdedbaa4.65e588"
+                "c872064f.ab0aa8",
+                "16b4cc33.475d44"
             ]
         ]
     },
     {
-        "id": "9317c153.6ccad",
+        "id": "c872064f.ab0aa8",
         "type": "for",
         "name": "for nidx..service-data.vf-modules.vf-module[]",
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2150.0000228881836,
-        "y": 577.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2156.0000228881836,
+        "y": 566.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "1fade275.78b10e"
+                "88526fe7.19ca5"
             ]
         ]
     },
     {
-        "id": "1fade275.78b10e",
+        "id": "88526fe7.19ca5",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2436.0000228881836,
-        "y": 577.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2442.0000228881836,
+        "y": 566.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "99a1d82a.9dd8c8"
+                "100a52a1.442c1d"
             ]
         ]
     },
     {
-        "id": "99a1d82a.9dd8c8",
+        "id": "100a52a1.442c1d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606.5000228881836,
-        "y": 577.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2612.5000228881836,
+        "y": 566.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "39ae6a67.1c8296"
+                "8d9c0c99.1bdcb"
             ]
         ]
     },
     {
-        "id": "70e3cfee.6e895",
+        "id": "7051b5d0.a337bc",
         "type": "set",
-        "name": "set tmp.nidx and ctx.network-data",
-        "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",
+        "name": "set tmp.vidx and ctx.network-data",
+        "xml": "<set>\n<parameter name='tmp.vidx' 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",
         "comments": "",
-        "x": 3007.50008392334,
-        "y": 574.6667140722275,
-        "z": "619b2b0c.b0ac74",
+        "x": 3013.50008392334,
+        "y": 563.6667140722275,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "1412cffb.8d463",
+        "id": "683dee11.6434b",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 2364.0000228881836,
-        "y": 617.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2370.0000228881836,
+        "y": 606.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "fbeeeb3e.43c3b8",
+        "id": "67a62d00.2d4ff4",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2226.5000228881836,
-        "y": 617.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2232.5000228881836,
+        "y": 606.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "1412cffb.8d463"
+                "683dee11.6434b"
             ]
         ]
     },
     {
-        "id": "bdedbaa4.65e588",
+        "id": "16b4cc33.475d44",
         "type": "switchNode",
-        "name": "switch tmp.nidx ",
-        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+        "name": "switch tmp.vidx ",
+        "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2072.5000228881836,
-        "y": 617.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 2078.5000228881836,
+        "y": 606.6666707992554,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "fbeeeb3e.43c3b8"
+                "67a62d00.2d4ff4"
             ]
         ]
     },
     {
-        "id": "57bd5824.2497c8",
+        "id": "befd23a0.20fa9",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
-        "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",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1451.6667098999023,
-        "y": 656.5555486679077,
-        "z": "619b2b0c.b0ac74",
+        "x": 1457.6667098999023,
+        "y": 645.5555486679077,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "719dd138.28ef4",
-                "2dca8a18.a65586"
+                "f546c4ba.29b768",
+                "ad8d6fcc.bfcca"
             ]
         ]
     },
     {
-        "id": "719dd138.28ef4",
+        "id": "f546c4ba.29b768",
         "type": "outcome",
         "name": "outcome Created",
         "xml": "<outcome value='Created'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1748.5001258850098,
-        "y": 656.5555467605591,
-        "z": "619b2b0c.b0ac74",
+        "x": 1754.5001258850098,
+        "y": 645.5555467605591,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "94e9cf1a.6c399"
+                "72634f47.0cc42"
             ]
         ]
     },
     {
-        "id": "2dca8a18.a65586",
+        "id": "ad8d6fcc.bfcca",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1716.5001258850098,
-        "y": 696.5555467605591,
-        "z": "619b2b0c.b0ac74",
+        "x": 1722.5001258850098,
+        "y": 685.5555467605591,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "2c8432e2.7a0b8e"
+                "28f836e1.3e6b7a"
             ]
         ]
     },
     {
-        "id": "2c8432e2.7a0b8e",
+        "id": "28f836e1.3e6b7a",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1874.0001258850098,
-        "y": 696.5555467605591,
-        "z": "619b2b0c.b0ac74",
+        "x": 1880.0001258850098,
+        "y": 685.5555467605591,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "b4bebf6c.2b4fa",
+        "id": "dac4a6bf.88b598",
         "type": "switchNode",
         "name": "switch vf-module-id",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398.5000228881836,
-        "y": 517.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1404.5000228881836,
+        "y": 506.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "9ad9b806.2c19b8"
+                "a7ac2cab.79df8"
             ]
         ]
     },
     {
-        "id": "9ad9b806.2c19b8",
+        "id": "a7ac2cab.79df8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1626.5000228881836,
-        "y": 517.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1632.5000228881836,
+        "y": 506.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "b7b28733.f37c08"
+                "b2c9eb9f.8ff438"
             ]
         ]
     },
     {
-        "id": "b7b28733.f37c08",
+        "id": "b2c9eb9f.8ff438",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1764.0000228881836,
-        "y": 517.6666707992554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1770.0000228881836,
+        "y": 506.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "30507c3b.465aa4",
+        "id": "5a51c09f.0dc8a",
         "type": "execute",
         "name": "execute requiredParameters",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1433.0000228881836,
-        "y": 477.66667079925537,
-        "z": "619b2b0c.b0ac74",
+        "x": 1439.0000228881836,
+        "y": 466.66667079925537,
+        "z": "87aefe66.c6e82",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2db488a.b105a8",
+        "id": "2fee238f.bd0b7c",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
-        "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",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.8332748413086,
-        "y": 906.5555257797241,
-        "z": "619b2b0c.b0ac74",
+        "x": 1481.8332214355469,
+        "y": 895.555570602417,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "cf4b307b.b1b04",
-                "acc49742.fd0df8"
+                "cdf8dd70.c0108",
+                "2de75da0.b5bd52"
             ]
         ]
     },
     {
-        "id": "cf4b307b.b1b04",
+        "id": "cdf8dd70.c0108",
         "type": "outcome",
         "name": "outcome Active",
         "xml": "<outcome value='Active'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753.166648864746,
-        "y": 880.9999837875366,
-        "z": "619b2b0c.b0ac74",
+        "x": 1759.166648864746,
+        "y": 869.9999837875366,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "e31a54a2.3ff1f8"
+                "e027e573.24bd48"
             ]
         ]
     },
     {
-        "id": "acc49742.fd0df8",
+        "id": "2de75da0.b5bd52",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1723.166648864746,
-        "y": 920.9999837875366,
-        "z": "619b2b0c.b0ac74",
+        "x": 1729.166648864746,
+        "y": 909.9999837875366,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "bc3125bf.c135a8"
+                "4744b74f.6f4a88"
             ]
         ]
     },
     {
-        "id": "bc3125bf.c135a8",
+        "id": "4744b74f.6f4a88",
         "type": "returnFailure",
         "name": "return failure",
         "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    ",
         "comments": "",
-        "x": 1889.166648864746,
-        "y": 922.9999837875366,
-        "z": "619b2b0c.b0ac74",
+        "x": 1895.166648864746,
+        "y": 911.9999837875366,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "eb92e3d.8a6ff2",
+        "id": "5f5b8df.a6d8d74",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
-        "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",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1468.7221908569336,
-        "y": 1077.6666097640991,
-        "z": "619b2b0c.b0ac74",
+        "x": 1474.7221908569336,
+        "y": 1066.6666097640991,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "4005e1e5.db606",
-                "3f0b16e4.30f1ca"
+                "e0e44b44.c9e6c8",
+                "fa9a403f.1ce7e"
             ]
         ]
     },
     {
-        "id": "4005e1e5.db606",
+        "id": "e0e44b44.c9e6c8",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1768.7222518920898,
-        "y": 1045.444405555725,
-        "z": "619b2b0c.b0ac74",
+        "x": 1774.7222518920898,
+        "y": 1034.444405555725,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "e99f233c.ef676"
+                "21ef3568.35bd5a"
             ]
         ]
     },
     {
-        "id": "3f0b16e4.30f1ca",
+        "id": "fa9a403f.1ce7e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1712.055564880371,
-        "y": 1092.1110677719116,
-        "z": "619b2b0c.b0ac74",
+        "x": 1718.055564880371,
+        "y": 1081.1110677719116,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "26e244b4.b2362c"
+                "2bc6f464.461d3c"
             ]
         ]
     },
     {
-        "id": "26e244b4.b2362c",
+        "id": "2bc6f464.461d3c",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1878.055564880371,
-        "y": 1094.1110677719116,
-        "z": "619b2b0c.b0ac74",
+        "x": 1884.055564880371,
+        "y": 1083.1110677719116,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "94e9cf1a.6c399",
+        "id": "72634f47.0cc42",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1940.5001029968262,
-        "y": 657.6666488647461,
-        "z": "619b2b0c.b0ac74",
+        "x": 1946.5001029968262,
+        "y": 646.6666488647461,
+        "z": "87aefe66.c6e82",
         "wires": [
             []
         ]
     },
     {
-        "id": "e31a54a2.3ff1f8",
+        "id": "e027e573.24bd48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1953.1665267944336,
-        "y": 879.1481161117554,
-        "z": "619b2b0c.b0ac74",
+        "x": 1959.1665267944336,
+        "y": 868.1481161117554,
+        "z": "87aefe66.c6e82",
         "wires": [
             []
         ]
     },
     {
-        "id": "e99f233c.ef676",
+        "id": "21ef3568.35bd5a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1984.277732849121,
-        "y": 1045.8147420883179,
-        "z": "619b2b0c.b0ac74",
+        "x": 1990.277732849121,
+        "y": 1034.8147420883179,
+        "z": "87aefe66.c6e82",
         "wires": [
             []
         ]
     },
     {
-        "id": "39ae6a67.1c8296",
+        "id": "8d9c0c99.1bdcb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2756.666534423828,
-        "y": 574.0000190734863,
-        "z": "619b2b0c.b0ac74",
+        "x": 2762.666534423828,
+        "y": 563.0000190734863,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "70e3cfee.6e895"
+                "7051b5d0.a337bc"
             ]
         ]
     },
     {
-        "id": "bc20a4d8.66ea78",
+        "id": "26ecbd16.18b922",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.0065307617188,
-        "y": 121.24849605560303,
-        "z": "619b2b0c.b0ac74",
+        "x": 977.0065307617188,
+        "y": 110.24849605560303,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "ae64d058.26533"
+                "a795521a.23d6f"
             ]
         ]
     },
     {
-        "id": "ae64d058.26533",
+        "id": "a795521a.23d6f",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1151.0065116882324,
-        "y": 120.24848556518555,
-        "z": "619b2b0c.b0ac74",
+        "x": 1157.0065116882324,
+        "y": 109.24848556518555,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "d4c5df8d.2e7e3"
+                "3e0e877f.b04338"
             ]
         ]
     },
     {
-        "id": "d4c5df8d.2e7e3",
+        "id": "3e0e877f.b04338",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1300.4352378845215,
-        "y": 121.39140319824219,
-        "z": "619b2b0c.b0ac74",
+        "x": 1306.4352378845215,
+        "y": 110.39140319824219,
+        "z": "87aefe66.c6e82",
         "wires": []
     },
     {
-        "id": "376a189c.5eea28",
+        "id": "f0d7fed2.a7f6e",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 951.0379104614258,
-        "y": 183.51763439178467,
-        "z": "619b2b0c.b0ac74",
+        "x": 957.0379104614258,
+        "y": 172.51763439178467,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "891fced5.d7d06"
+                "c781186.35a6de8"
             ]
         ]
     },
     {
-        "id": "891fced5.d7d06",
+        "id": "c781186.35a6de8",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.0065269470215,
-        "y": 183.2484917640686,
-        "z": "619b2b0c.b0ac74",
+        "x": 1195.0065269470215,
+        "y": 172.2484917640686,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "2828372d.9354b8"
+                "3c97bff.ca0c74"
             ]
         ]
     },
     {
-        "id": "2828372d.9354b8",
+        "id": "3c97bff.ca0c74",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1404.0065116882324,
-        "y": 181.24848556518555,
-        "z": "619b2b0c.b0ac74",
+        "x": 1410.0065116882324,
+        "y": 170.24848556518555,
+        "z": "87aefe66.c6e82",
         "wires": [
             [
-                "56c573f0.8eef8c"
+                "daf74faa.b14cc"
             ]
         ]
     },
     {
-        "id": "56c573f0.8eef8c",
+        "id": "daf74faa.b14cc",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1568.0065116882324,
-        "y": 176.24848556518555,
-        "z": "619b2b0c.b0ac74",
+        "x": 1574.0065116882324,
+        "y": 165.24848556518555,
+        "z": "87aefe66.c6e82",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml
index 8e93f1a5..40477c38 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml
@@ -82,6 +82,7 @@
                     </return>
                 </outcome>
             </execute>
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`" />
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
@@ -115,24 +116,17 @@
                 <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
             </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='tenant-id' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.tenant-id`' />
+                <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='vpn-id' />
+                <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.vpn-id`' />
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />
+                <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_length' value='`$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 + 1`' />
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].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.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
+                <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.`' />
+                <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.`' />
+                <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.`' />
+                <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.`' />
             </set>
             <set>
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
@@ -154,9 +148,9 @@
  + '/service-data/service-topology/'`"/>
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
+                <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' />
+                <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`' />
+                <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`' />
             </set>
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 
       key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
index f352d1d3..3e5e8d90 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
@@ -128,9 +128,7 @@
                 <parameter name='sdwan-vpn-name' value='`$prop.name`' />
                 <parameter name='topology' value='`$prop.topology`' />
                 <parameter name='operational-status' value='Created' />
-                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
-                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' /><parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' /><parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' >
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
@@ -140,9 +138,6 @@
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="sdwan-vpn.id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vpn-vf-index`" />
-                <!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' 
-      key='site-resource.site-resource-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
-      force="true" pfx="tmp.AnAI-data"><parameter name="relationship-list.relationship[0].related-to" value="sdwan-site" /><parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-sites/sdwan-site/' + $prop.site-vf-index`" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="sdwan-vpn.id" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.site-vf-index`" /-->
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
@@ -151,4 +146,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
index f28d9c23..b41efbc0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
@@ -37,13 +37,6 @@
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.tenant-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
                 </block>
             </for>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
@@ -125,10 +118,10 @@
                 <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
             </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
+                <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.`' />
+                <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.`' />
+                <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.`' />
+                <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.`' />
             </set>
             <set>
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
@@ -150,9 +143,9 @@
  + '/service-data/service-topology/'`"/>
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
+                <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='PendingDelete' />
+                <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`' />
+                <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`' />
             </set>
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 
       key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
index de558b80..29b26cd9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
@@ -122,14 +122,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -141,7 +141,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <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`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='Created'>
                                         <block atomic="true"></block>
                                     </outcome>
@@ -195,14 +195,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -214,7 +214,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <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`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='Active'>
                                         <block atomic="true"></block>
                                     </outcome>
@@ -268,14 +268,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -287,7 +287,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <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`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='PendingDelete'>
                                         <block atomic="true"></block>
                                     </outcome>