diff --git a/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml b/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml
new file mode 100755
index 0000000..18d20ed
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml
@@ -0,0 +1,10 @@
+---
+- hosts: all
+  tasks:
+  - name: check jq is not installed
+    stat:
+      path: /usr/bin/jq
+    register: abc
+  - fail:
+      msg: "jq is not installed"
+    when: abc.stat.exists == false
diff --git a/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml b/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml
new file mode 100755
index 0000000..0047080
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml
@@ -0,0 +1,10 @@
+---
+- hosts: all
+  tasks:
+  - name: check jq is not installed
+    stat:
+      path: /usr/bin/jq
+    register: abc
+  - fail:
+      msg: "jq is already installed"
+    when: abc.stat.exists == true
diff --git a/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml b/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml
new file mode 100755
index 0000000..000bc48
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml
@@ -0,0 +1,6 @@
+---
+- hosts: all
+  tasks:
+  - name: Set vG to vG-MUX interface down
+    shell: vppctl set int state GigabitEthernet0/4/0 down 
+    become: true
diff --git a/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml b/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml
new file mode 100755
index 0000000..32ebfc9
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml
@@ -0,0 +1,6 @@
+---
+- hosts: all
+  tasks:
+  - name: Set vG to vG-MUX interface up
+    shell: vppctl set int state GigabitEthernet0/4/0 up 
+    become: true
diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml b/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml
new file mode 100755
index 0000000..ec1d2de
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml
@@ -0,0 +1,9 @@
+---
+- hosts: all
+  tasks:
+  - name: install jq package
+    apt:
+      name: jq
+      state: latest
+      update_cache: yes
+    become: true
diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml b/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml
new file mode 100755
index 0000000..c5be633
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml
@@ -0,0 +1,9 @@
+---
+- hosts: all
+  tasks:
+  - name: remove jq package
+    apt:
+      name: jq
+      state: absent
+      update_cache: yes
+    become: true
diff --git a/installation/sdnc/src/main/resources/ipam.data.dump b/installation/sdnc/src/main/resources/ipam.data.dump
index 7371077..934fdc9 100644
--- a/installation/sdnc/src/main/resources/ipam.data.dump
+++ b/installation/sdnc/src/main/resources/ipam.data.dump
@@ -40,7 +40,7 @@
 
 LOCK TABLES `IPAM_IP_POOL` WRITE;
 /*!40000 ALTER TABLE `IPAM_IP_POOL` DISABLE KEYS */;
-INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.0.0/8',4,'ACTIVE','IP Pool for ONAP - general purpose'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','IP Pool for unprotected network - vFW use case'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','IP Pool for protected network - vFW use case');
+INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.0.0/8',4,'ACTIVE','private'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','unprotected'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','protected');
 /*!40000 ALTER TABLE `IPAM_IP_POOL` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -85,4 +85,4 @@
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2018-08-24 13:02:09
\ No newline at end of file
+-- Dump completed on 2018-08-24 13:02:09
diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index 7cd9064..3c6920e 100644
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -9,6 +9,9 @@
 lcm.upgrade-pre-check.playbookname=ansible_precheck
 lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
+lcm.pnf.upgrade-pre-check.playbookname=ansible_precheck_pnf
+lcm.pnf.upgrade-post-check.playbookname=ansible_postcheck_pnf
+lcm.pnf.upgrade-software.playbookname=ansible_upgradesw_pnf
 lcm.quiesce-traffic.playbookname=ansible_quiescetraffic
 lcm.resume-traffic.playbookname=ansible_resumetraffic
 lcm.distribute-traffic.playbookname=ansible_distributetraffic
diff --git a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
index a68422e..bbeb5c1 100644
--- a/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
+++ b/platform-logic/datachange/src/main/json/DataChange_data-change-notification.json
@@ -1,169 +1,248 @@
 [
     {
-        "id": "14de9b29.eb77a5",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 116.00390625,
-        "y": 67.9999988079071,
-        "z": "bf7c0729.dcd628",
+        "id": "2abb63ad.3df404", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 97, 
+        "y": 89, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "1630f686.0be599"
+                "cec5984a.941728"
             ]
         ]
-    },
+    }, 
     {
-        "id": "1630f686.0be599",
-        "type": "service-logic",
-        "name": "DataChange ${project.version}",
-        "module": "DataChange",
-        "version": "${project.version}",
-        "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='DataChange' version='${project.version}'>",
-        "outputs": 1,
-        "x": 302.1150550842285,
-        "y": 172.44447016716003,
-        "z": "bf7c0729.dcd628",
+        "id": "cec5984a.941728", 
+        "type": "service-logic", 
+        "name": "DataChange ${project.version}", 
+        "module": "DataChange", 
+        "version": "${project.version}", 
+        "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='DataChange' version='${project.version}'>", 
+        "outputs": 1, 
+        "x": 283.1111488342285, 
+        "y": 193.44447135925293, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "8b5ae719.a8f008"
+                "6f601264.f5fb8c"
             ]
         ]
-    },
+    }, 
     {
-        "id": "8b5ae719.a8f008",
-        "type": "method",
-        "name": "method data-change-notification",
-        "xml": "<method rpc='data-change-notification' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 299.5596046447754,
-        "y": 336.22225546836853,
-        "z": "bf7c0729.dcd628",
+        "id": "6f601264.f5fb8c", 
+        "type": "method", 
+        "name": "method data-change-notification", 
+        "xml": "<method rpc='data-change-notification' mode='sync'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 280.5556983947754, 
+        "y": 357.2222566604614, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "d99c1956.418f78"
+                "b8bb57bd.6c8f88"
             ]
         ]
-    },
+    }, 
     {
-        "id": "d99c1956.418f78",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 344.7818908691406,
-        "y": 451.1113257408142,
-        "z": "bf7c0729.dcd628",
+        "id": "b8bb57bd.6c8f88", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 325.7779846191406, 
+        "y": 472.1113269329071, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "fa034db9.8bac4",
-                "1981ae.01d4be53"
+                "97cb17d6.992f9", 
+                "3b4bb8da.ca8bd8"
             ]
         ]
-    },
+    }, 
     {
-        "id": "fa034db9.8bac4",
-        "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": 552.3377494812012,
-        "y": 538.5561301708221,
-        "z": "bf7c0729.dcd628",
-        "wires": []
-    },
+        "id": "97cb17d6.992f9", 
+        "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": 533.3338432312012, 
+        "y": 559.556131362915, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [ ]
+    }, 
     {
-        "id": "560d6ca1.0b4dd4",
-        "type": "call",
-        "name": "call esr-thirdparty-sdnc",
-        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1316.3379707336426,
-        "y": 346.66678977012634,
-        "z": "bf7c0729.dcd628",
+        "id": "c1961812.103ba", 
+        "type": "call", 
+        "name": "call esr-thirdparty-sdnc", 
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1454.3341064453125, 
+        "y": 336.6667785644531, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
-            []
+            [ ]
         ]
-    },
+    }, 
     {
-        "id": "1981ae.01d4be53",
-        "type": "switchNode",
-        "name": "switch aai-node-type",
-        "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 555.8866271972656,
-        "y": 414.88262701034546,
-        "z": "bf7c0729.dcd628",
+        "id": "3b4bb8da.ca8bd8", 
+        "type": "switchNode", 
+        "name": "switch aai-node-type", 
+        "xml": "<switch test='`$data-change-notification-input.aai-node-type`'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 536.8827209472656, 
+        "y": 435.88262820243835, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "3eac43c0.8ab16c",
-                "935a0267.cd419"
+                "8187ec02.edc438", 
+                "e44a9744.783fc8"
             ]
         ]
-    },
+    }, 
     {
-        "id": "3eac43c0.8ab16c",
-        "type": "other",
-        "name": "esr-thirdparty-sdnc",
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 837.9185485839844,
-        "y": 346.05725717544556,
-        "z": "bf7c0729.dcd628",
+        "id": "8187ec02.edc438", 
+        "type": "other", 
+        "name": "esr-thirdparty-sdnc", 
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 711.9146728515625, 
+        "y": 194.0572509765625, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "43f3171.d9a25e8"
+                "b5d44440.30e84"
             ]
         ]
-    },
+    }, 
     {
-        "id": "935a0267.cd419",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 795.8866920471191,
-        "y": 413.8826596736908,
-        "z": "bf7c0729.dcd628",
+        "id": "e44a9744.783fc8", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 776.8827857971191, 
+        "y": 434.8826608657837, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "b093dd51.fe287"
+                "62e87f0f.63e3e"
             ]
         ]
-    },
+    }, 
     {
-        "id": "b093dd51.fe287",
-        "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=\"AAI node type not supported\" />",
-        "comments": "",
-        "x": 951.3312110900879,
-        "y": 413.99375891685486,
-        "z": "bf7c0729.dcd628",
-        "wires": []
-    },
+        "id": "62e87f0f.63e3e", 
+        "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=\"AAI node type not supported\" />", 
+        "comments": "", 
+        "x": 932.3273048400879, 
+        "y": 434.99376010894775, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [ ]
+    }, 
     {
-        "id": "43f3171.d9a25e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1040.0042114257812,
-        "y": 346.8262984752655,
-        "z": "bf7c0729.dcd628",
+        "id": "9f25a183.327f8", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1358.000244140625, 
+        "y": 252.8262939453125, 
+        "z": "bbab5cc4.c9cbd", 
         "wires": [
             [
-                "560d6ca1.0b4dd4"
+                "c1961812.103ba"
+            ]
+        ]
+    }, 
+    {
+        "id": "b5d44440.30e84", 
+        "type": "for", 
+        "name": "for", 
+        "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 899, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "b63e0c35.6e5668"
+            ]
+        ]
+    }, 
+    {
+        "id": "b63e0c35.6e5668", 
+        "type": "switchNode", 
+        "name": "switch", 
+        "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`\">\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1039, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "4a9c78f7.44a98", 
+                "ed07b87c.5778b8"
+            ]
+        ]
+    }, 
+    {
+        "id": "14dce58a.e0a96a", 
+        "type": "call", 
+        "name": "call", 
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1342, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [ ]
+        ]
+    }, 
+    {
+        "id": "4a9c78f7.44a98", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1193, 
+        "y": 194, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "14dce58a.e0a96a"
+            ]
+        ]
+    }, 
+    {
+        "id": "ed07b87c.5778b8", 
+        "type": "outcomeFalse", 
+        "name": "false", 
+        "xml": "<outcome value='false'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1193, 
+        "y": 253, 
+        "z": "bbab5cc4.c9cbd", 
+        "wires": [
+            [
+                "9f25a183.327f8"
             ]
         ]
     }
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index 426b856..ccc0c00 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,246 +1,246 @@
 [
   {
-    "id": "e714f114.a841a",
+    "id": "3492b641.0dfbba",
     "type": "other",
     "name": "update",
     "xml": "<outcome value='Update'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 674.5000419616699,
-    "y": 205.66669845581055,
-    "z": "f60ccc0b.2e9e5",
+    "x": 673,
+    "y": 276.6667003631592,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "412d4a4c.5ea2f4"
+        "f2d65f4a.d687"
       ]
     ]
   },
   {
-    "id": "47ba392d.437028",
+    "id": "668a1af1.719b34",
     "type": "other",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 702.7222175598145,
-    "y": 477.3335008621216,
-    "z": "f60ccc0b.2e9e5",
+    "x": 709.2221145629883,
+    "y": 478.33349609375,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e84e5704.965b68"
+        "3b8ddbef.903fa4"
       ]
     ]
   },
   {
-    "id": "e84e5704.965b68",
+    "id": "3b8ddbef.903fa4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 858.1668968200684,
-    "y": 477.33352184295654,
-    "z": "f60ccc0b.2e9e5",
+    "x": 859.6667594909668,
+    "y": 473.3335485458374,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e6b6675.fc5a18",
+    "id": "c0cbee48.6a5f9",
     "type": "comment",
     "name": "TODO: Delete topology from AAI",
     "info": "",
     "comments": "",
-    "x": 782.8334770202637,
-    "y": 440.0001859664917,
-    "z": "f60ccc0b.2e9e5",
+    "x": 817.3334274291992,
+    "y": 429.0001735687256,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "bf8e19f1.7f5908",
+    "id": "d3c03070.16287",
     "type": "switchNode",
     "name": "switch aai-event-trigger",
     "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 459.05566787719727,
-    "y": 344.2222309112549,
-    "z": "f60ccc0b.2e9e5",
+    "x": 465.5555648803711,
+    "y": 345.2222261428833,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e714f114.a841a",
-        "47ba392d.437028"
+        "3492b641.0dfbba",
+        "668a1af1.719b34"
       ]
     ]
   },
   {
-    "id": "412d4a4c.5ea2f4",
+    "id": "6bfaf616.869108",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 842.8338432312012,
-    "y": 204.11124992370605,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1267.333755493164,
+    "y": 270.1112537384033,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "52b0fb73.694034",
-        "b992a9e2.abb498"
+        "c706e157.72486",
+        "4130ca8.c1efa34"
       ]
     ]
   },
   {
-    "id": "bf4a7e8b.e2772",
+    "id": "f4c114b8.d66028",
     "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.openecomp.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": 1120.4932975769043,
-    "y": 160.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1523.993263244629,
+    "y": 132.0305051803589,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "cbcc146a.b18a48",
-        "934e7ef4.942bd"
+        "fafa0167.57f14",
+        "c8836a7f.1ba7f8"
       ]
     ]
   },
   {
-    "id": "cbcc146a.b18a48",
+    "id": "fafa0167.57f14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1355.4932975769043,
-    "y": 138.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1758.993263244629,
+    "y": 110.03050518035889,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9ebe20af.228e5"
+        "bd59ffd7.cdf9"
       ]
     ]
   },
   {
-    "id": "934e7ef4.942bd",
+    "id": "c8836a7f.1ba7f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1347.7432975769043,
-    "y": 191.67338800430298,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1751.243263244629,
+    "y": 163.67338848114014,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "fe461c21.f9128"
+        "8505bfec.1c327"
       ]
     ]
   },
   {
-    "id": "9ebe20af.228e5",
+    "id": "bd59ffd7.cdf9",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1509.4932975769043,
-    "y": 139.03050470352173,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1912.993263244629,
+    "y": 111.03050518035889,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "52b0fb73.694034",
+    "id": "c706e157.72486",
     "type": "execute",
     "name": "execute RestApiCallNode Get Topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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": 1123.8267250061035,
-    "y": 253.73424243927002,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1527.3266906738281,
+    "y": 225.73424291610718,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "bf8dd5a2.3ec108",
-        "4e2f04da.b5496c"
+        "87479d00.dc1c9",
+        "c2d07026.26d52"
       ]
     ]
   },
   {
-    "id": "bf8dd5a2.3ec108",
+    "id": "87479d00.dc1c9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1382.3820571899414,
-    "y": 231.734224319458,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1785.882022857666,
+    "y": 203.73422479629517,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9692e7a9.a7ad78"
+        "3aa58504.f6229a"
       ]
     ]
   },
   {
-    "id": "9692e7a9.a7ad78",
+    "id": "3aa58504.f6229a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1557.937587738037,
-    "y": 229.40094661712646,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1961.4375534057617,
+    "y": 201.40094709396362,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "1548c97d.137267",
+    "id": "dca7d6ac.f501f8",
     "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 Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1566.1598625183105,
-    "y": 303.62306022644043,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1969.6598281860352,
+    "y": 275.6230607032776,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "4e2f04da.b5496c",
+    "id": "c2d07026.26d52",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1387.8265419006348,
-    "y": 302.84528970718384,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1791.3265075683594,
+    "y": 274.845290184021,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "1548c97d.137267"
+        "dca7d6ac.f501f8"
       ]
     ]
   },
   {
-    "id": "773b4a80.972f64",
+    "id": "7cae77af.f5b818",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 99.50000381469727,
-    "y": 84.00000476837158,
-    "z": "f60ccc0b.2e9e5",
+    "x": 105.9999008178711,
+    "y": 85,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6b3bf10f.0a471"
+        "b697d007.11e41"
       ]
     ]
   },
   {
-    "id": "6b3bf10f.0a471",
+    "id": "b697d007.11e41",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -248,131 +248,208 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 237.6111297607422,
-    "y": 125.44446611404419,
-    "z": "f60ccc0b.2e9e5",
+    "x": 244.11102676391602,
+    "y": 126.44446134567261,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "34347376.ce668c"
+        "49de6de0.6f78a4"
       ]
     ]
   },
   {
-    "id": "34347376.ce668c",
+    "id": "49de6de0.6f78a4",
     "type": "method",
     "name": "method esr-thirdparty-sdnc-discovery",
     "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 334.05569076538086,
-    "y": 236.22224712371826,
-    "z": "f60ccc0b.2e9e5",
+    "x": 340.5555877685547,
+    "y": 237.22224235534668,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "1ded1b72.af18c5"
+        "5f1e0612.f09808"
       ]
     ]
   },
   {
-    "id": "1ded1b72.af18c5",
+    "id": "5f1e0612.f09808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 242.2779197692871,
-    "y": 345.1112251281738,
-    "z": "f60ccc0b.2e9e5",
+    "x": 248.77781677246094,
+    "y": 346.11122035980225,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "bf8e19f1.7f5908"
+        "d3c03070.16287"
       ]
     ]
   },
   {
-    "id": "b992a9e2.abb498",
+    "id": "4130ca8.c1efa34",
     "type": "for",
     "name": "for each Network",
     "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1055.9814949035645,
-    "y": 381.22218132019043,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1459.481460571289,
+    "y": 353.2221817970276,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "d00ff672.d0b048"
+        "5ae402a2.fe5ffc"
       ]
     ]
   },
   {
-    "id": "d00ff672.d0b048",
+    "id": "5ae402a2.fe5ffc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1245.9814567565918,
-    "y": 388.99997425079346,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1649.4814224243164,
+    "y": 360.9999747276306,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ba2cdcd.67eab2",
-        "b9e492ff.96a56"
+        "7d9ae4c3.21708c",
+        "f67aa4a3.311fc8"
       ]
     ]
   },
   {
-    "id": "ba2cdcd.67eab2",
+    "id": "7d9ae4c3.21708c",
     "type": "call",
     "name": "call update-network-to-aai",
     "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1499.3148784637451,
-    "y": 452.3333444595337,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1902.8148441314697,
+    "y": 424.33334493637085,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "b9e492ff.96a56",
+    "id": "f67aa4a3.311fc8",
     "type": "set",
     "name": "set network",
     "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 1451.5369987487793,
-    "y": 370.1110887527466,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1855.036964416504,
+    "y": 342.11108922958374,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "fe461c21.f9128",
+    "id": "8505bfec.1c327",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1509.3146934509277,
-    "y": 186.77776718139648,
-    "z": "f60ccc0b.2e9e5",
+    "x": 1912.8146591186523,
+    "y": 158.77776765823364,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "12e3cffc.36ff4",
+    "id": "27eaeed1.46c512",
     "type": "comment",
     "name": "Do Nothing",
     "info": "",
     "comments": "",
-    "x": 1644.8702672322588,
-    "y": 185.66664293077258,
-    "z": "f60ccc0b.2e9e5",
+    "x": 2048.3702328999834,
+    "y": 157.66664340760974,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "416dcc31.e9a444",
+    "type": "switchNode",
+    "name": "switch type",
+    "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 948.0001487731934,
+    "y": 279.00003147125244,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "7de88c94.fa0ca4",
+        "8ee217f7.3b1bd8"
+      ]
+    ]
+  },
+  {
+    "id": "f2d65f4a.d687",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 802.9999847412109,
+    "y": 277.00002002716064,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "416dcc31.e9a444"
+      ]
+    ]
+  },
+  {
+    "id": "7de88c94.fa0ca4",
+    "type": "other",
+    "name": "SOTN",
+    "xml": "<outcome value='SOTN'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1101.9999313354492,
+    "y": 235.00000190734863,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "6bfaf616.869108"
+      ]
+    ]
+  },
+  {
+    "id": "8ee217f7.3b1bd8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1098.9999313354492,
+    "y": 359.00000953674316,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "c0794a5f.727638"
+      ]
+    ]
+  },
+  {
+    "id": "c0794a5f.727638",
+    "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+    "comments": "",
+    "x": 1247.7726364135742,
+    "y": 358.43917751312256,
+    "z": "cbb28df7.1359",
     "wires": []
   }
 ]
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
new file mode 100644
index 0000000..0e93be6
--- /dev/null
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-of-zte.json
@@ -0,0 +1,48 @@
+[
+    {
+        "id": "c4dfa871.acfb38", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 131, 
+        "y": 100, 
+        "z": "b1682cba.152", 
+        "wires": [
+            [
+                "b06bc6e2.9ba258"
+            ]
+        ]
+    }, 
+    {
+        "id": "b06bc6e2.9ba258", 
+        "type": "service-logic", 
+        "name": "DataChange ${project.version}", 
+        "module": "DataChange", 
+        "version": "${project.version}", 
+        "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='DataChange' version='${project.version}'>", 
+        "outputs": 1, 
+        "x": 275, 
+        "y": 213, 
+        "z": "b1682cba.152", 
+        "wires": [
+            [
+                "94182378.e4944"
+            ]
+        ]
+    }, 
+    {
+        "id": "94182378.e4944", 
+        "type": "method", 
+        "name": "method esr-thirdparty-sdnc-of-zte", 
+        "xml": "<method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 200, 
+        "y": 327, 
+        "z": "b1682cba.152", 
+        "wires": [
+            [ ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
index 94cd265..2f759b4 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "3645100d.93b1e",
+    "id": "49a378ca.1b3478",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 131,
-    "y": 57,
-    "z": "f5f8cf31.a0ec1",
+    "x": 121,
+    "y": 56,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "a67dda3b.aa6388"
+        "b3ec7247.15b52"
       ]
     ]
   },
   {
-    "id": "a67dda3b.aa6388",
+    "id": "b3ec7247.15b52",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,343 +22,431 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 317.1111488342285,
-    "y": 161.44447135925293,
-    "z": "f5f8cf31.a0ec1",
+    "x": 307.1111488342285,
+    "y": 160.44447135925293,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "fc54766d.ffb9e8"
+        "7535c6a7.f3b5e8"
       ]
     ]
   },
   {
-    "id": "fc54766d.ffb9e8",
+    "id": "7535c6a7.f3b5e8",
     "type": "method",
     "name": "method esr-thirdparty-sdnc",
     "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 314.5556983947754,
-    "y": 325.2222566604614,
-    "z": "f5f8cf31.a0ec1",
+    "x": 304.5556983947754,
+    "y": 324.2222566604614,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "e6c2b0ea.17014"
+        "1400578.235a6a9"
       ]
     ]
   },
   {
-    "id": "e6c2b0ea.17014",
+    "id": "1400578.235a6a9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 269.7779655456543,
-    "y": 460.1113119125366,
-    "z": "f5f8cf31.a0ec1",
+    "x": 259.7779655456543,
+    "y": 459.1113119125366,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "9897db0a.e34dc8",
-        "9787862d.18f5b8",
-        "195661d4.a9c59e",
-        "8e1fe65e.d69f18"
+        "25a04fbf.4bd09",
+        "8d1e2cc2.dc3cf",
+        "2d8a913.fdd0d6e",
+        "77f3068a.362d28"
       ]
     ]
   },
   {
-    "id": "195661d4.a9c59e",
+    "id": "2d8a913.fdd0d6e",
     "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=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 559,
-    "y": 531,
-    "z": "f5f8cf31.a0ec1",
+    "x": 549,
+    "y": 530,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "9897db0a.e34dc8",
+    "id": "25a04fbf.4bd09",
     "type": "call",
     "name": "call validate-esr-thirdparty-sdnc-input",
     "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 672.7776336669922,
-    "y": 393.9998035430908,
-    "z": "f5f8cf31.a0ec1",
+    "x": 662.7776336669922,
+    "y": 392.9998035430908,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "9787862d.18f5b8",
+    "id": "8d1e2cc2.dc3cf",
     "type": "for",
     "name": "for 0..key-data_length",
     "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 607.4441070556641,
-    "y": 476.19078826904297,
-    "z": "f5f8cf31.a0ec1",
+    "x": 597.4441070556641,
+    "y": 475.19078826904297,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "64de51c2.171a2"
+        "8470a3b8.c68bb"
       ]
     ]
   },
   {
-    "id": "64de51c2.171a2",
+    "id": "8470a3b8.c68bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 779.3335723876953,
-    "y": 475.4130334854126,
-    "z": "f5f8cf31.a0ec1",
+    "x": 769.3335723876953,
+    "y": 474.4130334854126,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6c37c93a.5a9338",
-        "f8e49db.93b206",
-        "b38e3659.a3e968",
-        "abe36d34.993f2",
-        "ab9e3d95.0ab8"
+        "2e5df795.078a08",
+        "6a42fb20.98a2b4",
+        "554fdd88.9dce84",
+        "a2362617.a38ac8",
+        "bbbe7cd.1d5138",
+        "2a8b4597.cff4ba",
+        "884a9190.06299"
       ]
     ]
   },
   {
-    "id": "6c37c93a.5a9338",
+    "id": "2e5df795.078a08",
     "type": "switchNode",
     "name": "switch service-url",
     "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 991.5552749633789,
-    "y": 385.5241861343384,
-    "z": "f5f8cf31.a0ec1",
+    "x": 981.5552749633789,
+    "y": 384.5241861343384,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ef74e18a.347bb"
+        "1b6eea6.229c916"
       ]
     ]
   },
   {
-    "id": "ef74e18a.347bb",
+    "id": "1b6eea6.229c916",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1155.5553970336914,
-    "y": 384.5554189682007,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1145.5553970336914,
+    "y": 383.5554189682007,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "ce02826f.96607"
+        "fd22b9a9.c98888"
       ]
     ]
   },
   {
-    "id": "ce02826f.96607",
+    "id": "fd22b9a9.c98888",
     "type": "set",
     "name": "set service-url",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
     "comments": "",
-    "x": 1309.5554885864258,
-    "y": 384.1554126739502,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1299.5554885864258,
+    "y": 383.1554126739502,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "f8e49db.93b206",
+    "id": "6a42fb20.98a2b4",
     "type": "switchNode",
     "name": "switch user-name",
     "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 988.8450202941895,
-    "y": 454.7712459564209,
-    "z": "f5f8cf31.a0ec1",
+    "x": 978.8450202941895,
+    "y": 453.7712459564209,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "b1f04d56.2de33"
+        "7cf30c0f.3d4904"
       ]
     ]
   },
   {
-    "id": "b1f04d56.2de33",
+    "id": "7cf30c0f.3d4904",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1157.8450088500977,
-    "y": 452.8024892807007,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1147.8450088500977,
+    "y": 451.8024892807007,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "393fe106.5ce84e"
+        "9353bb00.5c78e8"
       ]
     ]
   },
   {
-    "id": "393fe106.5ce84e",
+    "id": "9353bb00.5c78e8",
     "type": "set",
     "name": "set user",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
     "comments": "",
-    "x": 1293.8451614379883,
-    "y": 452.40248012542725,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1283.8451614379883,
+    "y": 451.40248012542725,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "b38e3659.a3e968",
+    "id": "554fdd88.9dce84",
     "type": "switchNode",
     "name": "switch password",
     "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 986.6228523254395,
-    "y": 520.3267955780029,
-    "z": "f5f8cf31.a0ec1",
+    "x": 976.6228523254395,
+    "y": 519.3267955780029,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "31f8b0b.92d9a5"
+        "a74025be.af1718"
       ]
     ]
   },
   {
-    "id": "31f8b0b.92d9a5",
+    "id": "a74025be.af1718",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1158.6228103637695,
-    "y": 520.3580408096313,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1148.6228103637695,
+    "y": 519.3580408096313,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "4275b621.ba48f8"
+        "dba0cf08.2438c"
       ]
     ]
   },
   {
-    "id": "4275b621.ba48f8",
+    "id": "dba0cf08.2438c",
     "type": "set",
     "name": "set password",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
     "comments": "",
-    "x": 1313.6230545043945,
-    "y": 518.9580202102661,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1303.6230545043945,
+    "y": 517.9580202102661,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "8e1fe65e.d69f18",
+    "id": "77f3068a.362d28",
     "type": "call",
     "name": "call esr-thirdparty-sdnc-discovery",
     "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 630.4377593994141,
-    "y": 602.5490007400513,
-    "z": "f5f8cf31.a0ec1",
+    "x": 620.4377593994141,
+    "y": 601.5490007400513,
+    "z": "cbb28df7.1359",
     "wires": [
       []
     ]
   },
   {
-    "id": "abe36d34.993f2",
+    "id": "a2362617.a38ac8",
     "type": "switchNode",
     "name": "switch esr-system-info-id",
     "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1008.4441528320312,
-    "y": 574.3331909179688,
-    "z": "f5f8cf31.a0ec1",
+    "x": 998.4441528320312,
+    "y": 573.3331909179688,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "c47d5b3c.ec2b98"
+        "5cab102b.8494d"
       ]
     ]
   },
   {
-    "id": "c47d5b3c.ec2b98",
+    "id": "5cab102b.8494d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1183.4441375732422,
-    "y": 572.3643522262573,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1173.4441375732422,
+    "y": 571.3643522262573,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "b46d33d6.3f8df"
+        "71f47e13.cb288"
       ]
     ]
   },
   {
-    "id": "b46d33d6.3f8df",
+    "id": "71f47e13.cb288",
     "type": "set",
     "name": "set esr-system-info-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
     "comments": "",
-    "x": 1349.444107055664,
-    "y": 573.964376449585,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1339.444107055664,
+    "y": 572.964376449585,
+    "z": "cbb28df7.1359",
     "wires": []
   },
   {
-    "id": "ab9e3d95.0ab8",
+    "id": "bbbe7cd.1d5138",
     "type": "switchNode",
     "name": "switch thirdparty-sdnc-id",
     "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1003,
-    "y": 619,
-    "z": "f5f8cf31.a0ec1",
+    "x": 993,
+    "y": 618,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "6a0992e2.98429c"
+        "750fb82f.3c8b28"
       ]
     ]
   },
   {
-    "id": "6a0992e2.98429c",
+    "id": "750fb82f.3c8b28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1177.999984741211,
-    "y": 617.0311613082886,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1167.999984741211,
+    "y": 616.0311613082886,
+    "z": "cbb28df7.1359",
     "wires": [
       [
-        "75b4346a.e3888c"
+        "6331f258.3f8f8c"
       ]
     ]
   },
   {
-    "id": "75b4346a.e3888c",
+    "id": "6331f258.3f8f8c",
     "type": "set",
     "name": "set thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
     "comments": "",
-    "x": 1343.9999542236328,
-    "y": 618.6311855316162,
-    "z": "f5f8cf31.a0ec1",
+    "x": 1333.9999542236328,
+    "y": 617.6311855316162,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "2a8b4597.cff4ba",
+    "type": "switchNode",
+    "name": "switch type",
+    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'type'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 943.0000305175781,
+    "y": 667.0000200271606,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "cc8e7403.36ff88"
+      ]
+    ]
+  },
+  {
+    "id": "cc8e7403.36ff88",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1088.0000343322754,
+    "y": 666.0311889648438,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "d672d4f.959ba28"
+      ]
+    ]
+  },
+  {
+    "id": "d672d4f.959ba28",
+    "type": "set",
+    "name": "set type",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+    "comments": "",
+    "x": 1220.0000381469727,
+    "y": 665.6312046051025,
+    "z": "cbb28df7.1359",
+    "wires": []
+  },
+  {
+    "id": "884a9190.06299",
+    "type": "switchNode",
+    "name": "switch vendor",
+    "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 944.0000267028809,
+    "y": 723.0000219345093,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "874c4c0f.cf42b"
+      ]
+    ]
+  },
+  {
+    "id": "874c4c0f.cf42b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1089.0000305175781,
+    "y": 722.0311908721924,
+    "z": "cbb28df7.1359",
+    "wires": [
+      [
+        "84239301.8f5d"
+      ]
+    ]
+  },
+  {
+    "id": "84239301.8f5d",
+    "type": "set",
+    "name": "set vendor",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
+    "comments": "",
+    "x": 1221.0000343322754,
+    "y": 721.6312065124512,
+    "z": "cbb28df7.1359",
     "wires": []
   }
 ]
diff --git a/platform-logic/datachange/src/main/resources/graph.versions b/platform-logic/datachange/src/main/resources/graph.versions
index 5c1b088..37211fe 100644
--- a/platform-logic/datachange/src/main/resources/graph.versions
+++ b/platform-logic/datachange/src/main/resources/graph.versions
@@ -1,5 +1,6 @@
 DataChange data-change-notification ${project.version} sync
 DataChange esr-thirdparty-sdnc ${project.version} sync
+DataChange esr-thirdparty-sdnc-of-zte ${project.version} sync
 DataChange validate-esr-thirdparty-sdnc-input ${project.version} sync
 DataChange esr-thirdparty-sdnc-discovery ${project.version} sync
 DataChange update-network-to-aai ${project.version} sync
diff --git a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
index 76f2fe8..80c8acf 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_data-change-notification.xml
@@ -1,27 +1,36 @@
 <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='DataChange' version='${project.version}'>
-    <method rpc='data-change-notification' mode='sync'>
-        <block atomic="true">
-            <switch test='`$data-change-notification-input.aai-node-type`'>
-                <outcome value='esr-thirdparty-sdnc'>
-                    <block atomic="true">
-                        <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync' ></call>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI node type not supported" />
-                    </return>
-                </outcome>
+  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='DataChange' version='${project.version}'>
+  <method rpc='data-change-notification' mode='sync'> 
+    <block atomic="true"> 
+      <switch test='`$data-change-notification-input.aai-node-type`'> 
+        <outcome value='esr-thirdparty-sdnc'> 
+          <for index='idx' start='0' end='`$data-change-notification-input.key-data_length`'> 
+            <switch test="`$data-change-notification-input.key-data[$idx].key-value == 'ZTE'`"> 
+              <outcome value='true'> 
+                <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></call>
+              </outcome>
+              <outcome value='false'> 
+                <block atomic="true"> 
+                  <call module='DataChange' rpc='esr-thirdparty-sdnc' mode='sync'></call>
+                </block>
+              </outcome>
             </switch>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
+          </for>
+        </outcome>
+        <outcome value='Other'> 
+          <return status='failure'> 
+            <parameter name='ack-final' value='Y'/>  
+            <parameter name="error-code" value="500"/>  
+            <parameter name="error-message" value="AAI node type not supported"/>
+          </return>
+        </outcome>
+      </switch>
+      <return status='success'> 
+        <parameter name="ack-final-indicator" value="Y"/>  
+        <parameter name="error-code" value="200"/>  
+        <parameter name="error-message" value="`$error-message`"/> 
+      </return>
+    </block>
+  </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 3f2dc89..55c1bd3 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -5,38 +5,51 @@
         <block atomic="true">
             <switch test="`$data-change-notification-input.aai-event-trigger`">
                 <outcome value='Update'>
-                    <block atomic="true">
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
-                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                            <parameter name="format" value="json"/>
-                            <parameter name="httpMethod" value="get"/>
-                            <parameter name="responsePrefix" value="topology"/>
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-                            <parameter name="trustStorePassword" value="adminadmin"/>
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                            <parameter name="keyStorePassword" value="adminadmin"/>
-                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                            <outcome value='success'>
-                                <block atomic="true"></block>
+                    <block>
+                        <switch test="`$prop.sdncRestApi.type`">
+                            <outcome value='SOTN'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="get"/>
+                                        <parameter name="responsePrefix" value="topology"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                        <outcome value='success'>
+                                            <block atomic="true"></block>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <for index='nidx' start='0' end='`$topology.networks.network_length`' >
+                                        <block>
+                                            <set>
+                                                <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
+                                            </set>
+                                            <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
+                                        </block>
+                                    </for>
+                                </block>
                             </outcome>
-                            <outcome value='failure'>
+                            <outcome value='Other'>
                                 <return status='failure'>
                                     <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                    <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
                                 </return>
                             </outcome>
-                        </execute>
-                        <for index='nidx' start='0' end='`$topology.networks.network_length`' >
-                            <block>
-                                <set>
-                                    <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
-                                </set>
-                                <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
-                            </block>
-                        </for>
+                        </switch>
                     </block>
                 </outcome>
                 <outcome value='delete'>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
new file mode 100644
index 0000000..5216121
--- /dev/null
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-of-zte.xml
@@ -0,0 +1,5 @@
+<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='DataChange' version='${project.version}'>
+  <method rpc='esr-thirdparty-sdnc-of-zte' mode='sync'></method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index edce7fb..c2e75d2 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
@@ -41,6 +41,20 @@
                             </set>
                         </outcome>
                     </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'type'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.type' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'vendor'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.vendor' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+                            </set>
+                        </outcome>
+                    </switch>
                 </block>
             </for>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index 837612a..b5d707a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
@@ -499,7 +499,7 @@
     "id": "48507d03.0cfd24",
     "type": "update",
     "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
     "comments": "",
     "outputs": 1,
     "x": 620.6908798217773,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
index d123bd7..4224a32 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
@@ -422,7 +422,7 @@
     "z": "94b1afc3.a0dc",
     "wires": [
       [
-        "2b1dae74.689ae2"
+        "8f9ebae3.f9c1f8"
       ]
     ]
   },
@@ -443,8 +443,8 @@
     "name": "set controlPoint",
     "xml": "<set>\n<parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
     "comments": "",
-    "x": 1352.7787055969238,
-    "y": 657.0003480911255,
+    "x": 1713.7786865234375,
+    "y": 684.0004281997681,
     "z": "94b1afc3.a0dc",
     "wires": []
   },
@@ -487,8 +487,8 @@
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1126.445026397705,
-    "y": 641.0001058578491,
+    "x": 1531.4451026916504,
+    "y": 704.0001840591431,
     "z": "94b1afc3.a0dc",
     "wires": [
       [
@@ -504,8 +504,8 @@
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.controlPoint`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.controlpoints\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1377.445182800293,
-    "y": 709.000207901001,
+    "x": 1738.4451637268066,
+    "y": 736.0002880096436,
     "z": "94b1afc3.a0dc",
     "wires": [
       []
@@ -810,5 +810,86 @@
     "wires": [
       []
     ]
+  },
+  {
+    "id": "8f9ebae3.f9c1f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1105,
+    "y": 650,
+    "z": "94b1afc3.a0dc",
+    "wires": [
+      [
+        "c5f963e7.1c042"
+      ]
+    ]
+  },
+  {
+    "id": "c5f963e7.1c042",
+    "type": "switchNode",
+    "name": "switch value",
+    "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].value`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1235.0000038146973,
+    "y": 681.9999990463257,
+    "z": "94b1afc3.a0dc",
+    "wires": [
+      [
+        "50780dd0.f16eb4",
+        "cef68888.786a28"
+      ]
+    ]
+  },
+  {
+    "id": "50780dd0.f16eb4",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1392.0000114440918,
+    "y": 653.0000410079956,
+    "z": "94b1afc3.a0dc",
+    "wires": [
+      [
+        "9c84c418.3907d8"
+      ]
+    ]
+  },
+  {
+    "id": "cef68888.786a28",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1375.5003395080566,
+    "y": 701.0000009536743,
+    "z": "94b1afc3.a0dc",
+    "wires": [
+      [
+        "2b1dae74.689ae2"
+      ]
+    ]
+  },
+  {
+    "id": "9c84c418.3907d8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1531.000015258789,
+    "y": 652.9999990463257,
+    "z": "94b1afc3.a0dc",
+    "wires": [
+      []
+    ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.json
deleted file mode 100644
index f45f3d6..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"3bcc1d3c.2e7f62","type":"dgstart","name":"DGSTART","outputs":1,"x":183.75,"y":77.5,"z":"87de2662.03c5d8","wires":[["f8f4f048.6fa07"]]},{"id":"f8f4f048.6fa07","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":462.75,"y":80.5,"z":"87de2662.03c5d8","wires":[["f890436a.4cb56"]]},{"id":"f890436a.4cb56","type":"method","name":"self-serve-aai-vfmodule-put","xml":"<method rpc='self-serve-aai-vfmodule-put' mode='sync'>\n","comments":"","outputs":1,"x":782.75,"y":86.5,"z":"87de2662.03c5d8","wires":[["a7805912.e54c08"]]},{"id":"a7805912.e54c08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":294.75,"y":395.5,"z":"87de2662.03c5d8","wires":[["13fa00ca.d798ef","eacd37e7.f12328"]]},{"id":"13fa00ca.d798ef","type":"switchNode","name":"switch vnf-index","xml":"<switch test='`$vnf-index`'>\n","comments":"","outputs":1,"x":507.75,"y":396.5,"z":"87de2662.03c5d8","wires":[["b00ffff3.acb6f","ba9ae715.865198"]]},{"id":"ba9ae715.865198","type":"outcome","name":"Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":697.75,"y":286.5,"z":"87de2662.03c5d8","wires":[["6763195f.a1e3d8"]]},{"id":"b00ffff3.acb6f","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":702.75,"y":414.5,"z":"87de2662.03c5d8","wires":[["60603a9e.40c824"]]},{"id":"6763195f.a1e3d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='vnf-index is required' />\n","comments":"","x":853.75,"y":287.5,"z":"87de2662.03c5d8","wires":[]},{"id":"60603a9e.40c824","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":847.75,"y":414.5,"z":"87de2662.03c5d8","wires":[["6913e72c.1d7f48","d4d282ea.1681c"]]},{"id":"6913e72c.1d7f48","type":"for","name":"for j","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\" >\n","comments":"","outputs":1,"x":974.75,"y":638.5,"z":"87de2662.03c5d8","wires":[["73d4d17b.fa237"]]},{"id":"73d4d17b.fa237","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1130.75,"y":640.5,"z":"87de2662.03c5d8","wires":[["60c50f6e.e6ca7"]]},{"id":"60c50f6e.e6ca7","type":"switchNode","name":"switch","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].name`'>\n","comments":"","outputs":1,"x":1279.75,"y":640.5,"z":"87de2662.03c5d8","wires":[["e5caa9f7.c09358","83438f88.62bba","d776d78b.b63e38","e0c70877.2cd778","5268f0ac.d7d17"]]},{"id":"e5caa9f7.c09358","type":"outcome","name":"vf-module-id","xml":"<outcome value='vf-module-id'>\n","comments":"","outputs":1,"x":1441.75,"y":596.5,"z":"87de2662.03c5d8","wires":[["a4aa2147.163b6"]]},{"id":"a4aa2147.163b6","type":"set","name":"set vf-module-id","xml":"<set>\n<parameter name='vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />\n","comments":"","x":1650.75,"y":596.5,"z":"87de2662.03c5d8","wires":[]},{"id":"83438f88.62bba","type":"outcome","name":"vf-module-name","xml":"<outcome value='vf-module-name'>\n","comments":"","outputs":1,"x":1448.75,"y":632.5,"z":"87de2662.03c5d8","wires":[["b5e3f8de.e9a598"]]},{"id":"eacd37e7.f12328","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":495.75,"y":803.5,"z":"87de2662.03c5d8","wires":[["93f4e68b.5b6d98"]]},{"id":"d4d282ea.1681c","type":"for","name":"for k","xml":"<for index=\"k\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`\" >\n","comments":"","outputs":1,"x":996.75,"y":362.5,"z":"87de2662.03c5d8","wires":[["a9c8b188.25031"]]},{"id":"a9c8b188.25031","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1138.75,"y":362.5,"z":"87de2662.03c5d8","wires":[["79139eb.37a506"]]},{"id":"79139eb.37a506","type":"switchNode","name":"switch","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>\n","comments":"","outputs":1,"x":1288.75,"y":362.5,"z":"87de2662.03c5d8","wires":[["4fe5e9f0.e41a88","ad407b2f.5fcd38","8fb674c6.a20218","7adccb75.b058e4"]]},{"id":"4fe5e9f0.e41a88","type":"outcome","name":"vnf-id","xml":"<outcome value='vnf-id'>\n","comments":"","outputs":1,"x":1437.75,"y":296.5,"z":"87de2662.03c5d8","wires":[["4015b9c8.9d41c8"]]},{"id":"ad407b2f.5fcd38","type":"outcome","name":"ipv4-loopback0-address","xml":"<outcome value='ipv4-loopback0-address'>\n","comments":"","outputs":1,"x":1488.75,"y":336.5,"z":"87de2662.03c5d8","wires":[["11e0c62f.b5574a"]]},{"id":"4015b9c8.9d41c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1693.75,"y":298.5,"z":"87de2662.03c5d8","wires":[["9b6155f5.f4cc98"]]},{"id":"9b6155f5.f4cc98","type":"set","name":"set vnf-id","xml":"<set>\n<parameter name='vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />\n\n","comments":"","x":1842.75,"y":297.5,"z":"87de2662.03c5d8","wires":[]},{"id":"11e0c62f.b5574a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1695.75,"y":336.5,"z":"87de2662.03c5d8","wires":[["ee096b07.cf8688"]]},{"id":"ee096b07.cf8688","type":"set","name":"set ipv4-loopback0-address","xml":"<set>\n<parameter name='ipv4-loopback0-address' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />\n\n","comments":"","x":1903.75,"y":336.5,"z":"87de2662.03c5d8","wires":[]},{"id":"93f4e68b.5b6d98","type":"save","name":"update generic-vnf","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"generic-vnf\"\n\t\tkey=\"generic-vnf.vnf-id = $vnf-id \"\n\tpfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"ipv4-loopback0-address\" value='`$ipv4-loopback0-address`' />\n<parameter name=\"ipv4-oam-address\" value='`$ipv4-oam-address`' />\n<parameter name=\"as-number\" value='`$as-number`' />\n<parameter name=\"vlan-id-outer\" value='`$vlan-id-outer`' />\n","comments":"","outputs":1,"x":681.75,"y":804.5,"z":"87de2662.03c5d8","wires":[["95c5a79a.ddbdc8","f108819d.8bd34","4ac64e59.55cec"]]},{"id":"95c5a79a.ddbdc8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":884.75,"y":764.5,"z":"87de2662.03c5d8","wires":[["54b37c02.3f0a64"]]},{"id":"f108819d.8bd34","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":887.75,"y":801.5,"z":"87de2662.03c5d8","wires":[["54b37c02.3f0a64"]]},{"id":"54b37c02.3f0a64","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error for PUT in AAI for generic-vnf.\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":1036.75,"y":787.5,"z":"87de2662.03c5d8","wires":[[]]},{"id":"8fb674c6.a20218","type":"outcome","name":"as-number","xml":"<outcome value='as-number'>\n","comments":"","outputs":1,"x":1448.75,"y":377.5,"z":"87de2662.03c5d8","wires":[["66c640fa.36473"]]},{"id":"7adccb75.b058e4","type":"outcome","name":"vlan-id-outer","xml":"<outcome value='vlan-id-outer'>\n","comments":"","outputs":1,"x":1450.75,"y":417.5,"z":"87de2662.03c5d8","wires":[["457b683c.52d4b8"]]},{"id":"66c640fa.36473","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1694.75,"y":374.5,"z":"87de2662.03c5d8","wires":[["89c9f6aa.f93da8"]]},{"id":"89c9f6aa.f93da8","type":"set","name":"set as-number","xml":"<set>\n<parameter name='as-number' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />\n\n","comments":"","x":1861.75,"y":375.5,"z":"87de2662.03c5d8","wires":[]},{"id":"457b683c.52d4b8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1692.75,"y":413.5,"z":"87de2662.03c5d8","wires":[["aa7f4e1d.87e2b"]]},{"id":"aa7f4e1d.87e2b","type":"set","name":"set vlan-id-outer","xml":"<set>\n<parameter name='vlan-id-outer' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />\n\n","comments":"","x":1866.75,"y":414.5,"z":"87de2662.03c5d8","wires":[]},{"id":"b5e3f8de.e9a598","type":"set","name":"set vf-module-name","xml":"<set>\n<parameter name='vf-module-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />\n","comments":"","x":1662.75,"y":633.5,"z":"87de2662.03c5d8","wires":[]},{"id":"d776d78b.b63e38","type":"outcome","name":"volume-group-name","xml":"<outcome value='volume-group-name'>\n","comments":"","outputs":1,"x":1460.75,"y":729.5,"z":"87de2662.03c5d8","wires":[["3e549a42.e099b6"]]},{"id":"3e549a42.e099b6","type":"set","name":"set volume-group-name","xml":"<set>\n<parameter name='volume-group-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />\n","comments":"","x":1678.75,"y":729.5,"z":"87de2662.03c5d8","wires":[]},{"id":"e0c70877.2cd778","type":"outcome","name":"cloud-region","xml":"<outcome value='cloud-region'>\n","comments":"","outputs":1,"x":1438.75,"y":798.5,"z":"87de2662.03c5d8","wires":[["1d906e7c.bb10b2"]]},{"id":"1d906e7c.bb10b2","type":"set","name":"set cloud-region","xml":"<set>\n<parameter name='cloud-region' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />\n","comments":"","x":1653.75,"y":797.5,"z":"87de2662.03c5d8","wires":[]},{"id":"4ac64e59.55cec","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":868.75,"y":921.5,"z":"87de2662.03c5d8","wires":[["667cd992.349bc8"]]},{"id":"115b9def.8bc5b2","type":"comment","name":"PUT generic-vnf","info":"","comments":"","x":668.75,"y":765.5,"z":"87de2662.03c5d8","wires":[]},{"id":"f0a1b451.879598","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error for PUT in AAI for vf-module\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":1412.75,"y":903.5,"z":"87de2662.03c5d8","wires":[[]]},{"id":"6eb56e20.58186","type":"comment","name":"PUT vnf-module","info":"","comments":"","x":1049.75,"y":881.5,"z":"87de2662.03c5d8","wires":[]},{"id":"667cd992.349bc8","type":"save","name":"update vf-module","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"vf-module\"\n\t\tkey=\"vf-module.vf-module-id = $vf-module-id \"\n\tpfx=\"tmp.AnAI-data.vfmodule\" >\n<parameter name=\"vf-module-name\" value='`$vf-module-name`' />\n","comments":"","outputs":1,"x":1057.75,"y":920.5,"z":"87de2662.03c5d8","wires":[["5c3ff6c3.e9d0d8","12563170.8c5ebf","bd518e04.b96c1"]]},{"id":"5c3ff6c3.e9d0d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1260.75,"y":880.5,"z":"87de2662.03c5d8","wires":[["f0a1b451.879598"]]},{"id":"12563170.8c5ebf","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1263.75,"y":917.5,"z":"87de2662.03c5d8","wires":[["f0a1b451.879598"]]},{"id":"bd518e04.b96c1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1246.75,"y":1044.5,"z":"87de2662.03c5d8","wires":[["e1266c78.1063b"]]},{"id":"e1266c78.1063b","type":"save","name":"update volume-group","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"volume-group\"\n\t\tkey=\"volume-group-id = $volume-group-id and \n\t\t\t\tcloud-region.cloud-owner = $prop.cloud-region.cloud-owner and\n\t\t\t\tcloud-region.cloud-region-id = $cloud-region \"\n\t\tpfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"volume-group-name\" value='`$volume-group-name`' />\n","comments":"","outputs":1,"x":1429.7500228881836,"y":1048.500015258789,"z":"87de2662.03c5d8","wires":[["b7f2fc72.06776","875ccc41.ced81","354dd145.06fb5e"]]},{"id":"4fc5c62f.4f0428","type":"comment","name":"PUT volume-group-name","info":"","comments":"","x":1446.75,"y":996.5,"z":"87de2662.03c5d8","wires":[]},{"id":"b7f2fc72.06776","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1668.75,"y":996.5,"z":"87de2662.03c5d8","wires":[["1f904d5d.23af73"]]},{"id":"875ccc41.ced81","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1671.75,"y":1033.5,"z":"87de2662.03c5d8","wires":[["1f904d5d.23af73"]]},{"id":"354dd145.06fb5e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1663.75,"y":1085.5,"z":"87de2662.03c5d8","wires":[["4269acd9.cb8be4"]]},{"id":"1f904d5d.23af73","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error Saving in AAI\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":1820.75,"y":1019.5,"z":"87de2662.03c5d8","wires":[[]]},{"id":"4269acd9.cb8be4","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\n","comments":"","x":1835.75,"y":1088.5,"z":"87de2662.03c5d8","wires":[]},{"id":"5268f0ac.d7d17","type":"outcome","name":"volume-group-id","xml":"<outcome value='volume-group-id'>\n","comments":"","outputs":1,"x":1447.75,"y":696.5,"z":"87de2662.03c5d8","wires":[["1fa4e223.989e2e"]]},{"id":"1fa4e223.989e2e","type":"set","name":"set volume-group-id","xml":"<set>\n<parameter name='volume-group-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />\n","comments":"","x":1680.75,"y":695.5,"z":"87de2662.03c5d8","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-alts-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-alts-assignment.json
deleted file mode 100644
index 9085309..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-alts-assignment.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"538cd7ac.e4e838","type":"dgstart","name":"DGSTART","outputs":1,"x":121.66666412353516,"y":104.33333614189178,"z":"286c7310.cdd10c","wires":[["b6a60d0e.5122b"]]},{"id":"b6a60d0e.5122b","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":400.66666412353516,"y":107.33333614189178,"z":"286c7310.cdd10c","wires":[["9b40f573.5fac28"]]},{"id":"9b40f573.5fac28","type":"method","name":"self-serve-alts-assignment","xml":"<method rpc='self-serve-alts-assignment' mode='sync'>\n","comments":"","outputs":1,"x":709.6666641235352,"y":108.33333614189178,"z":"286c7310.cdd10c","wires":[["212c8187.a7ba6e"]]},{"id":"212c8187.a7ba6e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":929.6666641235352,"y":108.33333614189178,"z":"286c7310.cdd10c","wires":[["48f24181.07d54","546451e2.2f0fa"]]},{"id":"48f24181.07d54","type":"switchNode","name":"switch","xml":"<switch test='`$ss.capability-name`'>\n","comments":"","outputs":1,"x":143.66668701171875,"y":726.333358076401,"z":"286c7310.cdd10c","wires":[["820fb9b3.290978","690f53f8.f0534c"]]},{"id":"820fb9b3.290978","type":"outcome","name":"alts-license-assign","xml":"<outcome value='alts-license-assign'>\n","comments":"","outputs":1,"x":397.66668701171875,"y":691.333358076401,"z":"286c7310.cdd10c","wires":[["a9fcb058.2b2ab"]]},{"id":"ea8b54a3.deaa28","type":"comment","name":"ss.capability-name","info":"","comments":"","x":156.66668701171875,"y":681.333358076401,"z":"286c7310.cdd10c","wires":[]},{"id":"690f53f8.f0534c","type":"outcome","name":"alts-entitlement-assign","xml":"<outcome value='alts-entitlement-assign'>\n","comments":"","outputs":1,"x":388.66668701171875,"y":856.333358076401,"z":"286c7310.cdd10c","wires":[["42c048a2.4cfe98"]]},{"id":"951615e6.14c858","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":792.6666793823242,"y":604.3333339691162,"z":"286c7310.cdd10c","wires":[["34ba4208.49815e"]]},{"id":"d55d5ccc.21ddd","type":"comment","name":"ss.capability-action","info":"","comments":"","x":598.6666793823242,"y":643.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"a9fcb058.2b2ab","type":"switchNode","name":"switch","xml":"<switch test='`$ss.capability-action`'>\n","comments":"","outputs":1,"x":591.6666793823242,"y":688.3333339691162,"z":"286c7310.cdd10c","wires":[["951615e6.14c858","55b05be5.bc2944"]]},{"id":"42c048a2.4cfe98","type":"switchNode","name":"switch","xml":"<switch test='`$ss.capability-action`'>\n","comments":"","outputs":1,"x":594.6666793823242,"y":860.3333339691162,"z":"286c7310.cdd10c","wires":[["19d57d07.ba97e3","88fb0f29.e3736"]]},{"id":"d737ce7f.e1949","type":"comment","name":"ss.capability-action","info":"","comments":"","x":600.6666793823242,"y":813.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"19d57d07.ba97e3","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":770.6666793823242,"y":867.3333339691162,"z":"286c7310.cdd10c","wires":[["18dfd4c5.b0971b"]]},{"id":"55b05be5.bc2944","type":"outcome","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":782.6666793823242,"y":693.3333339691162,"z":"286c7310.cdd10c","wires":[["e89499eb.c02448"]]},{"id":"88fb0f29.e3736","type":"outcome","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":768.6666793823242,"y":979.3333339691162,"z":"286c7310.cdd10c","wires":[["74e40d87.52a7f4"]]},{"id":"34ba4208.49815e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":957.6666793823242,"y":605.3333339691162,"z":"286c7310.cdd10c","wires":[["5f671562.c77cac","1657a887.c933a7"]]},{"id":"e89499eb.c02448","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":954.6666793823242,"y":695.3333339691162,"z":"286c7310.cdd10c","wires":[["5f671562.c77cac","2e0c3d6f.800742"]]},{"id":"18dfd4c5.b0971b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":931.6666793823242,"y":859.3333339691162,"z":"286c7310.cdd10c","wires":[["5f671562.c77cac","302f4895.fbcbd8"]]},{"id":"74e40d87.52a7f4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":936.6666793823242,"y":977.3333339691162,"z":"286c7310.cdd10c","wires":[["5f671562.c77cac","e8d8c65a.364bb8"]]},{"id":"302f4895.fbcbd8","type":"execute","name":"execute: ALTS | acquireEntitlement","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.altsTools.AltsTools\" method=\"acquireEntitlement\" >\n\t<parameter name=\"error-prefix\" value=\"alts.error\" />\n\t<parameter name=\"prefix\" value=\"alts.resp\" />\n\t<parameter name=\"assignment-group\" value=\"`$alts.entitlement-assignment-group-uuid`\" />\n\t<parameter name=\"hostname\" value=\"`$alts.vnf-name`\" />\n\t<parameter name=\"vnf-id\" value=\"`$alts.vnf-id`\" />","comments":"","outputs":1,"x":1256.6666793823242,"y":1080.3333339691162,"z":"286c7310.cdd10c","wires":[["23d2ef2a.c5e44","b784e140.74b3c","346610a2.13765","c08c1860.7773e8"]]},{"id":"1657a887.c933a7","type":"execute","name":"execute: ALTS | acquireLicense","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.altsTools.AltsTools\" method=\"acquireLicense\" >\n\t<parameter name=\"error-prefix\" value=\"alts.error\" />\n\t<parameter name=\"prefix\" value=\"alts.resp\" />\n\t<parameter name=\"assignment-group\" value=\"`$alts.license-assignment-group-uuid`\" />\n\t<parameter name=\"hostname\" value=\"`$alts.vnf-name`\" />\n\t<parameter name=\"vnf-id\" value=\"`$alts.vnf-id`\" />","comments":"","outputs":1,"x":1242.6666793823242,"y":599.3333857329562,"z":"286c7310.cdd10c","wires":[["2b235696.f5cbca","6707d825.519d08","312d7131.c4857e","11bc7499.5addeb"]]},{"id":"2e0c3d6f.800742","type":"execute","name":"execute: ALTS | releaseLicense","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.altsTools.AltsTools\" method=\"releaseLicense\" >\n\t<parameter name=\"asset-uuid\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$license-key-index].value`\" />\n\t<parameter name=\"error-prefix\" value=\"alts.error\" />\n\t<parameter name=\"prefix\" value=\"alts.resp\" />\n\t<parameter name=\"assignment-group\" value=\"`$alts.license-assignment-group-uuid`\" />\n\t<parameter name=\"hostname\" value=\"`$alts.vnf-name`\" />\n\t<parameter name=\"vnf-id\" value=\"`$alts.vnf-id`\" />","comments":"","outputs":1,"x":1246.6666793823242,"y":831.3333339691162,"z":"286c7310.cdd10c","wires":[["cffb738f.d3e14","182f6475.71abbc","538cfad8.9862e4","f53e9824.4d5f38"]]},{"id":"e8d8c65a.364bb8","type":"execute","name":"execute: ALTS | releaseEntitlement","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.altsTools.AltsTools\" method=\"releaseEntitlement\" >\n\t<parameter name=\"asset-uuid\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$entitlement-key-index].value`\" />\n\t<parameter name=\"error-prefix\" value=\"alts.error\" />\n\t<parameter name=\"prefix\" value=\"alts.resp\" />\n\t<parameter name=\"assignment-group\" value=\"`$alts.entitlement-assignment-group-uuid`\" />\n\t<parameter name=\"hostname\" value=\"`$alts.vnf-name`\" />\n\t<parameter name=\"vnf-id\" value=\"`$alts.vnf-id`\" />","comments":"","outputs":1,"x":1252.6666793823242,"y":1342.3333339691162,"z":"286c7310.cdd10c","wires":[["8eb7dea7.c2113","a16410b2.8840c","d9970af0.ce0108","1112b9b6.25f546"]]},{"id":"ffa0d472.5ddc98","type":"for","name":"for i","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`\" >\n","comments":"","outputs":1,"x":1824.6666793823242,"y":222.3333339691162,"z":"286c7310.cdd10c","wires":[["e47e95a0.80af78"]]},{"id":"5f671562.c77cac","type":"switchNode","name":"switch vnf-index","xml":"<switch test='`$vnf-index`'>\n","comments":"","outputs":1,"x":1274.6666793823242,"y":200.3333339691162,"z":"286c7310.cdd10c","wires":[["45934292.a00acc","eb9392d7.fd3c3"]]},{"id":"eb9392d7.fd3c3","type":"outcome","name":"Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1439.6666793823242,"y":179.3333339691162,"z":"286c7310.cdd10c","wires":[["fea279cf.9530a8"]]},{"id":"45934292.a00acc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1446.6666793823242,"y":255.3333339691162,"z":"286c7310.cdd10c","wires":[["30a8c6cf.85beaa"]]},{"id":"fea279cf.9530a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='vnf-index is required' />\n","comments":"","x":1602.6666793823242,"y":179.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"e47e95a0.80af78","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1976.6666793823242,"y":219.3333339691162,"z":"286c7310.cdd10c","wires":[["e270ca03.bda1a8"]]},{"id":"e270ca03.bda1a8","type":"switchNode","name":"switch","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name`'>\n","comments":"","outputs":1,"x":2127.666679382324,"y":217.3333339691162,"z":"286c7310.cdd10c","wires":[["52af8672.953498","d5ef0c5e.bd4cc"]]},{"id":"6cf56727.02a0b8","type":"comment","name":"set index of param where capability-name matched","info":"","comments":"","x":2669.666679382324,"y":43.33333396911621,"z":"286c7310.cdd10c","wires":[]},{"id":"52af8672.953498","type":"outcome","name":"alts-license-assign","xml":"<outcome value='alts-license-assign'>\n","comments":"","outputs":1,"x":2387.666679382324,"y":157.3333339691162,"z":"286c7310.cdd10c","wires":[["1cf8bf64.00b6a1"]]},{"id":"1b525450.3e3aec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2649.666778564453,"y":229.33333423454314,"z":"286c7310.cdd10c","wires":[["26874fa2.dfa36"]]},{"id":"30a8c6cf.85beaa","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1598.6666793823242,"y":254.3333339691162,"z":"286c7310.cdd10c","wires":[["ffa0d472.5ddc98","23230146.7736de","48988c01.f3fd04","aa39eb6c.c5e868"]]},{"id":"26874fa2.dfa36","type":"set","name":"set","xml":"<set>\n<parameter name='entitlement-param-index' value='`$i`' />\n\n","comments":"","x":2816.666893005371,"y":230.33333423454314,"z":"286c7310.cdd10c","wires":[]},{"id":"aa39eb6c.c5e868","type":"for","name":"for j","xml":"<for index=\"j\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key_length`\" >\n","comments":"","outputs":1,"x":1793.6672439575195,"y":455.3335764678195,"z":"286c7310.cdd10c","wires":[["c6d4b289.240f3"]]},{"id":"c6d4b289.240f3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1977.6674537658691,"y":458.3335974486545,"z":"286c7310.cdd10c","wires":[["34e115d8.bacada"]]},{"id":"34e115d8.bacada","type":"switchNode","name":"switch","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].name`'>\n","comments":"","outputs":1,"x":2177.667308807373,"y":470.33351543266326,"z":"286c7310.cdd10c","wires":[["ba6e0cb6.6cd38","9a7e702.850fb9","1d3892fe.00223d","9a3ea77b.bb92e8"]]},{"id":"ba6e0cb6.6cd38","type":"outcome","name":"vnf-id","xml":"<outcome value='vnf-id'>\n","comments":"","outputs":1,"x":2373.6671447753906,"y":419.3335593016818,"z":"286c7310.cdd10c","wires":[["4129aab8.79d774"]]},{"id":"4129aab8.79d774","type":"set","name":"set alts-vnf-id","xml":"<set>\n<parameter name='alts.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />\n","comments":"","x":2701.6669883728027,"y":416.3335631163791,"z":"286c7310.cdd10c","wires":[]},{"id":"9a7e702.850fb9","type":"outcome","name":"license-assignment-group-uuid","xml":"<outcome value='license-assignment-group-uuid'>\n","comments":"","outputs":1,"x":2444.667064666748,"y":564.3336108000949,"z":"286c7310.cdd10c","wires":[["a67c843d.786048"]]},{"id":"a67c843d.786048","type":"set","name":"set alts.license-assignment-group-uuid","xml":"<set>\n<parameter name='alts.license-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />\n","comments":"","x":2779.666946411133,"y":561.3336279662326,"z":"286c7310.cdd10c","wires":[]},{"id":"1d3892fe.00223d","type":"outcome","name":"entitlement-assignment-group-uuid","xml":"<outcome value='entitlement-assignment-group-uuid'>\n","comments":"","outputs":1,"x":2451.667064666748,"y":613.3336108000949,"z":"286c7310.cdd10c","wires":[["db6298b7.0a6e98"]]},{"id":"db6298b7.0a6e98","type":"set","name":"set alts.entitlement-assignment-group-uuid","xml":"<set>\n<parameter name='alts.entitlement-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />\n","comments":"","x":2794.6669387817383,"y":614.3336127074435,"z":"286c7310.cdd10c","wires":[]},{"id":"2b235696.f5cbca","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1497.6666793823242,"y":548.3333339691162,"z":"286c7310.cdd10c","wires":[["994c2f16.8a1b1"]]},{"id":"6707d825.519d08","type":"failure","name":"failure","xml":"<outcome value=\"failure\">","comments":"","outputs":1,"x":1485.6666793823242,"y":639.3333339691162,"z":"286c7310.cdd10c","wires":[["a63676a3.61d498"]]},{"id":"11bc7499.5addeb","type":"outcome","name":"unsupported-method","xml":"<outcome value=\"unsupported-method\">","comments":"","outputs":1,"x":1528.6666793823242,"y":713.3333339691162,"z":"286c7310.cdd10c","wires":[["5638b6.12ee774c"]]},{"id":"312d7131.c4857e","type":"not-found","name":"not-found","xml":"<outcome value=\"not-found\">","comments":"","outputs":1,"x":1493.6666793823242,"y":678.3333339691162,"z":"286c7310.cdd10c","wires":[["d15f0240.536"]]},{"id":"994c2f16.8a1b1","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1695.6666793823242,"y":551.3333339691162,"z":"286c7310.cdd10c","wires":[["b09f5198.a8e09","c63d2fea.0f0b8"]]},{"id":"b09f5198.a8e09","type":"set","name":"set license-key and status SUCCESS","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$license-key-index].value' value='`$alts.resp.license-key`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='SUCCESS' />","comments":"","x":1943.6666793823242,"y":551.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"cffb738f.d3e14","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1481.6666793823242,"y":779.3333339691162,"z":"286c7310.cdd10c","wires":[["cdf928f9.cabf28"]]},{"id":"d5ef0c5e.bd4cc","type":"outcome","name":"alts-entitlement-assign","xml":"<outcome value='alts-entitlement-assign'>\n","comments":"","outputs":1,"x":2374.666816711426,"y":233.33332183677703,"z":"286c7310.cdd10c","wires":[["1b525450.3e3aec"]]},{"id":"23230146.7736de","type":"for","name":"for k","xml":"<for index=\"k\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`\" >\n","comments":"","outputs":1,"x":1831.6667404174805,"y":272.3333304198459,"z":"286c7310.cdd10c","wires":[["7693c154.165c8"]]},{"id":"7693c154.165c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1982.6669464111328,"y":271.3333437712863,"z":"286c7310.cdd10c","wires":[["ba173b93.aee018"]]},{"id":"ba173b93.aee018","type":"switchNode","name":"switch","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>\n","comments":"","outputs":1,"x":2132.667022705078,"y":274.3333304198459,"z":"286c7310.cdd10c","wires":[["c33234f3.fe5878","b13767a2.79ad38"]]},{"id":"c33234f3.fe5878","type":"outcome","name":"license-key","xml":"<outcome value='license-key'>\n","comments":"","outputs":1,"x":2284.666976928711,"y":271.3333437712863,"z":"286c7310.cdd10c","wires":[["41a8f087.f3d15"]]},{"id":"b13767a2.79ad38","type":"outcome","name":"entitlement-key","xml":"<outcome value='entitlement-key'>\n","comments":"","outputs":1,"x":2294.667411804199,"y":312.3333246978,"z":"286c7310.cdd10c","wires":[["528e7d4f.db7234"]]},{"id":"41a8f087.f3d15","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2454.6667671203613,"y":278.3333380492404,"z":"286c7310.cdd10c","wires":[["a9c985a9.a26578"]]},{"id":"a9c985a9.a26578","type":"set","name":"set license-key-index","xml":"<set>\n<parameter name='license-key-index' value='`$k`' />\n\n","comments":"","x":2643.6670989990234,"y":280.33332279045135,"z":"286c7310.cdd10c","wires":[]},{"id":"8b5c7731.87ead8","type":"comment","name":"set index of param where name=license-key","info":"","comments":"","x":2444.666679382324,"y":117.33333396911621,"z":"286c7310.cdd10c","wires":[]},{"id":"528e7d4f.db7234","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2447.6668739318848,"y":330.33333995658904,"z":"286c7310.cdd10c","wires":[["ea3ae835.e585b8"]]},{"id":"9aef692e.8c4698","type":"comment","name":"set index of param where name=entitlement-key","info":"","comments":"","x":2428.666862487793,"y":196.3333485396579,"z":"286c7310.cdd10c","wires":[]},{"id":"ea3ae835.e585b8","type":"set","name":"set entitlement-key-index","xml":"<set>\n<parameter name='entitlement-key-index' value='`$k`' />\n\n","comments":"","x":2654.6668853759766,"y":324.3333266051486,"z":"286c7310.cdd10c","wires":[]},{"id":"cdf928f9.cabf28","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1636.6666793823242,"y":777.3333339691162,"z":"286c7310.cdd10c","wires":[["b6e44c24.9fe6e","5068b14e.33c3c"]]},{"id":"a63676a3.61d498","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1697.6666793823242,"y":639.3333339691162,"z":"286c7310.cdd10c","wires":[["53a528f6.3cbc98"]]},{"id":"53a528f6.3cbc98","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1875.6666793823242,"y":639.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"d15f0240.536","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1697.6666793823242,"y":678.3333339691162,"z":"286c7310.cdd10c","wires":[["315477fc.f96578"]]},{"id":"5638b6.12ee774c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1699.6666793823242,"y":714.3333339691162,"z":"286c7310.cdd10c","wires":[["dc230fab.264cd"]]},{"id":"315477fc.f96578","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1872.6666793823242,"y":679.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"dc230fab.264cd","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1873.6666793823242,"y":716.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"b6e44c24.9fe6e","type":"set","name":"set status DELETED","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='DELETED' />","comments":"","x":1861.6666793823242,"y":777.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"182f6475.71abbc","type":"failure","name":"failure","xml":"<outcome value=\"failure\">","comments":"","outputs":1,"x":1481.6666793823242,"y":844.3333339691162,"z":"286c7310.cdd10c","wires":[["15bfa05a.863f2"]]},{"id":"f53e9824.4d5f38","type":"outcome","name":"unsupported-method","xml":"<outcome value=\"unsupported-method\">","comments":"","outputs":1,"x":1524.6666793823242,"y":918.3333339691162,"z":"286c7310.cdd10c","wires":[["e5fc309.50a3dd"]]},{"id":"538cfad8.9862e4","type":"not-found","name":"not-found","xml":"<outcome value=\"not-found\">","comments":"","outputs":1,"x":1489.6666793823242,"y":883.3333339691162,"z":"286c7310.cdd10c","wires":[["8c3ff397.82f37"]]},{"id":"15bfa05a.863f2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1693.6666793823242,"y":844.3333339691162,"z":"286c7310.cdd10c","wires":[["f496709e.43fbc"]]},{"id":"8c3ff397.82f37","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1693.6666793823242,"y":883.3333339691162,"z":"286c7310.cdd10c","wires":[["f496709e.43fbc"]]},{"id":"e5fc309.50a3dd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1695.6666793823242,"y":919.3333339691162,"z":"286c7310.cdd10c","wires":[["f496709e.43fbc"]]},{"id":"23d2ef2a.c5e44","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1514.6666793823242,"y":1005.3333339691162,"z":"286c7310.cdd10c","wires":[["5d069c48.2ab334"]]},{"id":"b784e140.74b3c","type":"failure","name":"failure","xml":"<outcome value=\"failure\">","comments":"","outputs":1,"x":1502.6666793823242,"y":1096.3333339691162,"z":"286c7310.cdd10c","wires":[["8a1f3c9d.c900c"]]},{"id":"c08c1860.7773e8","type":"outcome","name":"unsupported-method","xml":"<outcome value=\"unsupported-method\">","comments":"","outputs":1,"x":1545.6666793823242,"y":1170.3333339691162,"z":"286c7310.cdd10c","wires":[["cef74ef4.62edc"]]},{"id":"346610a2.13765","type":"not-found","name":"not-found","xml":"<outcome value=\"not-found\">","comments":"","outputs":1,"x":1510.6666793823242,"y":1135.3333339691162,"z":"286c7310.cdd10c","wires":[["35807be9.3bb854"]]},{"id":"5d069c48.2ab334","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1712.6666793823242,"y":1008.3333339691162,"z":"286c7310.cdd10c","wires":[["98cc691b.1b1cb8","3729996d.4f1fc6"]]},{"id":"98cc691b.1b1cb8","type":"set","name":"set entitlement-key and status SUCCESS","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$entitlement-key-index].value' value='`$alts.resp.license-key`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='SUCCESS' />","comments":"","x":1960.6666793823242,"y":1008.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"8a1f3c9d.c900c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1714.6666793823242,"y":1096.3333339691162,"z":"286c7310.cdd10c","wires":[["eaeefe30.e1588"]]},{"id":"eaeefe30.e1588","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1892.6666793823242,"y":1096.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"35807be9.3bb854","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1714.6666793823242,"y":1135.3333339691162,"z":"286c7310.cdd10c","wires":[["5ede0e84.6c397"]]},{"id":"cef74ef4.62edc","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1716.6666793823242,"y":1171.3333339691162,"z":"286c7310.cdd10c","wires":[["bd143db4.1d12c"]]},{"id":"5ede0e84.6c397","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1889.6666793823242,"y":1136.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"bd143db4.1d12c","type":"set","name":"set status FAILED","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />","comments":"","x":1890.6666793823242,"y":1173.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"8eb7dea7.c2113","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1501.6666793823242,"y":1287.3333339691162,"z":"286c7310.cdd10c","wires":[["741ecc3f.a52134"]]},{"id":"741ecc3f.a52134","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1656.6666793823242,"y":1285.3333339691162,"z":"286c7310.cdd10c","wires":[["6efa3ca2.f58dd4","725a4ea7.5a349"]]},{"id":"6efa3ca2.f58dd4","type":"set","name":"set status DELETED","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='DELETED' />","comments":"","x":1887.6666793823242,"y":1272.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"a16410b2.8840c","type":"failure","name":"failure","xml":"<outcome value=\"failure\">","comments":"","outputs":1,"x":1501.6666793823242,"y":1352.3333339691162,"z":"286c7310.cdd10c","wires":[["27a345c3.b0e27a"]]},{"id":"1112b9b6.25f546","type":"outcome","name":"unsupported-method","xml":"<outcome value=\"unsupported-method\">","comments":"","outputs":1,"x":1544.6666793823242,"y":1426.3333339691162,"z":"286c7310.cdd10c","wires":[["221f98aa.763e98"]]},{"id":"d9970af0.ce0108","type":"not-found","name":"not-found","xml":"<outcome value=\"not-found\">","comments":"","outputs":1,"x":1509.6666793823242,"y":1391.3333339691162,"z":"286c7310.cdd10c","wires":[["9d83a296.d32f"]]},{"id":"27a345c3.b0e27a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1713.6666793823242,"y":1352.3333339691162,"z":"286c7310.cdd10c","wires":[["14a1ea70.6334f6"]]},{"id":"9d83a296.d32f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1713.6666793823242,"y":1391.3333339691162,"z":"286c7310.cdd10c","wires":[["14a1ea70.6334f6"]]},{"id":"221f98aa.763e98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1715.6666793823242,"y":1427.3333339691162,"z":"286c7310.cdd10c","wires":[["14a1ea70.6334f6"]]},{"id":"c63d2fea.0f0b8","type":"save","name":"save license","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"license\"\n\t\tkey=\"generic-vnf.vnf-id = $alts.vnf-id \n\t\t\tAND license.group-uuid = $alts.license-assignment-group-uuid\n\t\t\tAND license.resource-uuid = $alts.resp.license-key\"\n\tpfx=\"tmp.AnAI.license\" >\n<parameter name=\"group-uuid\" value='`$alts.license-assignment-group-uuid`' />\n<parameter name=\"resource-uuid\" value='`$alts.resp.license-key`' />\n\n\n","comments":"","outputs":1,"x":1852.6666793823242,"y":597.3333339691162,"z":"286c7310.cdd10c","wires":[["57607efc.6152","ad59e806.0d76a8"]]},{"id":"5068b14e.33c3c","type":"update","name":"update AAI","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"license\"\nkey=\"generic-vnf.vnf-id = $alts.vnf-id \"\nforce=\"true\"\nlocal-only=\"false\"\npfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"group-uuid\" value='' />\n<parameter name=\"resource-uuid\" value='' />","comments":"","outputs":1,"x":1831.6666793823242,"y":810.3333339691162,"z":"286c7310.cdd10c","wires":[["93df1a0b.5db988","db0cfc0a.61ce9"]]},{"id":"3729996d.4f1fc6","type":"save","name":"save entitlement","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"entitlement\"\n\t\tkey=\"generic-vnf.vnf-id = $alts.vnf-id  \n\t\t\tAND entitlement.group-uuid = $alts.entitlement-assignment-group-uuid \n\t\t\tAND entitlement.resource-uuid = $alts.resp.license-key \"\n\tpfx=\"tmp.AnAI.entitlement\" >\n<parameter name=\"group-uuid\" value='`$alts.entitlement-assignment-group-uuid`' />\n<parameter name=\"resource-uuid\" value='`$alts.resp.license-key`' />\n","comments":"","outputs":1,"x":1865.6666793823242,"y":1045.3333339691162,"z":"286c7310.cdd10c","wires":[["303fc7e2.a93c78","2a9836eb.3c164a"]]},{"id":"725a4ea7.5a349","type":"update","name":"update AAI","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"license\"\nkey=\"generic-vnf.vnf-id = $alts.vnf-id \"\nforce=\"true\"\nlocal-only=\"false\"\npfx=\"tmp.AnAI-data.vnf\" >\n<parameter name=\"group-uuid\" value='' />\n<parameter name=\"resource-uuid\" value='' />","comments":"","outputs":1,"x":1857.6666793823242,"y":1309.3333339691162,"z":"286c7310.cdd10c","wires":[["4ee49bdb.f1c9b4","aa45b607.0bd2d8"]]},{"id":"303fc7e2.a93c78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2083.666679382324,"y":1044.3333339691162,"z":"286c7310.cdd10c","wires":[["934c1276.49996"]]},{"id":"93df1a0b.5db988","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2061.666679382324,"y":793.3333339691162,"z":"286c7310.cdd10c","wires":[["5fc80ad3.aa6cb4"]]},{"id":"4ee49bdb.f1c9b4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2099.666679382324,"y":1306.3333339691162,"z":"286c7310.cdd10c","wires":[["b0c1f4fe.15e7d8"]]},{"id":"2a9836eb.3c164a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2099.666679382324,"y":1096.3333339691162,"z":"286c7310.cdd10c","wires":[["934c1276.49996"]]},{"id":"db0cfc0a.61ce9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2072.666679382324,"y":843.3333339691162,"z":"286c7310.cdd10c","wires":[["5fc80ad3.aa6cb4"]]},{"id":"aa45b607.0bd2d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2111.666679382324,"y":1347.3333339691162,"z":"286c7310.cdd10c","wires":[["b0c1f4fe.15e7d8"]]},{"id":"57607efc.6152","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2051.666679382324,"y":591.3333339691162,"z":"286c7310.cdd10c","wires":[["94104082.a6181"]]},{"id":"ad59e806.0d76a8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2064.666679382324,"y":643.3333339691162,"z":"286c7310.cdd10c","wires":[["94104082.a6181"]]},{"id":"94104082.a6181","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error Saving in AAI\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":2219.666679382324,"y":693.3333339691162,"z":"286c7310.cdd10c","wires":[[]]},{"id":"5fc80ad3.aa6cb4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error updating in AAI\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":2222.666679382324,"y":819.3333339691162,"z":"286c7310.cdd10c","wires":[[]]},{"id":"934c1276.49996","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error Saving in AAI\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":2267.666679382324,"y":1075.3333339691162,"z":"286c7310.cdd10c","wires":[[]]},{"id":"b0c1f4fe.15e7d8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n\t<parameter name=\"logger\" value=\"message-log\" />\n\t<parameter name=\"level\" value=\"error\" />\n\t<parameter name=\"field1\" value=\"Error updating in AAI\" />\n\t<parameter name=\"field2\" value=\"`$tmp.AnAI-data.vnf.error-code`\" />\n\t<parameter name=\"field3\" value=\"`$tmp.AnAI-data.vnf.error-message`\" />\n\t","comments":"","outputs":1,"x":2277.666679382324,"y":1307.3333339691162,"z":"286c7310.cdd10c","wires":[[]]},{"id":"f496709e.43fbc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='`$alts.error.error-code`' />\n<parameter name='error-message' value='`$alts.error.error-message`' />\n","comments":"","x":1874.6666793823242,"y":887.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"14a1ea70.6334f6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='`$alts.error.error-code`' />\n<parameter name='error-message' value='`$alts.error.error-message`' />\n","comments":"","x":1877.6666793823242,"y":1392.3333339691162,"z":"286c7310.cdd10c","wires":[]},{"id":"1cf8bf64.00b6a1","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2703.2221908569336,"y":139.34375598747283,"z":"286c7310.cdd10c","wires":[["73096ece.dfece"]]},{"id":"73096ece.dfece","type":"set","name":"set","xml":"<set>\n<parameter name='license-param-index' value='`$i`' />\n\n","comments":"","x":2855.2221908569336,"y":139.34375598747283,"z":"286c7310.cdd10c","wires":[]},{"id":"b8d5f942.c9c318","type":"comment","name":"ss.capability-name","info":"","comments":"","x":1794.7779083251953,"y":316.5660155089572,"z":"286c7310.cdd10c","wires":[]},{"id":"48988c01.f3fd04","type":"switchNode","name":"switch","xml":"<switch test='`$ss.capability-name`'>\n","comments":"","outputs":1,"x":1806.7779541015625,"y":352.56604030448943,"z":"286c7310.cdd10c","wires":[["2bc1d7ad.046dc8","daf8b9ea.446278"]]},{"id":"2bc1d7ad.046dc8","type":"outcome","name":"alts-license-assign","xml":"<outcome value='alts-license-assign'>\n","comments":"","outputs":1,"x":1979.7785301208496,"y":330.56602313835174,"z":"286c7310.cdd10c","wires":[["c6a95332.1a9ad"]]},{"id":"daf8b9ea.446278","type":"outcome","name":"alts-entitlement-assign","xml":"<outcome value='alts-entitlement-assign'>\n","comments":"","outputs":1,"x":1981.7780227661133,"y":399.566066053696,"z":"286c7310.cdd10c","wires":[["9e711467.6d1118"]]},{"id":"c6a95332.1a9ad","type":"set","name":"set","xml":"<set>\n<parameter name='param-index' value='`$license-param-index`' />\n\n","comments":"","x":2155.667537689209,"y":338.45487048942596,"z":"286c7310.cdd10c","wires":[]},{"id":"9e711467.6d1118","type":"set","name":"set","xml":"<set>\n<parameter name='param-index' value='`$entitlement-param-index`' />\n\n","comments":"","x":2163.6671981811523,"y":398.45484760124236,"z":"286c7310.cdd10c","wires":[]},{"id":"9a3ea77b.bb92e8","type":"outcome","name":"vnf-name","xml":"<outcome value='vnf_name'>\n","comments":"","outputs":1,"x":2377.555595397949,"y":489.232645300217,"z":"286c7310.cdd10c","wires":[["f80891f0.cb6ff"]]},{"id":"f80891f0.cb6ff","type":"set","name":"set alts.vnf-name","xml":"<set>\n<parameter name='alts.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />\n","comments":"","x":2705.55574798584,"y":485.2326929839328,"z":"286c7310.cdd10c","wires":[]},{"id":"546451e2.2f0fa","type":"call","name":"call","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n","comments":"","outputs":1,"x":1191.6665725708008,"y":110.34375598747283,"z":"286c7310.cdd10c","wires":[[]]},{"id":"7e527bb9.710cd4","type":"comment","name":"call self-serve-capability-param-resolution","info":"","comments":"","x":1205.6665725708008,"y":65.34374740440398,"z":"286c7310.cdd10c","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.json
deleted file mode 100755
index 7520400..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.json
+++ /dev/null
@@ -1,2328 +0,0 @@
-[
-    {
-        "id": "4534b62a.0033c8",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 113,
-        "y": 45,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "7a05ead5.ce637c"
-            ]
-        ]
-    },
-    {
-        "id": "7a05ead5.ce637c",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 371.9403991699219,
-        "y": 45.32145690917969,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "2647e8ec.6a14c"
-            ]
-        ]
-    },
-    {
-        "id": "2647e8ec.6a14c",
-        "type": "method",
-        "name": "method self-serve-create-vpe-pool",
-        "xml": "<method rpc='self-serve-create-vpe-pool' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 719,
-        "y": 46,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "503cee83.8176f8"
-            ]
-        ]
-    },
-    {
-        "id": "503cee83.8176f8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 113,
-        "y": 100,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "de9c8b6c.c3b64",
-                "99fdb9f2.2f945",
-                "c13ead81.c0e778",
-                "eaf68797.b01bc",
-                "27117daa.dba1e2",
-                "13ecc592.3b82d2",
-                "546765f8.01c9d4",
-                "eb7cce81.86bd1",
-                "c8df7eb8.019278",
-                "f9bd328a.55cf5"
-            ]
-        ]
-    },
-    {
-        "id": "5dbeb8a.df29948",
-        "type": "comment",
-        "name": "Validate inputs",
-        "info": "ss.capability-action should be \"ASSIGN\" or \"\"UNASSIGN\"",
-        "comments": "",
-        "x": 174,
-        "y": 144,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "92bd17b7.0c46a8",
-        "type": "comment",
-        "name": "Call self-service-capability-param-resolution DG to resolve all resource-keys",
-        "info": "",
-        "comments": "",
-        "x": 357,
-        "y": 507,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "de9c8b6c.c3b64",
-        "type": "switchNode",
-        "name": "switch ss.capability-name",
-        "xml": "<switch test=\"`$ss.capability-name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 211,
-        "y": 187,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3491d387.547e6c",
-                "890817a5.8f931",
-                "8e36d7b3.d9984",
-                "239e4d46.dfcafa"
-            ]
-        ]
-    },
-    {
-        "id": "3491d387.547e6c",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 485,
-        "y": 160,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "9008977d.b80888"
-            ]
-        ]
-    },
-    {
-        "id": "890817a5.8f931",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 475,
-        "y": 200,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8e36d7b3.d9984",
-        "type": "other",
-        "name": "create-vpe-pool",
-        "xml": "<outcome value='create-vpe-pool'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 504,
-        "y": 241,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "7cbc5e7f.dcaa08"
-            ]
-        ]
-    },
-    {
-        "id": "d27f0dd0.d782b8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='ss.capability-name is not set' />\n",
-        "comments": "",
-        "x": 778,
-        "y": 198,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "7cbc5e7f.dcaa08",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: ss.capability-name is create-vpe-pool\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 686,
-        "y": 241,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c13ead81.c0e778",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 169,
-        "y": 553,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "46e56c5.9035194",
-                "85646572.de6908",
-                "c7b75a78.cb6188"
-            ]
-        ]
-    },
-    {
-        "id": "85646572.de6908",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: call self-service-capability-param-resolution DG\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 196,
-        "y": 612,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "46e56c5.9035194",
-        "type": "set",
-        "name": "set variables for calling capability-param-resolution",
-        "xml": "<set>\n<!--<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />-->",
-        "comments": "",
-        "x": 332.6904296875,
-        "y": 656.3095703125,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "c7b75a78.cb6188",
-        "type": "call",
-        "name": "call GR-API:self-serve-capability-param-resolution",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 329.023681640625,
-        "y": 702.976318359375,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "630eb235.4fcc04",
-                "d749593f.703798"
-            ]
-        ]
-    },
-    {
-        "id": "630eb235.4fcc04",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 643.7379760742188,
-        "y": 679.83349609375,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "963fb7d6.2c2aa8"
-            ]
-        ]
-    },
-    {
-        "id": "d749593f.703798",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 647.0713259379067,
-        "y": 731.5001392364502,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "867349fd.5443f8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='402' />\n<parameter name='error-message' value='Failure calling self-service-capability-param-resolution' />\n",
-        "comments": "",
-        "x": 933,
-        "y": 702,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "4e6b2cfc.9d7fb4",
-        "type": "comment",
-        "name": "Loop thru vf-module-params for first match with ss.capability-name",
-        "info": "Loop thru service-data.vnfs.vnf[].vnf-data.vf-modules.vf-module[].vf-module-data.vf-module-topology.vf-module-parameters.param_length \nto find the FIRST occurrence of resource-resolution-data.capability-name=$ss.capability-name",
-        "comments": "",
-        "x": 329,
-        "y": 827,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "cdb056c2.bd8168",
-        "type": "for",
-        "name": "for each vf-module-parameters",
-        "xml": "<for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 298,
-        "y": 969,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "d3289bd.0ace4e8",
-                "f99cdaa9.49bcf"
-            ]
-        ]
-    },
-    {
-        "id": "f99cdaa9.49bcf",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: vf-module-param-index\"/>\n<parameter name=\"field3\" value='`$vf-module-param-index`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 511,
-        "y": 969,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d3289bd.0ace4e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 280,
-        "y": 1018,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "ff56c1ad.2c3698",
-                "78e47ce9.18fdd4"
-            ]
-        ]
-    },
-    {
-        "id": "eaf68797.b01bc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 168,
-        "y": 873,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "bc4daf9c.37fce8",
-                "cdb056c2.bd8168"
-            ]
-        ]
-    },
-    {
-        "id": "bc4daf9c.37fce8",
-        "type": "set",
-        "name": "set vf-module-parameters-length",
-        "xml": "<set>\n<parameter name='tmp.vf-module-parameters-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />\n",
-        "comments": "",
-        "x": 305,
-        "y": 925,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "ff56c1ad.2c3698",
-        "type": "set",
-        "name": "set vfModuleParamsCapabilityName",
-        "xml": "<set>\n<parameter name='vfModuleParamsCapabilityName' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.capability-name`'  />\n",
-        "comments": "",
-        "x": 392,
-        "y": 1061,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "78e47ce9.18fdd4",
-        "type": "switchNode",
-        "name": "switch compare vfModuleParamsCapabilityName and ss.capability-name",
-        "xml": "<switch test=\"`$ss.capability-name == $vfModuleParamsCapabilityName`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 500,
-        "y": 1107,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "5e15f413.886734",
-                "54889e93.08cfd"
-            ]
-        ]
-    },
-    {
-        "id": "4f851f72.ef71",
-        "type": "comment",
-        "name": "Loop thru vf-module-params for first match with ss.capability-name",
-        "info": "Loop thru service-data.vnfs.vnf[].vnf-data.vf-modules.vf-module[].vf-module-data.vf-module-topology.vf-module-parameters.param_length \nto find the FIRST occurrence of resource-resolution-data.capability-name=$ss.capability-name",
-        "comments": "",
-        "x": 795,
-        "y": 1062,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "5e15f413.886734",
-        "type": "outcome",
-        "name": "outcome:ss.capability-name match",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402,
-        "y": 1155,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "6251def8.2a4a3"
-            ]
-        ]
-    },
-    {
-        "id": "54889e93.08cfd",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 312,
-        "y": 1196,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3af8c92.ef95d36",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: Found ss.capability-name MATCH\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 748,
-        "y": 1155,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6251def8.2a4a3",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 616,
-        "y": 1155,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3af8c92.ef95d36",
-                "ae5a5639.5744d8",
-                "5ed86630.38f02"
-            ]
-        ]
-    },
-    {
-        "id": "935133ca.0f9a08",
-        "type": "comment",
-        "name": "Break the loop",
-        "info": "",
-        "comments": "",
-        "x": 638,
-        "y": 1249,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "ae5a5639.5744d8",
-        "type": "set",
-        "name": "set resource-resolution-data",
-        "xml": "<set>\n<parameter name='tmp.resource-resolution-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.`'  />\n",
-        "comments": "",
-        "x": 684,
-        "y": 1203,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "37bb96ea.400b92",
-        "type": "set",
-        "name": "set mac-address-assign test data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' value='5' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].name' value='vmxvpfe_sriov41_0_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].name' value='vmxvpfe_sriov41_1_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].name' value='vmxvpfe_sriov41_3_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].name' value='vmxvpfe_sriov41_4_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key[0].value' value='vnfname' />",
-        "comments": "",
-        "x": 725,
-        "y": 590,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "ed958c35.488fe8",
-        "type": "comment",
-        "name": "Set temporary test data * TEST-ONLY *",
-        "info": "",
-        "comments": "",
-        "x": 740,
-        "y": 549,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "28edf8b5.2c3db",
-        "type": "set",
-        "name": "set create-vpe-pool test data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].name' value='create-vpe-pool' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].value' value='somestatus' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.capability-name' value='create-vpe-pool' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key_length' value='19' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[0].name' value='vpe_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[0].value' value='test-vpe_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[1].name' value='ipv4_oam_address' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[1].value' value='tst-ipv4_oam_address' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[2].name' value='loopback0' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[2].value' value='test-loopback0' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[3].name' value='provisioning_status' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[3].value' value='tst-provst' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[4].name' value='aic_site_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[4].value' value='test-aic_site_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[5].name' value='avaiablity_zone' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[5].value' value='test-avaiablity_zone' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[6].name' value='vlan_id_outer' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[6].value' value='test-vlan_id_outer' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[7].name' value='vendor' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[7].value' value='test-vendor' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[8].name' value='physical_intf_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[8].value' value='test-physical_intf_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[9].name' value='phyiscal_intf_speed' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[9].value' value='tst-phyiscal_intf_sp' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[10].name' value='phyiscal_intf_units' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[10].value' value='tst-phyiscal_intf_un' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[11].name' value='vpe_uuid' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[11].value' value='test-vpe_uuid' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[12].name' value='vpe_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[12].value' value='test-vpe_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[13].name' value='image_filename' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[13].value' value='test-image_filename' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[14].name' value='as_number' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[14].value' value='test-as_number' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[15].name' value='loopback5000' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[15].value' value='tst-loopback5000' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[16].name' value='loopback10' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[16].value' value='test-loopback10' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[17].name' value='aic_version' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[17].value' value='test-aic_version' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[18].name' value='vpe_capacity' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[18].value' value='100' />\n",
-        "comments": "",
-        "x": 712,
-        "y": 631,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "5ed86630.38f02",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 617,
-        "y": 1291,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "99fdb9f2.2f945",
-        "type": "switchNode",
-        "name": "switch ss.capability-action",
-        "xml": "<switch test=\"`$ss.capability-action`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 208,
-        "y": 306,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "51a6f3d9.ba4064",
-                "bf226ecf.177898",
-                "804143e4.a2a6d",
-                "57a6057b.72faf4",
-                "4d204a31.38d4cc"
-            ]
-        ]
-    },
-    {
-        "id": "51a6f3d9.ba4064",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 474,
-        "y": 289,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bf226ecf.177898",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 481,
-        "y": 329,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "6e4e60bf.f142d8"
-            ]
-        ]
-    },
-    {
-        "id": "804143e4.a2a6d",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 471,
-        "y": 369,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "57a6057b.72faf4",
-        "type": "other",
-        "name": "ASSIGN ",
-        "xml": "<outcome value='ASSIGN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 477,
-        "y": 410,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "b6205956.40afb"
-            ]
-        ]
-    },
-    {
-        "id": "e432c299.0f0f28",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='ss.capability-action is not set' />\n",
-        "comments": "",
-        "x": 789,
-        "y": 364,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "4d204a31.38d4cc",
-        "type": "other",
-        "name": "UNASSIGN ",
-        "xml": "<outcome value='UNASSIGN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 485,
-        "y": 453,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "8351b502.234138"
-            ]
-        ]
-    },
-    {
-        "id": "b6205956.40afb",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: ss.capability-action is ASSIGN\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 685,
-        "y": 410,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8351b502.234138",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: ss.capability-action is UNASSIGN\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 686,
-        "y": 453,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "239e4d46.dfcafa",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 478,
-        "y": 120,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "91e411ed.601ec",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 254,
-        "y": 2710,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "20069b21.adf8ac",
-                "34555459.6b4624",
-                "ffb1fa3.6af7988"
-            ]
-        ]
-    },
-    {
-        "id": "b8a23aae.17bdd8",
-        "type": "comment",
-        "name": "Resolve VPE Pool values",
-        "info": "",
-        "comments": "",
-        "x": 284,
-        "y": 2667,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "20069b21.adf8ac",
-        "type": "set",
-        "name": "set resource-key-length and resource-names",
-        "xml": "<set>\n<parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />\n<!-- String to build VPE_POOL table SQL insert statement -->\n<parameter name='tmp.resource-insert-columns' value='' />\n<parameter name='tmp.resource-insert-values' value='' />\n\n<!-- These are the resources to insert into VPE_POOL -->\n<parameter name='tmp.resource-names-length' value='19' />\n<parameter name='tmp.resource-names[0]' value='vpe_name' />\n<parameter name='tmp.resource-names[1]' value='ipv4_oam_address' />\n<parameter name='tmp.resource-names[2]' value='loopback0' />\n<parameter name='tmp.resource-names[3]' value='provisioning_status' />\n<parameter name='tmp.resource-names[4]' value='aic_site_id' />\n<parameter name='tmp.resource-names[5]' value='avaiablity_zone' />\n<parameter name='tmp.resource-names[6]' value='vlan_id_outer' />\n<parameter name='tmp.resource-names[7]' value='vendor' />\n<parameter name='tmp.resource-names[8]' value='physical_intf_name' />\n<parameter name='tmp.resource-names[9]' value='phyiscal_intf_speed' />\n<parameter name='tmp.resource-names[10]' value='phyiscal_intf_units' />\n<parameter name='tmp.resource-names[11]' value='vpe_uuid' />\n<parameter name='tmp.resource-names[12]' value='vpe_id' />\n<parameter name='tmp.resource-names[13]' value='image_filename' />\n<parameter name='tmp.resource-names[14]' value='as_number' />\n<parameter name='tmp.resource-names[15]' value='loopback5000' />\n<parameter name='tmp.resource-names[16]' value='loopback10' />\n<parameter name='tmp.resource-names[17]' value='aic_version' />\n<parameter name='tmp.resource-names[18]' value='vpe_capacity' />",
-        "comments": "",
-        "x": 418,
-        "y": 2756,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "d02fec38.4a3bd8",
-        "type": "for",
-        "name": "for each resource-resolution-data.resource-key",
-        "xml": "<for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 488,
-        "y": 2890,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3e860650.abc54a",
-                "39809c07.8a4b44"
-            ]
-        ]
-    },
-    {
-        "id": "3e860650.abc54a",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: key-index, resource-key.name, resource-names\"/>\n<parameter name=\"field3\" value='`$key-index`'/>\n<parameter name=\"field4\" value='`$tmp.resource-resolution-data.resource-key[$key-index].name`'/>\n<parameter name=\"field5\" value='`$tmp.resource-names[$names-index]`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 755,
-        "y": 2890,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "39809c07.8a4b44",
-        "type": "switchNode",
-        "name": "switch compare resource-key.name and resource-names",
-        "xml": "<switch test=\"`$tmp.resource-resolution-data.resource-key[$key-index].name == $tmp.resource-names[$names-index]`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 568,
-        "y": 2937,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "43368a98.e5b24c"
-            ]
-        ]
-    },
-    {
-        "id": "e18888c7.6778b",
-        "type": "comment",
-        "name": "Build columns and values strings",
-        "info": "",
-        "comments": "",
-        "x": 397,
-        "y": 2847,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "34555459.6b4624",
-        "type": "for",
-        "name": "for each resource-names",
-        "xml": "<for index='names-index' start='0' end='`$tmp.resource-names-length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 354,
-        "y": 2799,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "d02fec38.4a3bd8"
-            ]
-        ]
-    },
-    {
-        "id": "1089c774.03e0b1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 569,
-        "y": 2985,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "b37957ef.f9d81",
-                "4078f5a8.f4aaa4",
-                "edf7fcc4.ef8d2",
-                "2cd22eed.f6755a"
-            ]
-        ]
-    },
-    {
-        "id": "b37957ef.f9d81",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: resource-name MATCH: \"/>\n<parameter name=\"field3\" value='`$tmp.resource-names[$names-index]`'/>\n<parameter name=\"field4\" value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 701,
-        "y": 2985,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "27117daa.dba1e2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 160,
-        "y": 1643,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "74720eac.e8091",
-                "1cce86c8.2baf29",
-                "7f26f3a2.7b72b4"
-            ]
-        ]
-    },
-    {
-        "id": "84f2d99e.bebab",
-        "type": "comment",
-        "name": "Resolve vpe-name",
-        "info": "service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters[$vf-module-params-index].param.resource-resolution-data.resource-key[$key-index].value \nwhere its corresponding resource-key[$key-index].name=vnf-name",
-        "comments": "",
-        "x": 167,
-        "y": 1598,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "74720eac.e8091",
-        "type": "set",
-        "name": "set resource-key-length",
-        "xml": "<set>\n<parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />\n",
-        "comments": "",
-        "x": 248,
-        "y": 1688,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "1cce86c8.2baf29",
-        "type": "for",
-        "name": "for each resource-resolution-data.resource-key",
-        "xml": "<for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 321,
-        "y": 1733,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "99568978.f411d8",
-                "17d7d5e9.8d97ca"
-            ]
-        ]
-    },
-    {
-        "id": "17d7d5e9.8d97ca",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: key-index\"/>\n<parameter name=\"field3\" value='`$key-index`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 588,
-        "y": 1733,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "99568978.f411d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 251,
-        "y": 1782,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "bbf5f08d.176578"
-            ]
-        ]
-    },
-    {
-        "id": "bbf5f08d.176578",
-        "type": "switchNode",
-        "name": "switch compare resource-key.name and \"vpe_name\"",
-        "xml": "<switch test=\"`$tmp.resource-resolution-data.resource-key[$key-index].name == 'vpe_name'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 420,
-        "y": 1829,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "de8dbfd6.ba15f8",
-                "9d54b52e.f1d638"
-            ]
-        ]
-    },
-    {
-        "id": "de8dbfd6.ba15f8",
-        "type": "outcome",
-        "name": "outcome:found vpe_name resource key",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 397,
-        "y": 1876,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "d44085fb.76d7b8"
-            ]
-        ]
-    },
-    {
-        "id": "9d54b52e.f1d638",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 297,
-        "y": 1917,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d44085fb.76d7b8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 617,
-        "y": 1876,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "7c52e694.0f96f8",
-                "c1b2f560.f3bbb8",
-                "483e4765.4f9ea8",
-                "5d97585d.b7677"
-            ]
-        ]
-    },
-    {
-        "id": "7c52e694.0f96f8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: Found resource-resolution-data.name = vpe_name\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 745,
-        "y": 1876,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c1b2f560.f3bbb8",
-        "type": "set",
-        "name": "set vpe_name",
-        "xml": "<set>\n<parameter name='tmp.vpe_name' value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'  />\n",
-        "comments": "",
-        "x": 639,
-        "y": 1924,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "7f26f3a2.7b72b4",
-        "type": "switchNode",
-        "name": "switch validate resolved vpe_name",
-        "xml": "<switch test=\"`$tmp.vpe_name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 287,
-        "y": 2078,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "cc6e440.5c4294",
-                "5ca35655.03c278"
-            ]
-        ]
-    },
-    {
-        "id": "cc6e440.5c4294",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 520,
-        "y": 2058,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "57d33721.74c88"
-            ]
-        ]
-    },
-    {
-        "id": "5ca35655.03c278",
-        "type": "other",
-        "name": "blank",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 522,
-        "y": 2098,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "57d33721.74c88"
-            ]
-        ]
-    },
-    {
-        "id": "f026ea2a.ffec9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='403' />\n<parameter name='error-message' value='vpe_name is not valid' />\n",
-        "comments": "",
-        "x": 804,
-        "y": 2116,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "483e4765.4f9ea8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: resolved vpe_name: \"/>\n<parameter name=\"field3\" value='`$tmp.vpe_name`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 617,
-        "y": 1970,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "43368a98.e5b24c",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 444,
-        "y": 2985,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "1089c774.03e0b1"
-            ]
-        ]
-    },
-    {
-        "id": "cbc54dd3.c3792",
-        "type": "set",
-        "name": "set columns and values",
-        "xml": "<set>\n<parameter name='tmp.insert-columns' value=\"`$tmp.insert-columns + ', ' + $tmp.resource-resolution-data.resource-key[$key-index].name`\"  />\n<parameter name='tmp.insert-values' value=\"`$tmp.insert-values + ', ' + $tmp.resource-resolution-data.resource-key[$key-index].value`\"  />",
-        "comments": "",
-        "x": 946,
-        "y": 3118,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "13ecc592.3b82d2",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/self-serve-create-vpe-pool.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 130,
-        "y": 3902,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "546765f8.01c9d4",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`\" value='SUCCESS'  />",
-        "comments": "",
-        "x": 138,
-        "y": 3955,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "69595241.f29c74",
-        "type": "comment",
-        "name": "Check for existing data in VPE_POOL for vpe_name",
-        "info": "",
-        "comments": "",
-        "x": 275,
-        "y": 2142,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "294d3284.6857ee",
-        "type": "get-resource",
-        "name": "get data from VPE_POOL for vpe_name",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"select * FROM VPE_POOL WHERE vpe_name= $tmp.vpe_name\" pfx='tmp.vpe_pool_data'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 280,
-        "y": 2244,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "1da4e742.717111"
-            ]
-        ]
-    },
-    {
-        "id": "1da4e742.717111",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 529,
-        "y": 2244,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "cfb10318.efa7a8"
-            ]
-        ]
-    },
-    {
-        "id": "b3d7a743.ee6ad",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Unable to access VPE_POOL' />\n",
-        "comments": "",
-        "x": 847.5,
-        "y": 2283,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "2098d78a.a044f",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 537.5,
-        "y": 2283,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "bde979aa.39f228"
-            ]
-        ]
-    },
-    {
-        "id": "f94b6f4b.d2e2d8",
-        "type": "outcome",
-        "name": "outcome Null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 548.5,
-        "y": 2323,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "bde979aa.39f228"
-            ]
-        ]
-    },
-    {
-        "id": "14105a75.20b366",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 528.5,
-        "y": 2363,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "2b9fef4a.a1e4e"
-            ]
-        ]
-    },
-    {
-        "id": "bde979aa.39f228",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: data not found in VPE_POOL for vpe_name: \"/>\n<parameter name=\"field3\" value='`$tmp.vpe_name`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 696,
-        "y": 2298,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f1ea0821.6855a8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: data already found in VPE_POOL for vpe_name: \"/>\n<parameter name=\"field3\" value='`$tmp.vpe_name`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 700,
-        "y": 2414,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5d97585d.b7677",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 613,
-        "y": 2016,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "7b98ca0c.853304",
-        "type": "switchNode",
-        "name": "switch vpe_name exists",
-        "xml": "<switch test=\"`$tmp.vpe_pool_data.vpe-name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 226,
-        "y": 2295,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "2098d78a.a044f",
-                "f94b6f4b.d2e2d8",
-                "14105a75.20b366"
-            ]
-        ]
-    },
-    {
-        "id": "eb7cce81.86bd1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 159,
-        "y": 2185,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "294d3284.6857ee",
-                "7b98ca0c.853304"
-            ]
-        ]
-    },
-    {
-        "id": "c8df7eb8.019278",
-        "type": "switchNode",
-        "name": "switch ss.capability-action (ASSIGN | UNASSIGN)",
-        "xml": "<switch test='`$ss.capability-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 270,
-        "y": 2572,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "99ac43a3.c1fae",
-                "359e81ed.5a47fe"
-            ]
-        ]
-    },
-    {
-        "id": "99ac43a3.c1fae",
-        "type": "outcome",
-        "name": "ASSIGN",
-        "xml": "<outcome value='ASSIGN'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 207.25006103515625,
-        "y": 2622.75,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "91e411ed.601ec"
-            ]
-        ]
-    },
-    {
-        "id": "359e81ed.5a47fe",
-        "type": "outcome",
-        "name": "UNASSIGN",
-        "xml": "<outcome value='UNASSIGN'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 209,
-        "y": 3498,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "45cf3e66.241778"
-            ]
-        ]
-    },
-    {
-        "id": "2b9fef4a.a1e4e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 657,
-        "y": 2363,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "f1ea0821.6855a8",
-                "ea2c03c3.b2fef8"
-            ]
-        ]
-    },
-    {
-        "id": "ea2c03c3.b2fef8",
-        "type": "switchNode",
-        "name": "switch ss.capability-action ASSIGN",
-        "xml": "<switch test=\"`$ss.capability-action == 'ASSIGN'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 829,
-        "y": 2458,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "1c52eb95.b0c844"
-            ]
-        ]
-    },
-    {
-        "id": "22a167de.0964a8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Unable to create vpe-pool, data already exists in VPE_POOL for vpe_name' />\n",
-        "comments": "",
-        "x": 1099,
-        "y": 2540,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "1c52eb95.b0c844",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 792,
-        "y": 2498,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "374c7d51.1a40c2"
-            ]
-        ]
-    },
-    {
-        "id": "4078f5a8.f4aaa4",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 705,
-        "y": 3246,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "edf7fcc4.ef8d2",
-        "type": "switchNode",
-        "name": "switch tmp.insert-columns",
-        "xml": "<switch test=\"`$tmp.insert-columns`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 763,
-        "y": 3032,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3ebba126.b9806e",
-                "ed0efd94.fd06d8"
-            ]
-        ]
-    },
-    {
-        "id": "3ebba126.b9806e",
-        "type": "other",
-        "name": "blank",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 764,
-        "y": 3074,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3b572857.69d0c"
-            ]
-        ]
-    },
-    {
-        "id": "ed0efd94.fd06d8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 765,
-        "y": 3118,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "cbc54dd3.c3792"
-            ]
-        ]
-    },
-    {
-        "id": "3b572857.69d0c",
-        "type": "set",
-        "name": "set first columns and values",
-        "xml": "<set>\n<parameter name='tmp.insert-columns' value=\"`$tmp.resource-resolution-data.resource-key[$key-index].name`\"  />\n<parameter name='tmp.insert-values' value=\"$tmp.resource-resolution-data.resource-key[$key-index].value`\"  />",
-        "comments": "",
-        "x": 960,
-        "y": 3074,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "89f81f53.517388",
-        "type": "comment",
-        "name": "Insert resolved values into VPE_POOL",
-        "info": "",
-        "comments": "",
-        "x": 371,
-        "y": 3329,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "ffb1fa3.6af7988",
-        "type": "save",
-        "name": "save",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" \nresource=\"SQL\" \nkey=\"INSERT INTO VPE_POOL ( vpe_name, ipv4_oam_address, loopback0_ipv4_address, provisioning_status, aic_site_id, availability_zone, vlan_id_outer, vendor, physical_intf_name, physical_intf_speed, physical_intf_units, vpe_uuid, vpe_id, image_filename, as_number, loopback5000, loopback10, aic_version, vpe_capacity ) \nVALUES ( $tmp.forInsert.vpe_name , $tmp.forInsert.ipv4_oam_address , $tmp.forInsert.loopback0_ipv4_address , $tmp.forInsert.provisioning_status , $tmp.forInsert.aic_site_id , $tmp.forInsert.availability_zone , $tmp.forInsert.vlan_id_outer , $tmp.forInsert.vendor , $tmp.forInsert.physical_intf_name , $tmp.forInsert.physical_intf_speed , $tmp.forInsert.physical_intf_units , $tmp.forInsert.vpe_uuid , $tmp.forInsert.vpe_id , $tmp.forInsert.image_filename , $tmp.forInsert.as_number , $tmp.forInsert.loopback5000 , $tmp.forInsert.loopback10 , $tmp.forInsert.aic_version , $tmp.forInsert.vpe_capacity )\" \nforce='true' pfx='save_val'>\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 278,
-        "y": 3381,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "b95bb1f3.324a48"
-            ]
-        ]
-    },
-    {
-        "id": "b95bb1f3.324a48",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 412,
-        "y": 3381,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "d28ef98d.b2a44"
-            ]
-        ]
-    },
-    {
-        "id": "de7ed095.f4a8f8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='406' />\n<parameter name='error-message' value='Unable to create VPE Pool in VPE_POOL' />\n",
-        "comments": "",
-        "x": 691,
-        "y": 3421,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "9f8ca216.d79298",
-        "type": "save",
-        "name": "save",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" \nresource=\"SQL\" \nkey=\"INSERT INTO VPE_POOL ( $tmp.insert-columns ) VALUES ( $tmp.insert-values )\" \nforce='true' pfx='save_val'>\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 278,
-        "y": 3430,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2cd22eed.f6755a",
-        "type": "set",
-        "name": "set tmp.resource-key.name",
-        "xml": "<set>\n<parameter name=\"`'tmp.forInsert.' + $tmp.resource-resolution-data.resource-key[$key-index].name`\" value=\"`$tmp.resource-resolution-data.resource-key[$key-index].value`\"  />",
-        "comments": "",
-        "x": 769,
-        "y": 3188,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "50e7ff75.38e8e",
-        "type": "delete",
-        "name": "delete",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='DELETE from VPE_POOL WHERE vpe_name = $tmp.vpe_name'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 711,
-        "y": 3797,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "8805f26.95ae01",
-                "361cc9e5.7908be"
-            ]
-        ]
-    },
-    {
-        "id": "45cf3e66.241778",
-        "type": "block",
-        "name": "block:atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 267,
-        "y": 3589,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "a7b7a82e.0ddd5",
-                "30f5b9b8.788d4e"
-            ]
-        ]
-    },
-    {
-        "id": "bdbd06b6.1319d",
-        "type": "comment",
-        "name": "DELETE from VPE_POOL",
-        "info": "",
-        "comments": "",
-        "x": 306.5,
-        "y": 3549,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "a7b7a82e.0ddd5",
-        "type": "get-resource",
-        "name": "get vpe_name from pool table",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"select * FROM VPE_POOL WHERE vpe_name= $tmp.vpe_name\" pfx='tmp.pool'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 355,
-        "y": 3632,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "4fe3bd5f.f807ec"
-            ]
-        ]
-    },
-    {
-        "id": "4fe3bd5f.f807ec",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 555,
-        "y": 3632,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "a011ef73.5c281"
-            ]
-        ]
-    },
-    {
-        "id": "30f5b9b8.788d4e",
-        "type": "switchNode",
-        "name": "switch vpe_name exists",
-        "xml": "<switch test=\"`$tmp.pool.vpe-name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 339,
-        "y": 3737,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3b6ead82.52270a",
-                "5ef97d56.ec95c4",
-                "e3a81c03.b5c238",
-                "b82ac555.c7005"
-            ]
-        ]
-    },
-    {
-        "id": "b82ac555.c7005",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 557.5,
-        "y": 3677,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "a011ef73.5c281"
-            ]
-        ]
-    },
-    {
-        "id": "3b6ead82.52270a",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 566.5,
-        "y": 3717,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "a011ef73.5c281"
-            ]
-        ]
-    },
-    {
-        "id": "5ef97d56.ec95c4",
-        "type": "outcome",
-        "name": "outcome Null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 577.5,
-        "y": 3757,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "a011ef73.5c281"
-            ]
-        ]
-    },
-    {
-        "id": "e3a81c03.b5c238",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 557.5,
-        "y": 3797,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "50e7ff75.38e8e"
-            ]
-        ]
-    },
-    {
-        "id": "1af82fe3.29d68",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='vpe_name not found in VPE_POOL on UNASSIGN operation' />\n",
-        "comments": "",
-        "x": 858,
-        "y": 3714,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "361cc9e5.7908be",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 840,
-        "y": 3820,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "2ab614f1.660744"
-            ]
-        ]
-    },
-    {
-        "id": "8805f26.95ae01",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 841,
-        "y": 3760,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "c4913f09.63c2d"
-            ]
-        ]
-    },
-    {
-        "id": "c258faf4.dff23",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Failure deleting from VPE_POOL on UNASSIGN operation' />\n",
-        "comments": "",
-        "x": 1131,
-        "y": 3802,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "9008977d.b80888",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 622,
-        "y": 160,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "9d1d3472.daf75",
-                "d27f0dd0.d782b8"
-            ]
-        ]
-    },
-    {
-        "id": "9d1d3472.daf75",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: ss.capability-name is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 762,
-        "y": 119,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ccfd8640.725448",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 803,
-        "y": 157,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "6e4e60bf.f142d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 627,
-        "y": 329,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "bed57743.8cbc28",
-                "e432c299.0f0f28"
-            ]
-        ]
-    },
-    {
-        "id": "bed57743.8cbc28",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: ss.capability-action is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771,
-        "y": 287,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f42dc9c0.9c12d",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 812,
-        "y": 325,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "963fb7d6.2c2aa8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 770,
-        "y": 680,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "867349fd.5443f8",
-                "1077b388.6815bc"
-            ]
-        ]
-    },
-    {
-        "id": "1077b388.6815bc",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: Failure calling self-service-capability-param-resolution\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 921,
-        "y": 660,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4bc9e9ef.c448b8",
-        "type": "comment",
-        "name": "Check that resource-resolution-data.status is PENDING",
-        "info": "",
-        "comments": "",
-        "x": 279,
-        "y": 1375,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "f9bd328a.55cf5",
-        "type": "switchNode",
-        "name": "switch tmp.resource-resolution-data = PENDING",
-        "xml": "<switch test=\"`$tmp.resource-resolution-data.status == 'PENDING'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 271,
-        "y": 1433,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "cedd9352.77b15"
-            ]
-        ]
-    },
-    {
-        "id": "b4753dc3.c135a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 739,
-        "y": 1433,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "fd3f2609.5162a8",
-                "57a3bfbb.33e0a",
-                "5b1bbbb2.7d9f7c"
-            ]
-        ]
-    },
-    {
-        "id": "fd3f2609.5162a8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-create-vpe-pool: reseouce-resolution-data.status is not PENDING\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 879,
-        "y": 1393,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5b1bbbb2.7d9f7c",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 920,
-        "y": 1432,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "57a3bfbb.33e0a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='reseouce-resolution-data.status is not PENDING' />\n",
-        "comments": "",
-        "x": 896,
-        "y": 1471,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "cedd9352.77b15",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 575,
-        "y": 1433,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "b4753dc3.c135a"
-            ]
-        ]
-    },
-    {
-        "id": "57d33721.74c88",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 650,
-        "y": 2076,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "9eeec8b6.872078",
-                "b6aebe10.5b93c8",
-                "f026ea2a.ffec9"
-            ]
-        ]
-    },
-    {
-        "id": "9eeec8b6.872078",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: hostname is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 786,
-        "y": 2037,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b6aebe10.5b93c8",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 828,
-        "y": 2076,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "cfb10318.efa7a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 694,
-        "y": 2244,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "44af3fd2.4cc85",
-                "625ab694.effa98",
-                "b3d7a743.ee6ad"
-            ]
-        ]
-    },
-    {
-        "id": "44af3fd2.4cc85",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Unable to access VPE_POOL\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 830,
-        "y": 2205,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "625ab694.effa98",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 872,
-        "y": 2244,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "374c7d51.1a40c2",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 945,
-        "y": 2498,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "af4cc180.28d64",
-                "c0442851.32aa2",
-                "22a167de.0964a8"
-            ]
-        ]
-    },
-    {
-        "id": "af4cc180.28d64",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Unable to create vpe-pool, data already exists in VPE_POOL for vpe_name\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1081,
-        "y": 2459,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c0442851.32aa2",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1123,
-        "y": 2498,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "d28ef98d.b2a44",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 538,
-        "y": 3381,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "3d595e87.2866c2",
-                "223ac79b.e692c8",
-                "de7ed095.f4a8f8"
-            ]
-        ]
-    },
-    {
-        "id": "3d595e87.2866c2",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Unable to create VPE Pool in VPE_POOL\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 674,
-        "y": 3343,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "223ac79b.e692c8",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 716,
-        "y": 3382,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "a011ef73.5c281",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 706,
-        "y": 3675,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "f50e6005.530ab8",
-                "dd9f0de.8b146f",
-                "1af82fe3.29d68"
-            ]
-        ]
-    },
-    {
-        "id": "f50e6005.530ab8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: vpe_name not found in VPE_POOL on UNASSIGN operation\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 842,
-        "y": 3637,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dd9f0de.8b146f",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 884,
-        "y": 3676,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "2ab614f1.660744",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 877,
-        "y": 3863,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "8f32cb91.5f4af8"
-            ]
-        ]
-    },
-    {
-        "id": "8f32cb91.5f4af8",
-        "type": "for",
-        "name": "for each resource-resolution-data.resource-key",
-        "xml": "<for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1034,
-        "y": 3910,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "b671c06.3447f4"
-            ]
-        ]
-    },
-    {
-        "id": "b671c06.3447f4",
-        "type": "set",
-        "name": "set vf-module-parameters.param.value to assigned mac address",
-        "xml": "<set>\n<parameter name=\"`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`\" value=\"DELETED\"  />\n",
-        "comments": "",
-        "x": 1121,
-        "y": 3955,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    },
-    {
-        "id": "c4913f09.63c2d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 974,
-        "y": 3760,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            [
-                "102f419a.0ee6d6",
-                "e4417126.1af178",
-                "c258faf4.dff23"
-            ]
-        ]
-    },
-    {
-        "id": "102f419a.0ee6d6",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Failure deleting from VPE_POOL on UNASSIGN operation\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1110,
-        "y": 3722,
-        "z": "9e5ae839.eee8f",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e4417126.1af178",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1152,
-        "y": 3761,
-        "z": "9e5ae839.eee8f",
-        "wires": []
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.json
deleted file mode 100644
index f433c7c..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"dc01b183.1fa72","type":"dgstart","name":"DGSTART","outputs":1,"x":105.41667175292969,"y":33.749999046325684,"z":"51788ff0.f3f71","wires":[["a152feb6.8fce7"]]},{"id":"b1e86e52.e370d","type":"method","name":"method self-serve-eipam-create-pool","xml":"<method rpc='self-serve-eipam-create-pool' mode='sync'>\n","comments":"","outputs":1,"x":204.53573608398438,"y":84.2103157043457,"z":"51788ff0.f3f71","wires":[["39b3a748.bae198"]]},{"id":"39b3a748.bae198","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":155.98812103271484,"y":137.5952672958374,"z":"51788ff0.f3f71","wires":[["c88000c5.75118","bb85d61.7d03428","7169e0b8.10a35"]]},{"id":"a152feb6.8fce7","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":378.27381896972656,"y":33.178565979003906,"z":"51788ff0.f3f71","wires":[["b1e86e52.e370d"]]},{"id":"c88000c5.75118","type":"switchNode","name":"switch: ss.capability-name","xml":"<switch test='`$ss.capability-name`'>\n","comments":"","outputs":1,"x":390.41668701171875,"y":138.91666507720947,"z":"51788ff0.f3f71","wires":[["fadcb21e.98015"]]},{"id":"fadcb21e.98015","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":615.4167098999023,"y":139.416663646698,"z":"51788ff0.f3f71","wires":[["50c3bbc1.7a6874"]]},{"id":"50c3bbc1.7a6874","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\t<parameter name=\"error-message\" value=\"ss.capability-name is null\" />\n","comments":"","x":775.333381652832,"y":139.5277624130249,"z":"51788ff0.f3f71","wires":[]},{"id":"bb85d61.7d03428","type":"switchNode","name":"switch: ss.capability-action","xml":"<switch test='`$ss.capability-action`'>\n","comments":"","outputs":1,"x":391.6667060852051,"y":188.91666555404663,"z":"51788ff0.f3f71","wires":[["4fbc549.49c59ac","e9582bd7.483748","9ca683c5.67f9f"]]},{"id":"4fbc549.49c59ac","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":615.1667022705078,"y":189.16666555404663,"z":"51788ff0.f3f71","wires":[["de9ca627.80f978"]]},{"id":"de9ca627.80f978","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\t<parameter name=\"error-message\" value=\"ss.capability-action is null\" />\n","comments":"","x":775.0833740234375,"y":189.27776432037354,"z":"51788ff0.f3f71","wires":[]},{"id":"e9582bd7.483748","type":"outcome","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":151.91668701171875,"y":392.1666717529297,"z":"51788ff0.f3f71","wires":[["c14e7948.5871c8"]]},{"id":"9fecfcc8.37d0a","type":"call","name":"call self-service-capability-param-resolution","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-service-capability-param-resolution' mode='sync' >\n","comments":"","outputs":1,"x":636.2499732971191,"y":392.33333683013916,"z":"51788ff0.f3f71","wires":[["369c4922.fba9e6"]]},{"id":"369c4922.fba9e6","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":886.2499542236328,"y":392.3333330154419,"z":"51788ff0.f3f71","wires":[["9612ddfc.dd61b"]]},{"id":"9612ddfc.dd61b","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\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n","comments":"","x":1044.9999351501465,"y":392.33332920074463,"z":"51788ff0.f3f71","wires":[]},{"id":"7a6639c0.d02f88","type":"call","name":"call process-generic-eipam-pools","xml":"<call module='GENERIC-RESOURCE-API' rpc='process-generic-eipam-pools' mode='sync' >\n","comments":"","outputs":1,"x":583.5833702087402,"y":1191.0833625793457,"z":"51788ff0.f3f71","wires":[["3da13161.eb38de"]]},{"id":"3da13161.eb38de","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":802.5833511352539,"y":1191.0833587646484,"z":"51788ff0.f3f71","wires":[["4ab268ea.a41318"]]},{"id":"4ab268ea.a41318","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\t<parameter name=\"error-message\" value=\"`'Error from process-generic-eipam-pools, ' + $error-message`\" />\n","comments":"","x":961.3333320617676,"y":1191.0833549499512,"z":"51788ff0.f3f71","wires":[]},{"id":"ae9159c2.133638","type":"set","name":"set tmp.ss.param.capability-name","xml":"<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n","comments":"","x":1045.8610191345215,"y":450.97221851348877,"z":"51788ff0.f3f71","wires":[]},{"id":"2be8936c.2edadc","type":"for","name":"for pidx in param_length","xml":"<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">","comments":"","outputs":1,"x":756.0752449035645,"y":451.0436887741089,"z":"51788ff0.f3f71","wires":[["680a659b.4465ac","ae9159c2.133638"]]},{"id":"680a659b.4465ac","type":"switchNode","name":"switch: capability-name - ss vs param","xml":"<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n","comments":"","outputs":1,"x":1057.8252449035645,"y":494.54369258880615,"z":"51788ff0.f3f71","wires":[["b2fdd2b7.4233f"]]},{"id":"b2fdd2b7.4233f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1296.575252532959,"y":494.29369258880615,"z":"51788ff0.f3f71","wires":[["34b48c65.80c2e4"]]},{"id":"21b877be.7c68d8","type":"switchNode","name":"switch: resource-key[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n","comments":"","outputs":1,"x":1061.80570602417,"y":584.1111669540405,"z":"51788ff0.f3f71","wires":[["58605dad.80f494","d4c6324a.21574","a995f25f.cfffd","b950dbe.3e67c28","1d222098.25cc4f","b91a560f.b78d08"]]},{"id":"58605dad.80f494","type":"outcome","name":"plan-name","xml":"<outcome value='plan-name'>\n","comments":"","outputs":1,"x":1322.2223854064941,"y":663.6389665603638,"z":"51788ff0.f3f71","wires":[["1b9631b7.17571e"]]},{"id":"1b9631b7.17571e","type":"set","name":"set tmp.ss.plan-name","xml":"<set>\n<parameter name='tmp.ss.plan-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1584.7223892211914,"y":663.3889684677124,"z":"51788ff0.f3f71","wires":[]},{"id":"d4c6324a.21574","type":"outcome","name":"address-family","xml":"<outcome value='address-family'>\n","comments":"","outputs":1,"x":1337.7501182556152,"y":745.2223348617554,"z":"51788ff0.f3f71","wires":[["cd71bf2c.dd688"]]},{"id":"cd71bf2c.dd688","type":"set","name":"set tmp.ss.address-family","xml":"<set>\n<parameter name='tmp.ss.address-family' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1600.0000839233398,"y":744.9723291397095,"z":"51788ff0.f3f71","wires":[]},{"id":"a995f25f.cfffd","type":"outcome","name":"service-instance-id","xml":"<outcome value='service-instance-id'>\n","comments":"","outputs":1,"x":1349.4168510437012,"y":704.0278997421265,"z":"51788ff0.f3f71","wires":[["d6b549f5.f82b28"]]},{"id":"d6b549f5.f82b28","type":"set","name":"set tmp.ss.service-instance-id","xml":"<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1609.6668586730957,"y":703.7778997421265,"z":"51788ff0.f3f71","wires":[]},{"id":"b950dbe.3e67c28","type":"outcome","name":"allocateSubnetFlag","xml":"<outcome value='allocateSubnetFlag'>\n","comments":"","outputs":1,"x":1346.3613090515137,"y":624.3057069778442,"z":"51788ff0.f3f71","wires":[["d05b3ad9.6899a8"]]},{"id":"d05b3ad9.6899a8","type":"set","name":"set tmp.ss.allocateSubnetFlag","xml":"<set>\n<parameter name='tmp.ss.allocateSubnetFlag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1606.6112480163574,"y":624.3056745529175,"z":"51788ff0.f3f71","wires":[]},{"id":"34b48c65.80c2e4","type":"break","name":"break","xml":"<break>\n","comments":"","x":1434.9721603393555,"y":494.61110496520996,"z":"51788ff0.f3f71","wires":[]},{"id":"ce1ceeb6.9028e","type":"for","name":"for kidx in resource-key_length","xml":"<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`\">","comments":"","outputs":1,"x":782.6667823791504,"y":583.9722776412964,"z":"51788ff0.f3f71","wires":[["21b877be.7c68d8"]]},{"id":"47314a96.7dcd34","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":521.3332710266113,"y":451.1666555404663,"z":"51788ff0.f3f71","wires":[["2be8936c.2edadc","ce1ceeb6.9028e","4e97b759.5fc428"]]},{"id":"4e97b759.5fc428","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n","comments":"","outputs":1,"x":707.5833015441895,"y":529.5833311080933,"z":"51788ff0.f3f71","wires":[[]]},{"id":"c14e7948.5871c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":317.5833168029785,"y":392.3333339691162,"z":"51788ff0.f3f71","wires":[["7a6639c0.d02f88","47314a96.7dcd34","2ee434f.fde96cc","2693a694.16aada","8c0e7f4b.2acf4"]]},{"id":"1d222098.25cc4f","type":"outcome","name":"mask","xml":"<outcome value='mask'>\n","comments":"","outputs":1,"x":1315.7777557373047,"y":784.1111936569214,"z":"51788ff0.f3f71","wires":[["f5bca4c2.a0a588"]]},{"id":"f5bca4c2.a0a588","type":"set","name":"set tmp.ss.mask","xml":"<set>\n<parameter name='tmp.ss.mask' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1569.0276947021484,"y":784.1111612319946,"z":"51788ff0.f3f71","wires":[]},{"id":"2693a694.16aada","type":"switchNode","name":"switch: tmp.ss.address-family","xml":"<switch test='`$tmp.ss.address-family`'>\n","comments":"","outputs":1,"x":585.0833320617676,"y":977.3333501815796,"z":"51788ff0.f3f71","wires":[["275c0da4.2622f2","9e47df3c.a8551"]]},{"id":"275c0da4.2622f2","type":"outcome","name":"ipv4","xml":"<outcome value='ipv4'>\n","comments":"","outputs":1,"x":806.3333168029785,"y":949.8333368301392,"z":"51788ff0.f3f71","wires":[["547697c6.ea0768"]]},{"id":"9e47df3c.a8551","type":"outcome","name":"ipv6","xml":"<outcome value='ipv6'>\n","comments":"","outputs":1,"x":808.8333320617676,"y":1002.3333501815796,"z":"51788ff0.f3f71","wires":[["525d923d.ffecec"]]},{"id":"547697c6.ea0768","type":"set","name":"set v4 variables for create-pool","xml":"<set>\n<parameter name='network-model.eipam-v4-address-plan' value='tmp.ss.plan-name' />\n<parameter name='network-model.use-ipv4' value='Y' />\n<parameter name='network-model.ipv4-ip-version' value='tmp.ss.address-family' />\n<parameter name='network-model.ipv4-cidr-mask' value='tmp.ss.mask' />\n","comments":"","x":1030.0833320617676,"y":949.5833520889282,"z":"51788ff0.f3f71","wires":[]},{"id":"525d923d.ffecec","type":"set","name":"set v6 variables for create-pool","xml":"<set>\n<parameter name='network-model.eipam-v6-address-plan' value='tmp.ss.plan-name' />\n<parameter name='network-model.use-ipv6' value='Y' />\n<parameter name='network-model.ipv6-ip-version' value='tmp.ss.address-family' />\n<parameter name='network-model.ipv6-cidr-mask' value='tmp.ss.mask' />\n","comments":"","x":1031.3333320617676,"y":1002.0833530426025,"z":"51788ff0.f3f71","wires":[]},{"id":"2ee434f.fde96cc","type":"set","name":"set skip-first-level, allocateSubnetFlag, group-flag","xml":"<set>\n<parameter name='tmp.skip-first-level' value='Y' />\n<parameter name='tmp.allocate-subnet-flag' value='`$tmp.ss.allocateSubnetFlag`' />\n<parameter name='eipam-ip-block.group-flag' value='`$tmp.ss.group-flag`' />","comments":"","x":648.6944313049316,"y":879.2778415679932,"z":"51788ff0.f3f71","wires":[]},{"id":"b91a560f.b78d08","type":"outcome","name":"group-flag","xml":"<outcome value='group-flag'>\n","comments":"","outputs":1,"x":1317.1667861938477,"y":584.638934135437,"z":"51788ff0.f3f71","wires":[["3132f2fb.e39d2e"]]},{"id":"3132f2fb.e39d2e","type":"set","name":"set tmp.ss.group-flag","xml":"<set>\n<parameter name='tmp.ss.group-flag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1561.5277404785156,"y":584.7500457763672,"z":"51788ff0.f3f71","wires":[]},{"id":"7169e0b8.10a35","type":"set","name":"set create-pool test inputs","xml":"<set>\n<parameter name='vnf-index' value='0' />\n<parameter name='vf-module-index' value='0' />\n<parameter name='ss.capability-name' value='self-serve-eipam-create-pool' />\n<parameter name='ss.capability-action' value='assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' \n\tvalue='true' />\n\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param_length' value = '1' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].name' value = 'ipv4-wan-address-pool' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].value' value = '${ipv4-wan-address-pool}' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.capability-name' value = 'eipam-create-pool' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].name' value = 'group-flag' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].value' value = 'Y' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[1].name' value = 'plan-name' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[1].value' value = 'GMIS_V4_VPE_WAN' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[2].name' value = 'service-instance-id' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[2].value' value = '12345' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[3].name' value = 'region' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[3].value' value = 'mtn6' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[4].name' value = 'address-family' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[4].value' value = 'ipv4' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[5].name' value = 'equipment' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[5].value' value = 'VPE' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[6].name' value = 'mask' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[6].value' value = '32' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[7].name' value = 'allocateSubnetFlag' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[7].value' value = 'N' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[8].name' value = 'service-instance-id' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[8].value' value = '111222' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key_length' value = '9' />\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.status' value = 'PENDING' />\n\n","comments":"","x":871.111083984375,"y":53.33333206176758,"z":"51788ff0.f3f71","wires":[]},{"id":"9ca683c5.67f9f","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":617.7777214050293,"y":239.9999876022339,"z":"51788ff0.f3f71","wires":[["813afab0.96b988"]]},{"id":"813afab0.96b988","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\t<parameter name=\"error-message\" value=\"`'Invalid capability-action: '+ ss.capability-action + 'only assign is supported'`\" />\n","comments":"","x":773.3332633972168,"y":239.88888835906982,"z":"51788ff0.f3f71","wires":[]},{"id":"8c0e7f4b.2acf4","type":"set","name":"set aai.cloud-region.cloud-region-id","xml":"<set>\n<parameter name='aai.cloud-region.cloud-region-id' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n","comments":"","x":603.7500076293945,"y":811.2500114440918,"z":"51788ff0.f3f71","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.json
deleted file mode 100644
index d1bbfc1..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"36cbdd47.907f12","type":"dgstart","name":"DGSTART","outputs":1,"x":86.25,"y":36.249999046325684,"z":"4c8d51ee.aa222","wires":[["ab7df98.5f55e08"]]},{"id":"eb6941fe.a3dc3","type":"method","name":"method self-serve-eipam-ip-assignment","xml":"<method rpc='self-serve-eipam-ip-assignment' mode='sync'>\n","comments":"","outputs":1,"x":222.0357208251953,"y":93.37698745727539,"z":"4c8d51ee.aa222","wires":[["eba6dd8b.a603"]]},{"id":"eba6dd8b.a603","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":115.57144165039062,"y":179.6786060333252,"z":"4c8d51ee.aa222","wires":[["ac52a615.2fa078","aa4fc267.42cbf","aa62f0e2.738ae"]]},{"id":"ab7df98.5f55e08","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":359.1071472167969,"y":35.678565979003906,"z":"4c8d51ee.aa222","wires":[["eb6941fe.a3dc3"]]},{"id":"ac52a615.2fa078","type":"switchNode","name":"switch: ss.capability-name","xml":"<switch test='`$ss.capability-name`'>\n","comments":"","outputs":1,"x":350.00000762939453,"y":181.00000381469727,"z":"4c8d51ee.aa222","wires":[["cdddcc57.48471"]]},{"id":"cdddcc57.48471","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":575.0000305175781,"y":181.5000023841858,"z":"4c8d51ee.aa222","wires":[["d0165256.ff59c"]]},{"id":"d0165256.ff59c","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\t<parameter name=\"error-message\" value=\"ss.capability-name is null\" />\n","comments":"","x":734.9167022705078,"y":181.6111011505127,"z":"4c8d51ee.aa222","wires":[]},{"id":"aa4fc267.42cbf","type":"switchNode","name":"switch: ss.capability-action","xml":"<switch test='`$ss.capability-action`'>\n","comments":"","outputs":1,"x":351.25002670288086,"y":231.00000429153442,"z":"4c8d51ee.aa222","wires":[["2b9b3f1b.f936b","5819e76f.b5da38","daf1b63b.b15078"]]},{"id":"2b9b3f1b.f936b","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":574.7500228881836,"y":231.25000429153442,"z":"4c8d51ee.aa222","wires":[["472df614.2a4308"]]},{"id":"472df614.2a4308","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\t<parameter name=\"error-message\" value=\"ss.capability-action is null\" />\n","comments":"","x":734.6666946411133,"y":231.36110305786133,"z":"4c8d51ee.aa222","wires":[]},{"id":"5819e76f.b5da38","type":"outcome","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":573.5000190734863,"y":286.25000762939453,"z":"4c8d51ee.aa222","wires":[["e1772a21.436618"]]},{"id":"daf1b63b.b15078","type":"outcome","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":472.00006103515625,"y":1390.750020980835,"z":"4c8d51ee.aa222","wires":[["dc1f776d.c14688"]]},{"id":"ad1036db.d18148","type":"call","name":"call self-service-capability-param-resolution","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-service-capability-param-resolution' mode='sync' >\n","comments":"","outputs":1,"x":1064.9166870117188,"y":286.5000114440918,"z":"4c8d51ee.aa222","wires":[["663dbb4b.9ceb64"]]},{"id":"663dbb4b.9ceb64","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1314.9166679382324,"y":286.50000762939453,"z":"4c8d51ee.aa222","wires":[["d1e6639e.fabbf"]]},{"id":"d1e6639e.fabbf","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\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n","comments":"","x":1473.666648864746,"y":286.50000381469727,"z":"4c8d51ee.aa222","wires":[]},{"id":"f8a36f2.394259","type":"call","name":"call self-serve-generate-FQPN","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-FQPN' mode='sync' >\n","comments":"","outputs":1,"x":1020.1667022705078,"y":731.6388759613037,"z":"4c8d51ee.aa222","wires":[["5220801a.87e0e"]]},{"id":"5220801a.87e0e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1239.1666831970215,"y":731.6388721466064,"z":"4c8d51ee.aa222","wires":[["cd1742f1.ebf3b"]]},{"id":"cd1742f1.ebf3b","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\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n","comments":"","x":1397.9166641235352,"y":731.6388683319092,"z":"4c8d51ee.aa222","wires":[]},{"id":"73c65e22.a53dc","type":"set","name":"set eipam-ip-block.plans[].plan-name, address-family. client-key","xml":"<set>\n<parameter name='eipam-ip-block.group-flag'\n    value='`$tmp.ss.group-flag`' />\n<parameter name='eipam-ip-block.plans[0].plan-name'\n    value='`$tmp.ss.plan-name`' />\n<parameter name='eipam-ip-block.plans[0].address-family'\n    value=\"`$tmp.ss.address-family`\" />\n<parameter name='eipam-ip-block.plans[0].requests[0].client-key'\n\tvalue=\"`$tmp.ss.client-key`\" />","comments":"","x":1124.1665344238281,"y":845.4170045852661,"z":"4c8d51ee.aa222","wires":[]},{"id":"45d141fd.17d36","type":"set","name":"COPY eipam requests[] to self-serve-generate-FQPN-output","xml":"<set>\n<parameter name='eipam-ip-block.plans[0].requests[0].'\n    value='self-serve-generate-FQPN-output.' />\n","comments":"","x":1114.7501983642578,"y":797.7500114440918,"z":"4c8d51ee.aa222","wires":[]},{"id":"85b0cb2a.490cf8","type":"set","name":"set eipam-ip-block.plans[].requests_length","xml":"<set>\n<parameter name='eipam-ip-block.plans[0].requests_length' value='1' />\n","comments":"","x":1061.7501373291016,"y":888.784987449646,"z":"4c8d51ee.aa222","wires":[]},{"id":"6c29f2a9.9da9ac","type":"execute","name":"call EIPAM assignIPAddress","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin\" method=\"assignIPAddress\">","comments":"","outputs":1,"x":1018.6908111572266,"y":935.2500143051147,"z":"4c8d51ee.aa222","wires":[["1f5aa5d3.b14cfa"]]},{"id":"1f5aa5d3.b14cfa","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":1232.6908111572266,"y":935.2500143051147,"z":"4c8d51ee.aa222","wires":[["58629e8f.2d1c6"]]},{"id":"324ab707.ca85b8","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\t<parameter name=\"error-message\" value=\"`'An error occured while obtaining ip addresses from EIPAM: ' + $error-message`\" />\n","comments":"","x":1588.690818786621,"y":980.2500143051147,"z":"4c8d51ee.aa222","wires":[]},{"id":"5bb9029c.5669ec","type":"set","name":"set tmp.ss.param.capability-name","xml":"<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n","comments":"","x":1474.527732849121,"y":345.1388931274414,"z":"4c8d51ee.aa222","wires":[]},{"id":"cb34ae7b.25f88","type":"for","name":"for pidx in param_length","xml":"<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">","comments":"","outputs":1,"x":1184.741958618164,"y":345.2103633880615,"z":"4c8d51ee.aa222","wires":[["fc904c6.826c3b","5bb9029c.5669ec"]]},{"id":"fc904c6.826c3b","type":"switchNode","name":"switch: capability-name - ss vs param","xml":"<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n","comments":"","outputs":1,"x":1486.491958618164,"y":388.7103672027588,"z":"4c8d51ee.aa222","wires":[["d90d2f22.779d1"]]},{"id":"d90d2f22.779d1","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1725.2419662475586,"y":388.4603672027588,"z":"4c8d51ee.aa222","wires":[["d0684089.46f85"]]},{"id":"80d803a3.c4cb2","type":"switchNode","name":"switch: resource-key[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n","comments":"","outputs":1,"x":1490.4724197387695,"y":478.27784156799316,"z":"4c8d51ee.aa222","wires":[["58068caa.35b4a4","b18f6739.6cac08","2eb14a8d.8ff0f6","def85b23.3778e8"]]},{"id":"58068caa.35b4a4","type":"outcome","name":"plan-name","xml":"<outcome value='plan-name'>\n","comments":"","outputs":1,"x":1739.7780113220215,"y":518.0278244018555,"z":"4c8d51ee.aa222","wires":[["e60db29f.5e4e4"]]},{"id":"e60db29f.5e4e4","type":"set","name":"set tmp.ss.plan-name","xml":"<set>\n<parameter name='tmp.ss.plan-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1956.2780151367188,"y":517.7778263092041,"z":"4c8d51ee.aa222","wires":[]},{"id":"74920e5b.b8e65","type":"outcome","name":"service-instance-id","xml":"<outcome value='service-instance-id'>\n","comments":"","outputs":1,"x":1765.8612899780273,"y":558.7500667572021,"z":"4c8d51ee.aa222","wires":[["c1898e3b.6c4b3"]]},{"id":"c1898e3b.6c4b3","type":"set","name":"set tmp.ss.service-instance-id","xml":"<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":2022.1112976074219,"y":558.5000667572021,"z":"4c8d51ee.aa222","wires":[]},{"id":"b18f6739.6cac08","type":"outcome","name":"client-key","xml":"<outcome value='client-key'>\n","comments":"","outputs":1,"x":1741.944694519043,"y":681.3889102935791,"z":"4c8d51ee.aa222","wires":[["551a7376.0c67ac"]]},{"id":"551a7376.0c67ac","type":"set","name":"set tmp.ss.client-key","xml":"<set>\n<parameter name='tmp.ss.client-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1936.944694519043,"y":681.1389102935791,"z":"4c8d51ee.aa222","wires":[]},{"id":"8091eae9.40a578","type":"set","name":"set service-data...param[].value = ip-prefix","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' \n\tvalue='`$eipam-ip-block.plans[0].requests[0].ip-prefix`' />\n","comments":"","x":1997.7500305175781,"y":1131.7500171661377,"z":"4c8d51ee.aa222","wires":[]},{"id":"5501cc03.78ecf4","type":"for","name":"for pidx in param_length","xml":"<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">","comments":"","outputs":1,"x":1002.9642486572266,"y":1131.5714282989502,"z":"4c8d51ee.aa222","wires":[["ae6c0260.65d4e"]]},{"id":"ae6c0260.65d4e","type":"switchNode","name":"switch: param[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>\n","comments":"","outputs":1,"x":1250.9642486572266,"y":1131.3214282989502,"z":"4c8d51ee.aa222","wires":[["e78be6ce.3b8de8","eca02a25.601a98","cb1aaf87.aa51c"]]},{"id":"e78be6ce.3b8de8","type":"outcome","name":"vmxvre_oam_ip_0","xml":"<outcome value='vmxvre_oam_ip_0'>\n","comments":"","outputs":1,"x":1495.5,"y":1131.5000019073486,"z":"4c8d51ee.aa222","wires":[["c2896d41.167a9"]]},{"id":"eca02a25.601a98","type":"outcome","name":"vmxvre_oam_ip_prefix_0","xml":"<outcome value='vmxvre_oam_ip_prefix_0'>\n","comments":"","outputs":1,"x":1516.7500228881836,"y":1176.2500171661377,"z":"4c8d51ee.aa222","wires":[["a7f62458.93a518"]]},{"id":"cb1aaf87.aa51c","type":"outcome","name":"vmxvre_oam_gateway","xml":"<outcome value='vmxvre_oam_gateway'>\n","comments":"","outputs":1,"x":1509.2500228881836,"y":1220.2500190734863,"z":"4c8d51ee.aa222","wires":[["46c7f920.676b88"]]},{"id":"c2896d41.167a9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1726.7500267028809,"y":1131.5000171661377,"z":"4c8d51ee.aa222","wires":[["8091eae9.40a578","22fc13a4.ba8c9c"]]},{"id":"22fc13a4.ba8c9c","type":"set","name":"set resource-resolution-data.status = SUCCESS","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n","comments":"","x":2042.7500305175781,"y":1294.0000190734863,"z":"4c8d51ee.aa222","wires":[]},{"id":"1d153407.2962ac","type":"set","name":"set service-data...param[].value = ip-prefix-length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' \n\tvalue='`$eipam-ip-block.plans[0].requests[0].ip-prefix-length`' />\n","comments":"","x":2019.5,"y":1176.5000019073486,"z":"4c8d51ee.aa222","wires":[]},{"id":"a7f62458.93a518","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1727.4999961853027,"y":1176.2500019073486,"z":"4c8d51ee.aa222","wires":[["1d153407.2962ac","22fc13a4.ba8c9c"]]},{"id":"7f6ae9a1.4b5088","type":"set","name":"set service-data...param[].value = ReservedKeyIPAddress","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' \n\tvalue='`$eipam-ip-block.plans[0].requests[0].ReservedAssignments[0].ReservedAssignment[3].ReservedKeyIPAddress`' />\n","comments":"","x":2047,"y":1220.7500019073486,"z":"4c8d51ee.aa222","wires":[]},{"id":"46c7f920.676b88","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1729.9999961853027,"y":1220.5000019073486,"z":"4c8d51ee.aa222","wires":[["7f6ae9a1.4b5088","22fc13a4.ba8c9c"]]},{"id":"f027e8c7.f6b778","type":"update","name":"get-resource EIPAM_IP_ASSIGNMENTS","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from EIPAM_IP_ASSIGNMENTS \n\t\tWHERE service_instance_id = $tmp.ss.service-instance-id\n\t\tAND client_key = $tmp.ss.client-key'>","comments":"","outputs":1,"x":960.5000305175781,"y":1391.0000267028809,"z":"4c8d51ee.aa222","wires":[["5290489d.aa6bd8","ae6f46b.494f8b8"]]},{"id":"5290489d.aa6bd8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1242.0714683532715,"y":1390.57146525383,"z":"4c8d51ee.aa222","wires":[["85dea435.ec5a98"]]},{"id":"85dea435.ec5a98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1412.2142769949778,"y":1391.0000430515834,"z":"4c8d51ee.aa222","wires":[[]]},{"id":"ae6f46b.494f8b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1238.7856140136719,"y":1438.2857780456543,"z":"4c8d51ee.aa222","wires":[["b7457ade.ae78f8"]]},{"id":"dc1f776d.c14688","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":641.3214263916016,"y":1391.214376449585,"z":"4c8d51ee.aa222","wires":[["abaf443f.4c2828","f027e8c7.f6b778","21932b55.ea6a44"]]},{"id":"e1772a21.436618","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":746.2500305175781,"y":286.50000858306885,"z":"4c8d51ee.aa222","wires":[["ad1036db.d18148","f8a36f2.394259","45d141fd.17d36","73c65e22.a53dc","85b0cb2a.490cf8","abaf443f.4c2828","5501cc03.78ecf4","6c29f2a9.9da9ac"]]},{"id":"73859123.84533","type":"set","name":"set resource-resolution-data.status = FAILED","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' value='FAILED' />\n","comments":"","x":1687.5000228881836,"y":935.2500143051147,"z":"4c8d51ee.aa222","wires":[]},{"id":"58629e8f.2d1c6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1394.5,"y":935.500002861023,"z":"4c8d51ee.aa222","wires":[["73859123.84533","324ab707.ca85b8"]]},{"id":"d0684089.46f85","type":"break","name":"break","xml":"<break>\n","comments":"","x":1863.638874053955,"y":387.7777795791626,"z":"4c8d51ee.aa222","wires":[]},{"id":"e5e862b9.d135f","type":"for","name":"for kidx in resource-key_length","xml":"<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`\">","comments":"","outputs":1,"x":1211.33349609375,"y":478.138952255249,"z":"4c8d51ee.aa222","wires":[["80d803a3.c4cb2"]]},{"id":"abaf443f.4c2828","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":949.9999847412109,"y":345.33333015441895,"z":"4c8d51ee.aa222","wires":[["cb34ae7b.25f88","e5e862b9.d135f","3b9d3ddc.c9b2f2"]]},{"id":"aa62f0e2.738ae","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss.eipam.log' />\n","comments":"","outputs":1,"x":307.50000762939453,"y":396.2500057220459,"z":"4c8d51ee.aa222","wires":[[]]},{"id":"8a1109d5.7e1748","type":"update","name":"update EIPAM_IP_ASSIGNMENTS to PENDING_DELETE...","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status \n\t\tWHERE service_instance_id = $tmp.ss.service-instance-id \n\t\tAND client_key = $tmp.ss.client-key\" >","comments":"","outputs":1,"x":1772.0476531982422,"y":1482.5001668930054,"z":"4c8d51ee.aa222","wires":[["888fe6c5.8eb528"]]},{"id":"773091ea.905b3","type":"set","name":"set status = PENDING_DELETE","xml":"<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n","comments":"","x":1681.5476455688477,"y":1439.583417892456,"z":"4c8d51ee.aa222","wires":[]},{"id":"888fe6c5.8eb528","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2078.047561645508,"y":1481.8334665298462,"z":"4c8d51ee.aa222","wires":[["e072f262.869e"]]},{"id":"e072f262.869e","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 updating EIPAM_IP_ASSIGNMENTS table to unassign ip with client_key=' + $tmp.ss.client-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n","comments":"","x":2237.0475883483887,"y":1481.643201828003,"z":"4c8d51ee.aa222","wires":[]},{"id":"7748f846.1995c8","type":"execute","name":"execute EIPAM unassign IP addresses","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin\" method=\"unassignIPAddress\">\n<parameter name=\"deleteEIPAM_status\" value=\"`$tmp.status`\" />\n","comments":"","outputs":1,"x":1707.047622680664,"y":1527.500210762024,"z":"4c8d51ee.aa222","wires":[["d413898e.28ccd8"]]},{"id":"d413898e.28ccd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1943.7142486572266,"y":1527.500153541565,"z":"4c8d51ee.aa222","wires":[["293953df.572a2c"]]},{"id":"293953df.572a2c","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 in EIPAMPlugin.unassignIPAddress with client-key='+ $tmp.ss.client-key`\" />\n","comments":"","x":2105.7142753601074,"y":1527.3098888397217,"z":"4c8d51ee.aa222","wires":[]},{"id":"b7457ade.ae78f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1421.000015258789,"y":1439.0000228881836,"z":"4c8d51ee.aa222","wires":[["773091ea.905b3","8a1109d5.7e1748","7748f846.1995c8"]]},{"id":"3b9d3ddc.c9b2f2","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n","comments":"","outputs":1,"x":1136.250015258789,"y":423.7500057220459,"z":"4c8d51ee.aa222","wires":[[]]},{"id":"2eb14a8d.8ff0f6","type":"outcome","name":"group-flag","xml":"<outcome value='group-flag'>\n","comments":"","outputs":1,"x":1736.6666793823242,"y":477.77775382995605,"z":"4c8d51ee.aa222","wires":[["5c58e9be.2f7838"]]},{"id":"5c58e9be.2f7838","type":"set","name":"set tmp.ss.group-flag","xml":"<set>\n<parameter name='tmp.ss.group-flag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1981.0276336669922,"y":477.88886547088623,"z":"4c8d51ee.aa222","wires":[]},{"id":"def85b23.3778e8","type":"outcome","name":"address-family","xml":"<outcome value='address-family'>\n","comments":"","outputs":1,"x":1754.4443893432617,"y":599.9999828338623,"z":"4c8d51ee.aa222","wires":[["ffb8feff.1d662"]]},{"id":"ffb8feff.1d662","type":"set","name":"set tmp.ss.address-family","xml":"<set>\n<parameter name='tmp.ss.address-family' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":2016.6943550109863,"y":599.7499771118164,"z":"4c8d51ee.aa222","wires":[]},{"id":"b96082bd.2df27","type":"outcome","name":"mask","xml":"<outcome value='mask'>\n","comments":"","outputs":1,"x":1732.2222213745117,"y":639.9999828338623,"z":"4c8d51ee.aa222","wires":[["59d3e4c6.50166c"]]},{"id":"59d3e4c6.50166c","type":"set","name":"set tmp.ss.mask","xml":"<set>\n<parameter name='tmp.ss.mask' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":1985.4721603393555,"y":639.9999504089355,"z":"4c8d51ee.aa222","wires":[]},{"id":"21932b55.ea6a44","type":"for","name":"for pidx in param_length","xml":"<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">","comments":"","outputs":1,"x":908.75,"y":1629.8214111328125,"z":"4c8d51ee.aa222","wires":[["2de84f0a.a0893"]]},{"id":"2de84f0a.a0893","type":"switchNode","name":"switch: param[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>\n","comments":"","outputs":1,"x":1156.75,"y":1629.5714111328125,"z":"4c8d51ee.aa222","wires":[["3b2d7861.ac7dc8","f774c02.497b44","bb3127bc.024528"]]},{"id":"3b2d7861.ac7dc8","type":"outcome","name":"vmxvre_oam_ip_0","xml":"<outcome value='vmxvre_oam_ip_0'>\n","comments":"","outputs":1,"x":1401.2857513427734,"y":1629.749984741211,"z":"4c8d51ee.aa222","wires":[["3be95976.0ed0e6"]]},{"id":"f774c02.497b44","type":"outcome","name":"vmxvre_oam_ip_prefix_0","xml":"<outcome value='vmxvre_oam_ip_prefix_0'>\n","comments":"","outputs":1,"x":1422.535774230957,"y":1674.5,"z":"4c8d51ee.aa222","wires":[["3be95976.0ed0e6"]]},{"id":"bb3127bc.024528","type":"outcome","name":"vmxvre_oam_gateway","xml":"<outcome value='vmxvre_oam_gateway'>\n","comments":"","outputs":1,"x":1415.035774230957,"y":1718.5000019073486,"z":"4c8d51ee.aa222","wires":[["3be95976.0ed0e6"]]},{"id":"3be95976.0ed0e6","type":"set","name":"set resource-resolution-data.status = DELETED","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n","comments":"","x":1812.0357971191406,"y":1674.250023841858,"z":"4c8d51ee.aa222","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-FQPN.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-FQPN.json
deleted file mode 100644
index b5c9411..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-FQPN.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"6b55c686.e98f58","type":"dgstart","name":"DGSTART","outputs":1,"x":95,"y":30,"z":"58ac4a51.14cfa4","wires":[["13afa36f.3e613d"]]},{"id":"118353f8.b3b67c","type":"method","name":"method self-serve-generate-FQPN","xml":"<method rpc='self-serve-generate-FQPN' mode='sync'>\n","comments":"","outputs":1,"x":197.0357208251953,"y":78.37698745727539,"z":"58ac4a51.14cfa4","wires":[["e5d7247c.e78aa8"]]},{"id":"e5d7247c.e78aa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":171.26589965820312,"y":154.1230583190918,"z":"58ac4a51.14cfa4","wires":[["faf52f6a.0694f","fb8a9cf8.8fbb2","7ad4d33c.188b7c","bcc69e94.ad89d","dcc749b9.569fe8","dab61149.8cd06"]]},{"id":"dab61149.8cd06","type":"execute","name":"call EIPAM getPlanTopology","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin\" method=\"getPlanTopology\">","comments":"","outputs":1,"x":456.9287567138672,"y":326.93658924102783,"z":"58ac4a51.14cfa4","wires":[["7742e4f5.24469c"]]},{"id":"7742e4f5.24469c","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":673.309814453125,"y":326.66322231292725,"z":"58ac4a51.14cfa4","wires":[["1000bf31.b1f1f1"]]},{"id":"1000bf31.b1f1f1","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\t<parameter name=\"error-message\" value=\"`'An error occured while getting Keyname and Keyvalue for address plan, '+ $eipam-ip-block.planName + ', from EIPAM'`\" />\n","comments":"","x":829.2025604248047,"y":326.77045154571533,"z":"58ac4a51.14cfa4","wires":[]},{"id":"fb8a9cf8.8fbb2","type":"switchNode","name":"switch: topologyDetails_length","xml":"<switch test='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`'>\n","comments":"","outputs":1,"x":459.14695739746094,"y":394.82542276382446,"z":"58ac4a51.14cfa4","wires":[["7a5942e6.6691dc"]]},{"id":"7a5942e6.6691dc","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":679.4643402099609,"y":394.8254346847534,"z":"58ac4a51.14cfa4","wires":[["a12111ef.55246"]]},{"id":"a12111ef.55246","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\t<parameter name=\"error-message\" value=\"eipam-ip-block.getPlanTopologyResponse.topologyDetails is null\" />\n","comments":"","x":839.3810119628906,"y":394.9365334510803,"z":"58ac4a51.14cfa4","wires":[]},{"id":"5c649a99.441c74","type":"set","name":"set pool-index","xml":"<set>\n<parameter name='pool-index'\n   value='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].level - 1`' />\n","comments":"","x":737.7975540161133,"y":496.81360149383545,"z":"58ac4a51.14cfa4","wires":[]},{"id":"faf52f6a.0694f","type":"set","name":"set eipam-ip-block.plan-name = tmp.ss.plan-name","xml":"<set>\n<parameter name='eipam-ip-block.plan-name' value='`$tmp.ss.plan-name`' />\n","comments":"","x":527.6468505859375,"y":209.23416805267334,"z":"58ac4a51.14cfa4","wires":[]},{"id":"affb505f.7eaa3","type":"switchNode","name":"switch: Response.planName vs eipam-ip-block..plan-name","xml":"<switch test='`$eipam-ip-block.plan-name == $eipam-ip-block.getPlanTopologyResponse.planName`'>\n","comments":"","outputs":1,"x":875.4127349853516,"y":448.74602794647217,"z":"58ac4a51.14cfa4","wires":[["519f260d.88c578"]]},{"id":"519f260d.88c578","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1190.1429557800293,"y":448.95237159729004,"z":"58ac4a51.14cfa4","wires":[["baab19da.004908"]]},{"id":"baab19da.004908","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\t<parameter name=\"error-message\" value=\"`'eipam response plan-name ['+ $eipam-ip-block.getPlanTopologyResponse.planName + ' is not the same as input '+$eipam-ip-block.planName`\" />\n","comments":"","x":1355.5715103149414,"y":448.9523649215698,"z":"58ac4a51.14cfa4","wires":[]},{"id":"30eb4248.61be8e","type":"set","name":"set self-serve-generate-FQPN-output.pools[]","xml":"<set>\n<parameter name='self-serve-generate-FQPN-output.pools[$pool-index].key-name'\n   value='`$tmp.getPlanTopologyResponse.key-name`' />\n<parameter name='self-serve-generate-FQPN-output.pools[$pool-index].key-value'\n\tvalue='`$tmp.ss.final.key-value`' />","comments":"","x":818.6666412353516,"y":1116.5592398643494,"z":"58ac4a51.14cfa4","wires":[]},{"id":"ea1157ef.5c36d8","type":"comment","name":"Change History","info":"iTrack 8790\n- add validation for network-role in input for null\n- change query of ROUTING_CHARATERISTIC table with network-role from input.\n- Return generate-FQPN-output.pools[]\n- set pools_length to .getPlanTopologyResponse.topologyDetails_length separately at the end of the call.\niTrack 10846\n- node 35, fixed error-message, generate-FQPN-input.network-role\niTrack 11310\n- changed ADDRESS_PLAN_POLICIES  cloud_region_id from using vnfapi nodestring for cloud-region-id\n- added AddressPlanPolicyDG-Network_Role and AddressPlanPolicyDG-Network_Id to ADDRESS_PLAN_POLICIES  query and resolution\n- updated vrf-name resolution to use tosca data if not found in ADDRESS_PLAN_POLICIES\n- support compound key-name\niTrack 11945\n- added network-collection and zone \n- remove validation of all input except plan-name\n","comments":"","x":93.75003051757812,"y":455.8928623199463,"z":"58ac4a51.14cfa4","wires":[]},{"id":"bcc69e94.ad89d","type":"for","name":"for resp-index: topologyDetails[]","xml":"<for index=\"resp-index\" start=\"0\" end=\"`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`\">","comments":"","outputs":1,"x":463.52381896972656,"y":448.80959367752075,"z":"58ac4a51.14cfa4","wires":[["affb505f.7eaa3","5c649a99.441c74","12042b26.6ec7e5","30eb4248.61be8e","bf20cb6a.689cc8","5543f869.2b4cb8","b0808369.33c33","60f9abd6.9b1864"]]},{"id":"7ad4d33c.188b7c","type":"set","name":"empty self-serve-generate-FQPN-output.","xml":"<set>\n<parameter name='self-serve-generate-FQPN-output.' value='' />\n","comments":"","x":498.5357666015625,"y":271.57149744033813,"z":"58ac4a51.14cfa4","wires":[]},{"id":"c32b1831.2dfd38","type":"comment","name":"OUTPUT","info":"generate-FQPN-output.pools[]\ngenerate-FQPN-output.pools_length","comments":"","x":117.67855072021484,"y":360.5357151031494,"z":"58ac4a51.14cfa4","wires":[]},{"id":"dcc749b9.569fe8","type":"set","name":"set self-serve-generate-FQPN-output.pools_length","xml":"<set>\n<parameter name='self-serve-generate-FQPN-output.pools_length' \n\tvalue='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`' />\n","comments":"","x":526.1072235107422,"y":1193.0357995033264,"z":"58ac4a51.14cfa4","wires":[]},{"id":"13afa36f.3e613d","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":367.8571472167969,"y":29.428566932678223,"z":"58ac4a51.14cfa4","wires":[["118353f8.b3b67c"]]},{"id":"12042b26.6ec7e5","type":"set","name":"set tmp.getPlanTopologyResponse.key-name","xml":"<set>\n<parameter name='tmp.getPlanTopologyResponse.key-name' \n\tvalue='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].keyName`' />\n","comments":"","x":835.4643020629883,"y":547.1429715156555,"z":"58ac4a51.14cfa4","wires":[]},{"id":"5543f869.2b4cb8","type":"execute","name":"split tmp.getPlanTopologyResponse.key-value-format","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n\t<parameter name=\"original_string\" value=\"`$tmp.getPlanTopologyResponse.key-value-format`\" />\n\t<parameter name=\"regex\" value=\":\" />\n\t<parameter name=\"ctx_memory_result_key\" value=\"tmp.split.key-value-format\" />\n","comments":"","outputs":1,"x":864.6071395874023,"y":646.9643845558167,"z":"58ac4a51.14cfa4","wires":[[]]},{"id":"b0808369.33c33","type":"for","name":"for split-index: tmp.split.key-value-format","xml":"<for index=\"split-index\" start=\"0\" end=\"`$tmp.split.key-value-format_length`\">","comments":"","outputs":1,"x":821.7858352661133,"y":747.6786179542542,"z":"58ac4a51.14cfa4","wires":[["ee7b415f.68d5","98cc0ef6.2af94","d4d77014.0c4b3","ce214f8a.35d6c","2d190b10.073a64"]]},{"id":"85e1b3d.faf545","type":"set","name":"set tmp.ss.param.capability-name","xml":"<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n","comments":"","x":1453.4524307250977,"y":891.1786241531372,"z":"58ac4a51.14cfa4","wires":[]},{"id":"246bb255.6cc33e","type":"set","name":"set tmp.ss.final.key-value","xml":"<set>\n<parameter name='tmp.ss.final.key-value' value=\"`$tmp.ss.partial.key-value`\" />\n","comments":"","x":1538.130729675293,"y":1022.166757106781,"z":"58ac4a51.14cfa4","wires":[]},{"id":"d4d77014.0c4b3","type":"switchNode","name":"switch: split-index == 0","xml":"<switch test='`$split-index == 0`'>\n","comments":"","outputs":1,"x":1135.1308288574219,"y":1022.5953135490417,"z":"58ac4a51.14cfa4","wires":[["1630c64f.a0ee7a","dab38bb.6e09578"]]},{"id":"1630c64f.a0ee7a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1331.8451538085938,"y":1022.5952353477478,"z":"58ac4a51.14cfa4","wires":[["246bb255.6cc33e"]]},{"id":"dab38bb.6e09578","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1333.7022094726562,"y":1074.0238242149353,"z":"58ac4a51.14cfa4","wires":[["521825ba.41010c"]]},{"id":"521825ba.41010c","type":"set","name":"set tmp.final.key-value with :","xml":"<set>\n<parameter name='tmp.ss.final.key-value' \n\tvalue=\"`$tmp.ss.final.key-value + ':' + $tmp.ss.partial.key-value`\" />\n","comments":"","x":1546.9880065917969,"y":1074.2144198417664,"z":"58ac4a51.14cfa4","wires":[]},{"id":"60f9abd6.9b1864","type":"set","name":"set tmp.final.key-value NULL","xml":"<set>\n<parameter name='tmp.final.key-value' value=\"\" />\n","comments":"","x":788.285774230957,"y":695.3572058677673,"z":"58ac4a51.14cfa4","wires":[]},{"id":"bf20cb6a.689cc8","type":"set","name":"set tmp.getPlanTopologyResponse.key-value-format","xml":"<set>\n<parameter name='tmp.getPlanTopologyResponse.key-value-format' \n\tvalue='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].keyValueFormat`' />\n","comments":"","x":858.9999923706055,"y":598.7500195503235,"z":"58ac4a51.14cfa4","wires":[]},{"id":"ee7b415f.68d5","type":"execute","name":"replace ${ with \"\"","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.split.key-value-format[$split-index]`\" />\n\t<parameter name=\"target\" value=\"${\"/>\n\t<parameter name=\"replacement\" value=\"\"/>\n\t<parameter name=\"outputPath\" value=\"tmp.split-value\"/>\n","comments":"","outputs":1,"x":1118.0000076293945,"y":747.5000290870667,"z":"58ac4a51.14cfa4","wires":[[]]},{"id":"98cc0ef6.2af94","type":"execute","name":"replace } with \"\"","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.split-value`\" />\n\t<parameter name=\"target\" value=\"}\"/>\n\t<parameter name=\"replacement\" value=\"\"/>\n\t<parameter name=\"outputPath\" value=\"tmp.ss.split-value\"/>\n","comments":"","outputs":1,"x":1115.500015258789,"y":791.2500309944153,"z":"58ac4a51.14cfa4","wires":[[]]},{"id":"2d190b10.073a64","type":"for","name":"for pidx in param_length","xml":"<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">","comments":"","outputs":1,"x":1143.6666564941406,"y":891.2500944137573,"z":"58ac4a51.14cfa4","wires":[["6595219f.ab227","85e1b3d.faf545"]]},{"id":"6595219f.ab227","type":"switchNode","name":"switch: capability-name - ss vs param","xml":"<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n","comments":"","outputs":1,"x":1465.4166564941406,"y":934.7500982284546,"z":"58ac4a51.14cfa4","wires":[["5a38343a.825c9c"]]},{"id":"5a38343a.825c9c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1704.1666641235352,"y":934.5000982284546,"z":"58ac4a51.14cfa4","wires":[["83308cd8.3dce"]]},{"id":"59c5ed43.c15bb4","type":"set","name":"set tmp.ss.partial.key-value","xml":"<set>\n<parameter name='tmp.ss.partial.key-value' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n","comments":"","x":2700.750030517578,"y":979.8333764076233,"z":"58ac4a51.14cfa4","wires":[]},{"id":"83308cd8.3dce","type":"for","name":"for kidx in resource-key_length","xml":"<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$ss.param-index].resource-resolution-data.resource-key_length`\">","comments":"","outputs":1,"x":1921.9166564941406,"y":933.7500371932983,"z":"58ac4a51.14cfa4","wires":[["56ff67f7.37df58","fcb1624d.05791"]]},{"id":"56ff67f7.37df58","type":"set","name":"set tmp.ss.resource-key.name","xml":"<set>\n<parameter name='tmp.ss.resource-key.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`' />\n","comments":"","x":2213.416778564453,"y":933.7500643730164,"z":"58ac4a51.14cfa4","wires":[]},{"id":"fcb1624d.05791","type":"switchNode","name":"switch: split-value == resource-key.name","xml":"<switch test='`$tmp.ss.split-value == $tmp.ss.resource-key.name`'>\n","comments":"","outputs":1,"x":2244.6666564941406,"y":980.5000371932983,"z":"58ac4a51.14cfa4","wires":[["a79fe216.cb8bd"]]},{"id":"a79fe216.cb8bd","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2495,"y":980.0833649635315,"z":"58ac4a51.14cfa4","wires":[["59c5ed43.c15bb4"]]},{"id":"98155a12.d97fc8","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss.eipam.log' />\n","comments":"","outputs":1,"x":403.19444274902344,"y":1307.6388483047485,"z":"58ac4a51.14cfa4","wires":[[]]},{"id":"ce214f8a.35d6c","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: tmp.ss.split-value: ' + $tmp.ss.split-value`\"/>\n","comments":"","outputs":1,"x":1090.4166564941406,"y":838.3333268165588,"z":"58ac4a51.14cfa4","wires":[[]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-mac-address-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-mac-address-assign.json
deleted file mode 100755
index f750e77..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-mac-address-assign.json
+++ /dev/null
@@ -1,2368 +0,0 @@
-[
-    {
-        "id": "7b3db2b.16a914c",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 111,
-        "y": 34,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "722a79fa.ee98a8"
-            ]
-        ]
-    },
-    {
-        "id": "722a79fa.ee98a8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 369.9403991699219,
-        "y": 34.32145690917969,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "7bdb539a.4e997c"
-            ]
-        ]
-    },
-    {
-        "id": "7bdb539a.4e997c",
-        "type": "method",
-        "name": "method self-serve-mac-address-assign",
-        "xml": "<method rpc='self-serve-mac-address-assign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 722,
-        "y": 35,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "b7d5ae1c.27c7f"
-            ]
-        ]
-    },
-    {
-        "id": "b7d5ae1c.27c7f",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 111,
-        "y": 89,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "f32b01d.959fe",
-                "188b9fef.4e6a1",
-                "5cb1f10c.2bf088",
-                "a0e7cbd7.aa0c78",
-                "81728a4c.575408",
-                "46b1ac07.04040c",
-                "48725b1e.f26bb4",
-                "e9c063b8.f3fb18",
-                "1e311aa8.b5db05"
-            ]
-        ]
-    },
-    {
-        "id": "ddda0b39.003b2",
-        "type": "comment",
-        "name": "Validate inputs",
-        "info": "ss.capability-action should be \"ASSIGN\" or \"\"UNASSIGN\"",
-        "comments": "",
-        "x": 240,
-        "y": 128,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "e9c063b8.f3fb18",
-        "type": "switchNode",
-        "name": "switch ss.capability-action (ASSIGN | UNASSIGN)",
-        "xml": "<switch test='`$ss.capability-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 332,
-        "y": 2079,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "22932efc.96ddd2",
-                "2bef6dfc.593592"
-            ]
-        ]
-    },
-    {
-        "id": "22932efc.96ddd2",
-        "type": "outcome",
-        "name": "ASSIGN",
-        "xml": "<outcome value='ASSIGN'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 269.25006103515625,
-        "y": 2129.75,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "8b185ab9.cef45"
-            ]
-        ]
-    },
-    {
-        "id": "2bef6dfc.593592",
-        "type": "outcome",
-        "name": "UNASSIGN",
-        "xml": "<outcome value='UNASSIGN'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 277,
-        "y": 3187,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "c4cdc2fe.75772"
-            ]
-        ]
-    },
-    {
-        "id": "8b185ab9.cef45",
-        "type": "block",
-        "name": "block:atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 329,
-        "y": 2227,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "1cbf83ce.6fd96c",
-                "b2bdf447.c207c",
-                "964b8c29.bf00b8"
-            ]
-        ]
-    },
-    {
-        "id": "1cbf83ce.6fd96c",
-        "type": "get-resource",
-        "name": "get hostname from map table",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"select * FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE HOSTNAME= $tmp.hostname\" pfx='tmp.map'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 578,
-        "y": 2227,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "a2ca1b80.01b34"
-            ]
-        ]
-    },
-    {
-        "id": "b2bdf447.c207c",
-        "type": "switchNode",
-        "name": "switch hostname exists",
-        "xml": "<switch test=\"`$tmp.map.hostname`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 562,
-        "y": 2333,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "9c793e6f.08fbd8",
-                "7bd7486c.3fac4",
-                "7b3e1088.744e7",
-                "b37eb6ee.9d9b7"
-            ]
-        ]
-    },
-    {
-        "id": "7bd7486c.3fac4",
-        "type": "outcome",
-        "name": "outcome Null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 800.5,
-        "y": 2352,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6082ab09.7da05c"
-            ]
-        ]
-    },
-    {
-        "id": "9c793e6f.08fbd8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 789.5,
-        "y": 2312,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6082ab09.7da05c"
-            ]
-        ]
-    },
-    {
-        "id": "e3977c74.5a06d8",
-        "type": "get-resource",
-        "name": "get-resource MIN Val",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"SELECT MIN(pool.id) as pool_id, pool.mac_address FROM VPE_MAC_ADDRESS_POOL pool WHERE NOT EXISTS(SELECT ID FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map where pool.ID = map.ID)\" pfx='tmp.availid'>\n\n<!--\ntmp.availid.mac_address is the mac_address we need to have finally.\n-->\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1275,
-        "y": 2270,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "5b6e46a4.15d6c8"
-            ]
-        ]
-    },
-    {
-        "id": "7b3e1088.744e7",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 780.5,
-        "y": 2392,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "12f06794.3cccd"
-            ]
-        ]
-    },
-    {
-        "id": "6082ab09.7da05c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1049.5,
-        "y": 2310,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "e3977c74.5a06d8",
-                "bbb30cb3.20aaf",
-                "5dde5db.d378da4"
-            ]
-        ]
-    },
-    {
-        "id": "bbb30cb3.20aaf",
-        "type": "save",
-        "name": "save",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" \nresource=\"SQL\" \nkey=\"INSERT INTO VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING ( id , hostname , assigned_user, assigned_date ) VALUES ( $tmp.availid.pool-id , $tmp.hostname , 'SDNC' , NOW())\" \nforce='true' pfx='save_val'>\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1229.5,
-        "y": 2310,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "5b6e46a4.15d6c8"
-            ]
-        ]
-    },
-    {
-        "id": "12f06794.3cccd",
-        "type": "get-resource",
-        "name": "get-Hostname : tmp.mac_address",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"SELECT pool.mac_address FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map, VPE_MAC_ADDRESS_POOL pool WHERE pool.ID = map.ID AND map.HOSTNAME = $tmp.hostname\" pfx=\"tmp.mac-address\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1047,
-        "y": 2392,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "4ecab657.7eb6b"
-            ]
-        ]
-    },
-    {
-        "id": "b37eb6ee.9d9b7",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 780.5,
-        "y": 2272,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6082ab09.7da05c"
-            ]
-        ]
-    },
-    {
-        "id": "5dde5db.d378da4",
-        "type": "set",
-        "name": "set tmp.mac_address",
-        "xml": "<set>\n<parameter name=\"tmp.mac-address.mac-address\" value=\"`$tmp.availid.mac-address`\" />\n",
-        "comments": "",
-        "x": 1276.5,
-        "y": 2350,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "67c352d4.f2ba3c",
-        "type": "comment",
-        "name": "SQL hostname and mac address",
-        "info": "",
-        "comments": "",
-        "x": 388.5,
-        "y": 2181,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "4ecab657.7eb6b",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1280.5,
-        "y": 2392,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "53838908.a977d"
-            ]
-        ]
-    },
-    {
-        "id": "5b6e46a4.15d6c8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1444.5,
-        "y": 2310,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "53838908.a977d"
-            ]
-        ]
-    },
-    {
-        "id": "bac47969.c95e9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='406' />\n<parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />\n",
-        "comments": "",
-        "x": 1726.5,
-        "y": 2354,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "22640dee.10e3ca",
-        "type": "comment",
-        "name": "Call self-service-capability-param-resolution DG to resolve all resource-keys",
-        "info": "",
-        "comments": "",
-        "x": 423,
-        "y": 491,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "f32b01d.959fe",
-        "type": "switchNode",
-        "name": "switch ss.capability-name",
-        "xml": "<switch test=\"`$ss.capability-name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 277,
-        "y": 171,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "dea84652.e6b318",
-                "87691bd0.ee014",
-                "9100f4c8.68c2e8",
-                "c248349.697d948"
-            ]
-        ]
-    },
-    {
-        "id": "dea84652.e6b318",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 551,
-        "y": 144,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "b15ff9d7.9a3c1"
-            ]
-        ]
-    },
-    {
-        "id": "87691bd0.ee014",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 541,
-        "y": 184,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "b15ff9d7.9a3c1"
-            ]
-        ]
-    },
-    {
-        "id": "9100f4c8.68c2e8",
-        "type": "other",
-        "name": "mac-address-assign ",
-        "xml": "<outcome value='mac-address-assign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 583,
-        "y": 225,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6f33d7d2.1ff818"
-            ]
-        ]
-    },
-    {
-        "id": "1fcf9155.035647",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='ss.capability-name is not set' />\n",
-        "comments": "",
-        "x": 853,
-        "y": 180,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "c248349.697d948",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 544,
-        "y": 104,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "b15ff9d7.9a3c1"
-            ]
-        ]
-    },
-    {
-        "id": "6f33d7d2.1ff818",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: ss.capability-name is mac-address-assign\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 752,
-        "y": 225,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "188b9fef.4e6a1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 235,
-        "y": 537,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "b6717fcb.f01288",
-                "bb06b386.8e2478",
-                "b95886d5.e932"
-            ]
-        ]
-    },
-    {
-        "id": "bb06b386.8e2478",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: call self-service-capability-param-resolution DG\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 262,
-        "y": 596,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b6717fcb.f01288",
-        "type": "set",
-        "name": "set variables for calling capability-param-resolution",
-        "xml": "<set>\n<!--<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />-->",
-        "comments": "",
-        "x": 398.6904296875,
-        "y": 640.3095703125,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "b95886d5.e932",
-        "type": "call",
-        "name": "call GR-API:self-serve-capability-param-resolution",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 395.023681640625,
-        "y": 686.976318359375,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "553519e.fe13668",
-                "bdbbd9e5.28642"
-            ]
-        ]
-    },
-    {
-        "id": "553519e.fe13668",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 709.7379760742188,
-        "y": 663.83349609375,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "ab23ec9f.544cd8"
-            ]
-        ]
-    },
-    {
-        "id": "bdbbd9e5.28642",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 713.0713259379067,
-        "y": 715.5001392364502,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b6f606b3.379d2",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='402' />\n<parameter name='error-message' value='Failure calling self-service-capability-param-resolution' />\n",
-        "comments": "",
-        "x": 996,
-        "y": 686,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "b4a562b3.6cf2",
-        "type": "comment",
-        "name": "If MAC address assign was success, set output",
-        "info": "parameters.param.resource-resolution-data.status to SUCCESS \nor FAILED depending on the SqlResource outcome",
-        "comments": "",
-        "x": 641,
-        "y": 2447,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "964b8c29.bf00b8",
-        "type": "switchNode",
-        "name": "switch tmp.mac_address",
-        "xml": "<switch test=\"`$tmp.mac-address.mac-address`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 568,
-        "y": 2497,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "36850663.0d746a",
-                "f93f2718.007a1",
-                "7e4aa79f.ee1fd8"
-            ]
-        ]
-    },
-    {
-        "id": "36850663.0d746a",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 765,
-        "y": 2495,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "75c48b23.e37de4"
-            ]
-        ]
-    },
-    {
-        "id": "f93f2718.007a1",
-        "type": "outcome",
-        "name": "outcome Null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 776,
-        "y": 2535,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "75c48b23.e37de4"
-            ]
-        ]
-    },
-    {
-        "id": "7e4aa79f.ee1fd8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 756,
-        "y": 2575,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "385bd99d.9d7cfe"
-            ]
-        ]
-    },
-    {
-        "id": "a2ca1b80.01b34",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 778,
-        "y": 2227,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "1901da34.2587de"
-            ]
-        ]
-    },
-    {
-        "id": "3e155c31.bc775c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Unable to access VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />\n",
-        "comments": "",
-        "x": 1056.5,
-        "y": 2272,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "7381c11d.1d7698",
-        "type": "comment",
-        "name": "Get next available ID",
-        "info": "",
-        "comments": "",
-        "x": 1270,
-        "y": 2223,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "244fa4d9.2f420c",
-        "type": "comment",
-        "name": "Loop thru vf-module-params for first match with ss.capability-name",
-        "info": "Loop thru service-data.vnfs.vnf[].vnf-data.vf-modules.vf-module[].vf-module-data.vf-module-topology.vf-module-parameters.param_length \nto find the FIRST occurrence of resource-resolution-data.capability-name=$ss.capability-name",
-        "comments": "",
-        "x": 395,
-        "y": 811,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "b6393e49.ffd1b8",
-        "type": "for",
-        "name": "for each vf-module-parameters",
-        "xml": "<for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 364,
-        "y": 953,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "ea03c473.c1c2f",
-                "42d7c2fc.34b0ec"
-            ]
-        ]
-    },
-    {
-        "id": "42d7c2fc.34b0ec",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: vf-module-param-index\"/>\n<parameter name=\"field3\" value='`$vf-module-param-index`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 577,
-        "y": 953,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ea03c473.c1c2f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 346,
-        "y": 1002,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "df53b68b.6e9ab",
-                "14a66a1b.462eae"
-            ]
-        ]
-    },
-    {
-        "id": "5cb1f10c.2bf088",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 234,
-        "y": 857,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "7bcbb724.38cb58",
-                "b6393e49.ffd1b8"
-            ]
-        ]
-    },
-    {
-        "id": "7bcbb724.38cb58",
-        "type": "set",
-        "name": "set vf-module-parameters-length",
-        "xml": "<set>\n<parameter name='tmp.vf-module-parameters-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />\n",
-        "comments": "",
-        "x": 371,
-        "y": 909,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "df53b68b.6e9ab",
-        "type": "set",
-        "name": "set vfModuleParamsCapabilityName",
-        "xml": "<set>\n<parameter name='vfModuleParamsCapabilityName' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.capability-name`'  />\n",
-        "comments": "",
-        "x": 458,
-        "y": 1045,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "14a66a1b.462eae",
-        "type": "switchNode",
-        "name": "switch compare vfModuleParamsCapabilityName and ss.capability-name",
-        "xml": "<switch test=\"`$ss.capability-name == $vfModuleParamsCapabilityName`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 569,
-        "y": 1091,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "8667f599.216ea",
-                "dd592add.a79168"
-            ]
-        ]
-    },
-    {
-        "id": "a0e7cbd7.aa0c78",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/self-serv-mac-address-assign.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 165,
-        "y": 3748,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "81728a4c.575408",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`\" value='SUCCESS'  />",
-        "comments": "",
-        "x": 172,
-        "y": 3803,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "f0f51d16.559f48",
-        "type": "comment",
-        "name": "Loop thru vf-module-params for first match with ss.capability-name",
-        "info": "Loop thru service-data.vnfs.vnf[].vnf-data.vf-modules.vf-module[].vf-module-data.vf-module-topology.vf-module-parameters.param_length \nto find the FIRST occurrence of resource-resolution-data.capability-name=$ss.capability-name",
-        "comments": "",
-        "x": 861,
-        "y": 1046,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "8667f599.216ea",
-        "type": "outcome",
-        "name": "outcome:ss.capability-name match",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 468,
-        "y": 1139,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "e1f12455.b89928"
-            ]
-        ]
-    },
-    {
-        "id": "dd592add.a79168",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 378,
-        "y": 1180,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "27d76d2.8fc6c12",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Found ss.capability-name MATCH\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 814,
-        "y": 1139,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e1f12455.b89928",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 682,
-        "y": 1139,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "27d76d2.8fc6c12",
-                "89f1badd.aab03",
-                "2895f95.030ce86"
-            ]
-        ]
-    },
-    {
-        "id": "f9e99981.6f75a",
-        "type": "comment",
-        "name": "Break the loop",
-        "info": "",
-        "comments": "",
-        "x": 704,
-        "y": 1233,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "89f1badd.aab03",
-        "type": "set",
-        "name": "set resource-resolution-data",
-        "xml": "<set>\n<parameter name='tmp.resource-resolution-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.`'  />\n",
-        "comments": "",
-        "x": 750,
-        "y": 1187,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "48725b1e.f26bb4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 246,
-        "y": 1528,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "80868c75.dfbb6",
-                "c8049951.6c3498",
-                "489490ac.5987f"
-            ]
-        ]
-    },
-    {
-        "id": "fe3507b.b7e70f8",
-        "type": "comment",
-        "name": "Resolve hostname",
-        "info": "service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters[$vf-module-params-index].param.resource-resolution-data.resource-key[$key-index].value \nwhere its corresponding resource-key[$key-index].name=vnf-name",
-        "comments": "",
-        "x": 234,
-        "y": 1484,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "80868c75.dfbb6",
-        "type": "set",
-        "name": "set resource-key-length",
-        "xml": "<set>\n<parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />\n",
-        "comments": "",
-        "x": 320,
-        "y": 1574,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "c8049951.6c3498",
-        "type": "for",
-        "name": "for each resource-resolution-data.resource-key",
-        "xml": "<for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 393,
-        "y": 1619,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "f83cd8e.7e8a728",
-                "7f7a1b7b.df5804"
-            ]
-        ]
-    },
-    {
-        "id": "7f7a1b7b.df5804",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: key-index\"/>\n<parameter name=\"field3\" value='`$key-index`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 660,
-        "y": 1619,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f83cd8e.7e8a728",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 323,
-        "y": 1668,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "76d2d19d.4c1f68"
-            ]
-        ]
-    },
-    {
-        "id": "76d2d19d.4c1f68",
-        "type": "switchNode",
-        "name": "switch compare resource-key.name and \"vnf-name\"",
-        "xml": "<switch test=\"`$tmp.resource-resolution-data.resource-key[$key-index].name == 'vnf-name'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 492,
-        "y": 1715,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6f9eef6b.1b76b",
-                "abcbec45.dae73"
-            ]
-        ]
-    },
-    {
-        "id": "6f9eef6b.1b76b",
-        "type": "outcome",
-        "name": "outcome:found vnf-name resource key",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 469,
-        "y": 1762,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "ee3cf2a8.37536"
-            ]
-        ]
-    },
-    {
-        "id": "abcbec45.dae73",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 369,
-        "y": 1803,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ee3cf2a8.37536",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 685,
-        "y": 1762,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6000bcf7.22066c",
-                "dc8d5223.f469d8",
-                "d14bad56.e3a97"
-            ]
-        ]
-    },
-    {
-        "id": "6000bcf7.22066c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Found resource-resolution-data.name = vnf-name\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 817,
-        "y": 1762,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dc8d5223.f469d8",
-        "type": "set",
-        "name": "set hostname",
-        "xml": "<set>\n<parameter name='tmp.hostname' value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'  />\n",
-        "comments": "",
-        "x": 711,
-        "y": 1810,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "489490ac.5987f",
-        "type": "switchNode",
-        "name": "switch validate resolved hostname",
-        "xml": "<switch test=\"`$tmp.hostname`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 363,
-        "y": 1921,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "4e567960.877258",
-                "9bac31a3.d241b"
-            ]
-        ]
-    },
-    {
-        "id": "4e567960.877258",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 596,
-        "y": 1901,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "c1e2450e.9ab788"
-            ]
-        ]
-    },
-    {
-        "id": "9bac31a3.d241b",
-        "type": "other",
-        "name": "blank",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 598,
-        "y": 1941,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "c1e2450e.9ab788"
-            ]
-        ]
-    },
-    {
-        "id": "1a5a80ca.68dab7",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='403' />\n<parameter name='error-message' value='hostname is not set' />\n",
-        "comments": "",
-        "x": 883,
-        "y": 1961,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "a12685e3.9f9a98",
-        "type": "comment",
-        "name": "Set resource-resolution-data.status based on successful value assignement",
-        "info": "Set service-data.vnfs.vnf[].vnf-data.vf-modules.vf-module[].vf-module-data.vf-module-topology.vf-module-parameters.param.resource-resolution-data.status\n to SUCCESS or FAILED depending on the SqlResource outcome",
-        "comments": "",
-        "x": 1143,
-        "y": 2446,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "2f76749a.2b83b4",
-        "type": "set",
-        "name": "set resource-resolution-data.status to SUCCESS",
-        "xml": "<set>\n<parameter name=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`\" value='SUCCESS'  />\n",
-        "comments": "",
-        "x": 1011,
-        "y": 3124,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "3f416124.1e15c6",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='tmp.mac_address not set' />\n",
-        "comments": "",
-        "x": 1073,
-        "y": 2566,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "75c48b23.e37de4",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 930,
-        "y": 2527,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3f416124.1e15c6",
-                "1ff13884.4c2d17",
-                "f7617ae2.7df4d8"
-            ]
-        ]
-    },
-    {
-        "id": "3741be1b.15fc72",
-        "type": "comment",
-        "name": "Find vf-module-parameters.name = vmxvpfe_sriov41_*",
-        "info": "Once those hardcoded names are found, set assigned mac-address to .value \nfor those 4 .names to the resolved mac-address.  Don’t set status to success until .values are set. ",
-        "comments": "",
-        "x": 1008,
-        "y": 2728,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "6998db76.d8596c",
-        "type": "comment",
-        "name": "Set address for vf-module-parameters to resolved MAC Address",
-        "info": "",
-        "comments": "",
-        "x": 1038,
-        "y": 2685,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "385bd99d.9d7cfe",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 819,
-        "y": 2629,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "95d963db.2ca348",
-                "2f76749a.2b83b4"
-            ]
-        ]
-    },
-    {
-        "id": "95d963db.2ca348",
-        "type": "for",
-        "name": "for each vf-module-parameters",
-        "xml": "<for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 940,
-        "y": 2781,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "33aef370.8e201c",
-                "d8ab3c37.8ebc18"
-            ]
-        ]
-    },
-    {
-        "id": "d8ab3c37.8ebc18",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: vf-module-param-index\"/>\n<parameter name=\"field3\" value='`$vf-module-param-index`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1152,
-        "y": 2781,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "33aef370.8e201c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 924,
-        "y": 2830,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "e1067dc2.b7ce18"
-            ]
-        ]
-    },
-    {
-        "id": "1d349e54.52f84a",
-        "type": "set",
-        "name": "set mac-address-assign test data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' value='5' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].name' value='vmxvpfe_sriov41_0_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].name' value='vmxvpfe_sriov41_1_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[1].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].name' value='vmxvpfe_sriov41_3_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[2].resource-resolution-data.resource-key[0].value' value='vnfname' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].name' value='vmxvpfe_sriov41_4_port_mac' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].value' value='somevalue' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.capability-name' value='mac-address-assign' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key_length' value='1' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key[0].name' value='vnf-name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[3].resource-resolution-data.resource-key[0].value' value='vnfname' />",
-        "comments": "",
-        "x": 791,
-        "y": 574,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "df22b093.43a4d8",
-        "type": "comment",
-        "name": "Set temporary test data * TEST-ONLY *",
-        "info": "",
-        "comments": "",
-        "x": 806,
-        "y": 533,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "a1c3aa1f.631768",
-        "type": "set",
-        "name": "set create-vpe-pool test data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].name' value='create-vpe-pool' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].value' value='somestatus' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.status' value='PENDING' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.capability-name' value='create-vpe-pool' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key_length' value='19' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[0].name' value='vpe_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[0].value' value='vpe_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[1].name' value='ipv4_oam_address' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[1].value' value='ipv4_oam_address' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[2].name' value='loopback0' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[2].value' value='loopback0' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[3].name' value='provisioning_status' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[3].value' value='provisioning_status' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[4].name' value='aic_site_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[4].value' value='aic_site_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[5].name' value='avaiablity_zone' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[5].value' value='avaiablity_zone' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[6].name' value='vlan_id_outer' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[6].value' value='vlan_id_outer' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[7].name' value='vendor' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[7].value' value='vendor' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[8].name' value='physical_intf_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[8].value' value='physical_intf_name' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[9].name' value='phyiscal_intf_speed' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[9].value' value='phyiscal_intf_speed' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[10].name' value='phyiscal_intf_units' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[10].value' value='phyiscal_intf_units' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[11].name' value='vpe_uuid' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[11].value' value='vpe_uuid' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[12].name' value='vpe_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[12].value' value='vpe_id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[13].name' value='image_filename' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[13].value' value='image_filename' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[14].name' value='as_number' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[14].value' value='as_number' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[15].name' value='loopback5000' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[15].value' value='loopback5000' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[16].name' value='loopback10' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[16].value' value='loopback10' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[17].name' value='aic_version' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[17].value' value='aic_version' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[18].name' value='vpe_capacity' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[4].resource-resolution-data.resource-key[18].value' value='vpe_capacity' />\n",
-        "comments": "",
-        "x": 778,
-        "y": 615,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "2895f95.030ce86",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 683,
-        "y": 1275,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "d14bad56.e3a97",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: resolved hostname: \"/>\n<parameter name=\"field3\" value='`$tmp.hostname`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 689,
-        "y": 1856,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "46b1ac07.04040c",
-        "type": "switchNode",
-        "name": "switch ss.capability-action",
-        "xml": "<switch test=\"`$ss.capability-action`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 274,
-        "y": 290,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "fa52f336.c892e8",
-                "4524de5f.8c7d28",
-                "270b2726.356e6",
-                "74e5990a.ea8258",
-                "1cf1b5aa.7b40da"
-            ]
-        ]
-    },
-    {
-        "id": "fa52f336.c892e8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 540,
-        "y": 273,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4524de5f.8c7d28",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 547,
-        "y": 313,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "dfd0d6f3.9529f"
-            ]
-        ]
-    },
-    {
-        "id": "270b2726.356e6",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 537,
-        "y": 353,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "74e5990a.ea8258",
-        "type": "other",
-        "name": "ASSIGN ",
-        "xml": "<outcome value='ASSIGN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 543,
-        "y": 394,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "11245c61.36b96c"
-            ]
-        ]
-    },
-    {
-        "id": "e9d93e1a.8dbad8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='ss.capability-action is not set' />\n",
-        "comments": "",
-        "x": 863,
-        "y": 349,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "1cf1b5aa.7b40da",
-        "type": "other",
-        "name": "UNASSIGN ",
-        "xml": "<outcome value='UNASSIGN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 551,
-        "y": 437,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "204b47e4.6ce83"
-            ]
-        ]
-    },
-    {
-        "id": "11245c61.36b96c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: ss.capability-action is ASSIGN\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 747,
-        "y": 394,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "204b47e4.6ce83",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: ss.capability-action is UNASSIGN\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 748,
-        "y": 437,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e1067dc2.b7ce18",
-        "type": "switchNode",
-        "name": "switch vf-module-parameters.param.name",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].name`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1073,
-        "y": 2881,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3ab7fa6a.76762e",
-                "2837aaed.d6930e",
-                "db0bc1db.6591e8",
-                "2928eec7.a6840a"
-            ]
-        ]
-    },
-    {
-        "id": "3ab7fa6a.76762e",
-        "type": "other",
-        "name": "vmxvpfe_sriov41_0_port_mac",
-        "xml": "<outcome value='vmxvpfe_sriov41_0_port_mac'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1102,
-        "y": 2929,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3e244c5c.acd454"
-            ]
-        ]
-    },
-    {
-        "id": "2837aaed.d6930e",
-        "type": "other",
-        "name": "vmxvpfe_sriov41_1_port_mac",
-        "xml": "<outcome value='vmxvpfe_sriov41_1_port_mac'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1102,
-        "y": 2975,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3e244c5c.acd454"
-            ]
-        ]
-    },
-    {
-        "id": "db0bc1db.6591e8",
-        "type": "other",
-        "name": "vmxvpfe_sriov41_3_port_mac",
-        "xml": "<outcome value='vmxvpfe_sriov41_3_port_mac'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1101,
-        "y": 3020,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3e244c5c.acd454"
-            ]
-        ]
-    },
-    {
-        "id": "2928eec7.a6840a",
-        "type": "other",
-        "name": "vmxvpfe_sriov41_4_port_mac",
-        "xml": "<outcome value='vmxvpfe_sriov41_4_port_mac'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1099,
-        "y": 3066,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3e244c5c.acd454"
-            ]
-        ]
-    },
-    {
-        "id": "3e244c5c.acd454",
-        "type": "set",
-        "name": "set vf-module-parameters.param.value to assigned mac address",
-        "xml": "<set>\n<parameter name=\"`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].value`\" value=\"`$tmp.mac-address.mac-address`\"  />\n",
-        "comments": "",
-        "x": 1508,
-        "y": 2993,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "3896f610.780a82",
-        "type": "delete",
-        "name": "delete",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='DELETE from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE hostname = $tmp.hostname'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 762,
-        "y": 3488,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "41e3c659.c4bda8",
-                "14d1b5c.99457ca"
-            ]
-        ]
-    },
-    {
-        "id": "c4cdc2fe.75772",
-        "type": "block",
-        "name": "block:atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 318,
-        "y": 3280,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "52060e3b.f84528",
-                "4b6a08ac.7e91d8"
-            ]
-        ]
-    },
-    {
-        "id": "93e77d0e.b6347",
-        "type": "comment",
-        "name": "DELETE from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING",
-        "info": "",
-        "comments": "",
-        "x": 475.5,
-        "y": 3239,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "52060e3b.f84528",
-        "type": "get-resource",
-        "name": "get hostname from map table",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"select * FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE HOSTNAME= $tmp.hostname\" pfx='tmp.map'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 406,
-        "y": 3323,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "5011ad08.9c6f44"
-            ]
-        ]
-    },
-    {
-        "id": "5011ad08.9c6f44",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 606,
-        "y": 3323,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "66a0310.f5e39d"
-            ]
-        ]
-    },
-    {
-        "id": "4b6a08ac.7e91d8",
-        "type": "switchNode",
-        "name": "switch hostname exists",
-        "xml": "<switch test=\"`$tmp.map.hostname`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 390,
-        "y": 3428,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "88f047ec.35cd08",
-                "e7acab38.93eee",
-                "62ed770e.70ae2",
-                "76caa25e.72ecdc"
-            ]
-        ]
-    },
-    {
-        "id": "76caa25e.72ecdc",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 608.5,
-        "y": 3368,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "66a0310.f5e39d"
-            ]
-        ]
-    },
-    {
-        "id": "88f047ec.35cd08",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 617.5,
-        "y": 3408,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "66a0310.f5e39d"
-            ]
-        ]
-    },
-    {
-        "id": "e7acab38.93eee",
-        "type": "outcome",
-        "name": "outcome Null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 628.5,
-        "y": 3448,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "66a0310.f5e39d"
-            ]
-        ]
-    },
-    {
-        "id": "62ed770e.70ae2",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 608.5,
-        "y": 3488,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3896f610.780a82"
-            ]
-        ]
-    },
-    {
-        "id": "b6bba451.a5d3e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />\n",
-        "comments": "",
-        "x": 909,
-        "y": 3389,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "e1cf1dc7.b690f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 932,
-        "y": 3552,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "96370836.88ef9"
-            ]
-        ]
-    },
-    {
-        "id": "14d1b5c.99457ca",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 891,
-        "y": 3511,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "e1cf1dc7.b690f"
-            ]
-        ]
-    },
-    {
-        "id": "41e3c659.c4bda8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 892,
-        "y": 3451,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "2c07581.42c3228"
-            ]
-        ]
-    },
-    {
-        "id": "acb31915.6f33c8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='405' />\n<parameter name='error-message' value='Failure deleting from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />\n",
-        "comments": "",
-        "x": 1173,
-        "y": 3493,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "96370836.88ef9",
-        "type": "for",
-        "name": "for each resource-resolution-data.resource-key",
-        "xml": "<for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1089,
-        "y": 3599,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "74a2b3b3.a1c03c"
-            ]
-        ]
-    },
-    {
-        "id": "74a2b3b3.a1c03c",
-        "type": "set",
-        "name": "set vf-module-parameters.param.value to assigned mac address",
-        "xml": "<set>\n<parameter name=\"`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`\" value=\"DELETED\"  />\n",
-        "comments": "",
-        "x": 1192,
-        "y": 3645,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "590fe198.9154e8",
-        "type": "comment",
-        "name": "Check that resource-resolution-data.status is PENDING",
-        "info": "",
-        "comments": "",
-        "x": 353,
-        "y": 1343,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "b15ff9d7.9a3c1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 696,
-        "y": 143,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "4826c96c.1ff9a",
-                "1fcf9155.035647"
-            ]
-        ]
-    },
-    {
-        "id": "4826c96c.1ff9a",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: ss.capability-name is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 836,
-        "y": 102,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9c475485.4de01",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 877,
-        "y": 140,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "f3b2c664.2dc58",
-        "type": "comment",
-        "name": "resrouce-resolution-data is not yet set",
-        "info": "",
-        "comments": "",
-        "x": 1135,
-        "y": 138,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "dfd0d6f3.9529f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 696,
-        "y": 313,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "3c1237ec.e8508",
-                "e9d93e1a.8dbad8"
-            ]
-        ]
-    },
-    {
-        "id": "3c1237ec.e8508",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: ss.capability-action is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 840,
-        "y": 271,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f23ac007.f78d8",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='resource-resolution-data.status' value='FAILURE'  />",
-        "comments": "",
-        "x": 881,
-        "y": 309,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "ab23ec9f.544cd8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 836,
-        "y": 664,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "bbb25e19.75576",
-                "b6f606b3.379d2"
-            ]
-        ]
-    },
-    {
-        "id": "bbb25e19.75576",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Failure calling self-service-capability-param-resolution\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 980,
-        "y": 643,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ee559ebe.72a07",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: hostname is not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 864,
-        "y": 1879,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "54db7014.b4c078",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 906,
-        "y": 1918,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "c1e2450e.9ab788",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 728,
-        "y": 1918,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "ee559ebe.72a07",
-                "54db7014.b4c078",
-                "1a5a80ca.68dab7"
-            ]
-        ]
-    },
-    {
-        "id": "1e311aa8.b5db05",
-        "type": "switchNode",
-        "name": "switch tmp.resource-resolution-data = PENDING",
-        "xml": "<switch test=\"`$tmp.resource-resolution-data.status == 'PENDING'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 345,
-        "y": 1401,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "6c8d8704.121a98"
-            ]
-        ]
-    },
-    {
-        "id": "df09c09a.47719",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 813,
-        "y": 1401,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "de049043.5ecd4",
-                "ae73d569.da404",
-                "6cc693a5.ea118c"
-            ]
-        ]
-    },
-    {
-        "id": "de049043.5ecd4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 953,
-        "y": 1361,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6cc693a5.ea118c",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 994,
-        "y": 1400,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "ae73d569.da404",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='reseouce-resolution-data.status is not PENDING' />\n",
-        "comments": "",
-        "x": 970,
-        "y": 1439,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "6c8d8704.121a98",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 649,
-        "y": 1401,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "df09c09a.47719"
-            ]
-        ]
-    },
-    {
-        "id": "f75c37d8.0bea6",
-        "type": "comment",
-        "name": "Assign / Unassign MAC address in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING",
-        "info": "",
-        "comments": "",
-        "x": 437,
-        "y": 2028,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "1b82acb5.6564eb",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1708,
-        "y": 2271,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "13a4606e.a26088",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1749,
-        "y": 2311,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "53838908.a977d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1571,
-        "y": 2310,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "1b82acb5.6564eb",
-                "13a4606e.a26088",
-                "bac47969.c95e9"
-            ]
-        ]
-    },
-    {
-        "id": "f7617ae2.7df4d8",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1099,
-        "y": 2527,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "1ff13884.4c2d17",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: tmp.mac_address not set\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1058,
-        "y": 2488,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bd286ea.4da711",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 893,
-        "y": 3309,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8948f92d.f38658",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 934,
-        "y": 3348,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "66a0310.f5e39d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 764,
-        "y": 3377,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "bd286ea.4da711",
-                "8948f92d.f38658",
-                "b6bba451.a5d3e8"
-            ]
-        ]
-    },
-    {
-        "id": "f47c4e2d.cdfed",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Failure deleting from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1155,
-        "y": 3412,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7692b063.86ed98",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1196,
-        "y": 3451,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    },
-    {
-        "id": "2c07581.42c3228",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1024,
-        "y": 3451,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "7692b063.86ed98",
-                "f47c4e2d.cdfed",
-                "acb31915.6f33c8"
-            ]
-        ]
-    },
-    {
-        "id": "1901da34.2587de",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 902,
-        "y": 2227,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            [
-                "2501b87c.cdcb38",
-                "350b82ae.f02db6",
-                "3e155c31.bc775c"
-            ]
-        ]
-    },
-    {
-        "id": "2501b87c.cdcb38",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"self-serve-mac-address-assign: Unable to access VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1038,
-        "y": 2188,
-        "z": "79c4dcde.151f74",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "350b82ae.f02db6",
-        "type": "set",
-        "name": "set status to FAILED",
-        "xml": "<set>\n<parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />",
-        "comments": "",
-        "x": 1080,
-        "y": 2227,
-        "z": "79c4dcde.151f74",
-        "wires": []
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.json
deleted file mode 100755
index 7b44c0f..0000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"id":"2e5dca9.d7da736","type":"execute","name":"send service-capacity-reserve-operation","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.capreserve.templatefile`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='post' />\n    <parameter name='responsePrefix' value='tmp.sscapres-response' />\n\n","comments":"","outputs":1,"x":1044.2146587371826,"y":952.6428833007812,"z":"3766be45.1340f2","wires":[["feeb287f.b56f78","406afb5f.817d14"]]},{"id":"feeb287f.b56f78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1299.7858600616455,"y":954.9288215637207,"z":"3766be45.1340f2","wires":[["975320c7.41878"]]},{"id":"975320c7.41878","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1422.6347904205322,"y":958.0361442565918,"z":"3766be45.1340f2","wires":[["6e616bf9.a673e4","31434e9e.02c892","6463f94e.c389a8"]]},{"id":"6e616bf9.a673e4","type":"record","name":"record failure","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: restapi reserve execution failed\"/>","comments":"","outputs":1,"x":1570.2149143218994,"y":926.21457862854,"z":"3766be45.1340f2","wires":[[]]},{"id":"f4369358.b0cfc","type":"dgstart","name":"DGSTART","outputs":1,"x":121,"y":83,"z":"3766be45.1340f2","wires":[["a5341348.6734f"]]},{"id":"a5341348.6734f","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":221.44043731689453,"y":138.32146644592285,"z":"3766be45.1340f2","wires":[["cfec7332.50833"]]},{"id":"cfec7332.50833","type":"method","name":"method self-serve-vlan-tag-assign","xml":"<method rpc='self-serve-vlan-tag-assign' mode='sync'>\n","comments":"","outputs":1,"x":196.607177734375,"y":211.89287757873535,"z":"3766be45.1340f2","wires":[["de0a5681.1c3af8"]]},{"id":"7f547845.02f9d8","type":"execute","name":"send service-capacity-release-operation","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.caprelease.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='post' />\n    <parameter name='responsePrefix' value='tmp.sscaprel-response' />\n\n","comments":"","outputs":1,"x":997.3574523925781,"y":1592.0001258850098,"z":"3766be45.1340f2","wires":[["45e5cee1.a617a","b66bc7e0.1aa058"]]},{"id":"57679e70.00d77","type":"for","name":"for each vnf-module param","xml":"<for index='capIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >","comments":"","outputs":1,"x":404.14276123046875,"y":486.6073303222656,"z":"3766be45.1340f2","wires":[["5d287582.a0cf4c"]]},{"id":"de0a5681.1c3af8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":194.64290618896484,"y":298.75003242492676,"z":"3766be45.1340f2","wires":[["8b719dcb.07fdf","94c4fb1b.c56528","993da09.d6dd36","57679e70.00d77"]]},{"id":"8b719dcb.07fdf","type":"execute","name":"execute readProperties","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":520.357177734375,"y":225.41665649414062,"z":"3766be45.1340f2","wires":[["fd63e71a.dbbaf8","2288fca9.491bb4"]]},{"id":"fd63e71a.dbbaf8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":730.9286346435547,"y":186.75000381469727,"z":"3766be45.1340f2","wires":[["a8be424b.ae295"]]},{"id":"2288fca9.491bb4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":725.7143783569336,"y":258.8214416503906,"z":"3766be45.1340f2","wires":[["e9c92d46.4e05a"]]},{"id":"e9c92d46.4e05a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":859.1427993774414,"y":257.2500057220459,"z":"3766be45.1340f2","wires":[["b950922e.2b5ef","6b1cbea6.7e424"]]},{"id":"a8be424b.ae295","type":"GenericXML","name":"record","xml":"<record  plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: read properties file.\" />","comments":"","outputs":1,"x":885.5356750488281,"y":187.6428508758545,"z":"3766be45.1340f2","wires":[[]]},{"id":"b950922e.2b5ef","type":"GenericXML","name":"record","xml":"<record  plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: failed to read properties file.\" />\n<parameter name=\"field4\" value=\"generic-resource-api-dg.properties\"/>","comments":"","outputs":1,"x":1063.4286422729492,"y":225.4285945892334,"z":"3766be45.1340f2","wires":[[]]},{"id":"6b1cbea6.7e424","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='self-serve-vlan-tag-assign: could not read generic-resource-api properties' />\n","comments":"","x":1068.1428833007812,"y":274.3928737640381,"z":"3766be45.1340f2","wires":[]},{"id":"31434e9e.02c892","type":"set","name":"set FAILED in service-data","xml":"<set>\n<parameter name='sscap.reserve.response-code' value='500' />\n<parameter name='sscap.reserve.response-message' value='Self Serve Capacity Api restapi reserve execution failed' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />\n","comments":"","x":1613.3574676513672,"y":971.6075496673584,"z":"3766be45.1340f2","wires":[]},{"id":"406afb5f.817d14","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1316.1071529388428,"y":1100.7144680023193,"z":"3766be45.1340f2","wires":[["96a8ccf3.28f77"]]},{"id":"80bbdace.317538","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1839.1434726715088,"y":1100.0003108978271,"z":"3766be45.1340f2","wires":[["986ced70.9f262","e0fef4b9.588998","31e3cce8.0d9774"]]},{"id":"e0fef4b9.588998","type":"record","name":"record success","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: reserve successful\"/>\n<parameter name=\"field4\" value='`$tmp.sscapres-response.response-code`'/>\n<parameter name=\"field5\" value='`$tmp.sscapres-response.response-message`'/>\n<parameter name=\"field6\" value='`$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].allocated`' />\n<parameter name=\"field7\" value='`$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].end-point-position`' />\n","comments":"","outputs":1,"x":1984.4017333984375,"y":1037.4644775390625,"z":"3766be45.1340f2","wires":[[]]},{"id":"986ced70.9f262","type":"set","name":"set SUCCESS in service-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='SUCCESS' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pmIdx].value' value='$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].allocated' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pmIdx].name' value='$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].end-point-position' />\n","comments":"","x":2026.6513214111328,"y":1112.3215341567993,"z":"3766be45.1340f2","wires":[]},{"id":"45e5cee1.a617a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1246.2858581542969,"y":1568.5715713500977,"z":"3766be45.1340f2","wires":[["c4ad509b.c0ede"]]},{"id":"b66bc7e0.1aa058","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1236.7147827148438,"y":1674.1788568496704,"z":"3766be45.1340f2","wires":[["c5c6312c.a01b7"]]},{"id":"c4ad509b.c0ede","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1363.420467376709,"y":1570.785846710205,"z":"3766be45.1340f2","wires":[["6309df91.77d2f","b44511ae.bf575","55fe953b.9fcd0c"]]},{"id":"e6278d71.397a4","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1771.715087890625,"y":1594.7143058776855,"z":"3766be45.1340f2","wires":[["e9013f35.6380e","6f5a407a.3f11e"]]},{"id":"6309df91.77d2f","type":"record","name":"record failure","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: restapi release execution failed\"/>","comments":"","outputs":1,"x":1509.3932075500488,"y":1529.6788539886475,"z":"3766be45.1340f2","wires":[[]]},{"id":"b44511ae.bf575","type":"set","name":"set FAILED in service-data","xml":"<set>\n<parameter name='sscap.release.response-code' value='500' />\n<parameter name='sscap.release.response-message' value='Self Serve Capacity Api restapi release execution failed' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />\n\n","comments":"","x":1560.7505340576172,"y":1573.107078552246,"z":"3766be45.1340f2","wires":[]},{"id":"e9013f35.6380e","type":"record","name":"record success","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: release successful\"/>\n<parameter name=\"field4\" value='`$tmp.sscaprel-response.response-code`'/>\n<parameter name=\"field5\" value='`$tmp.sscaprel-response.response-message`'/>\n","comments":"","outputs":1,"x":1924.6520080566406,"y":1557.8927221298218,"z":"3766be45.1340f2","wires":[[]]},{"id":"fd646403.afecc8","type":"switchNode","name":"switch capability action","xml":"<switch test=\"`$ss.capability-action`\">\n","comments":"","outputs":1,"x":397.1429138183594,"y":1095.7144794464111,"z":"3766be45.1340f2","wires":[["82183726.67eb28","444c2480.e1ccbc"]]},{"id":"82183726.67eb28","type":"other","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":627.9764823913574,"y":733.7142839431763,"z":"3766be45.1340f2","wires":[["2d01afd8.87d8f"]]},{"id":"444c2480.e1ccbc","type":"other","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":611.4287796020508,"y":1365.7144298553467,"z":"3766be45.1340f2","wires":[["cbdf7c42.0b938"]]},{"id":"94c4fb1b.c56528","type":"call","name":"call self-serve-capabilty-param-resolution","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >","comments":"","outputs":1,"x":533.7501220703125,"y":360.35711669921875,"z":"3766be45.1340f2","wires":[[]]},{"id":"800e2b0e.618c48","type":"set","name":"set rel-entity-id","xml":"<set>\n<parameter name='sscap.rel-entity-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1631.4285430908203,"y":1362.8568964004517,"z":"3766be45.1340f2","wires":[]},{"id":"2d01afd8.87d8f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":789.4643783569336,"y":731.2500267028809,"z":"3766be45.1340f2","wires":[["2e5dca9.d7da736","7ff997e7.61cb38","d7f90361.864ba","15d5c5ea.944a4a"]]},{"id":"cbdf7c42.0b938","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":791.4287109375,"y":1417.1429481506348,"z":"3766be45.1340f2","wires":[["7f547845.02f9d8","9576e42b.872ea8","1a2b41b4.0bac5e"]]},{"id":"5d287582.a0cf4c","type":"switchNode","name":"switch resource-resolution-data = ss.capability-name","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module.param[$capIdx].resource-resolution-data.capability-name == $ss.capability-name`\">","comments":"","outputs":1,"x":353.57135009765625,"y":582.2500610351562,"z":"3766be45.1340f2","wires":[["867edb26.b838c8"]]},{"id":"c5c6312c.a01b7","type":"switchNode","name":"switch response code","xml":"<switch test=\"`$tmp.sscaprel-response.response-code`\">\n","comments":"","outputs":1,"x":1417.9646911621094,"y":1674.8930168151855,"z":"3766be45.1340f2","wires":[["65171ccb.28dbb4","3696a26c.a660fe"]]},{"id":"96a8ccf3.28f77","type":"switchNode","name":"switch response code","xml":"<switch test=\"`$tmp.sscapres-response.response-code`\">\n","comments":"","outputs":1,"x":1515.8218479156494,"y":1129.0002269744873,"z":"3766be45.1340f2","wires":[["613ef895.7834c8","ca2896da.2f3628"]]},{"id":"613ef895.7834c8","type":"other","name":"200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1711.7140789031982,"y":1101.142861366272,"z":"3766be45.1340f2","wires":[["80bbdace.317538"]]},{"id":"65171ccb.28dbb4","type":"other","name":"200","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":1636.714500427246,"y":1652.928563117981,"z":"3766be45.1340f2","wires":[["e6278d71.397a4"]]},{"id":"752cd1d6.40da9","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1773.1430206298828,"y":1699.5359859466553,"z":"3766be45.1340f2","wires":[["70e8f618.3b6998","bbd58db3.9c973","990090e6.ae127"]]},{"id":"70e8f618.3b6998","type":"record","name":"record failure","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: release failed\"/>\n<parameter name=\"field4\" value='`$tmp.sscaprel-response.response-code`'/>\n<parameter name=\"field5\" value='`$tmp.sscaprel-response.response-message`'/>\n","comments":"","outputs":1,"x":1937.3299407958984,"y":1684.857666015625,"z":"3766be45.1340f2","wires":[[]]},{"id":"8d191674.7b4368","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":1851.7143993377686,"y":1178.571415901184,"z":"3766be45.1340f2","wires":[["aad48243.a2c27","6a3a1d2b.9f2594"]]},{"id":"aad48243.a2c27","type":"record","name":"record failure","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: reserve failed\"/>\n<parameter name=\"field4\" value='`$tmp.sscapres-response.response-code`'/>\n<parameter name=\"field5\" value='`$tmp.sscapres-response.response-message`'/>\n","comments":"","outputs":1,"x":2006.615665435791,"y":1163.1787090301514,"z":"3766be45.1340f2","wires":[[]]},{"id":"ca2896da.2f3628","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1718.5713939666748,"y":1179.1431674957275,"z":"3766be45.1340f2","wires":[["8d191674.7b4368"]]},{"id":"3696a26c.a660fe","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1634.5000457763672,"y":1693.7859859466553,"z":"3766be45.1340f2","wires":[["752cd1d6.40da9"]]},{"id":"867edb26.b838c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":330.1071434020996,"y":672.39284324646,"z":"3766be45.1340f2","wires":[["fd646403.afecc8"]]},{"id":"9576e42b.872ea8","type":"for","name":"for each resource key","xml":"<for index='rkIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key_length`' >","comments":"","outputs":1,"x":1017.1429290771484,"y":1423.4284057617188,"z":"3766be45.1340f2","wires":[["cb19edd3.f7eca"]]},{"id":"cb19edd3.f7eca","type":"switchNode","name":"switch resource key name","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].name`\">\n","comments":"","outputs":1,"x":1257.1429138183594,"y":1428.000015258789,"z":"3766be45.1340f2","wires":[["8697da6f.c8ae48","61ce5ca.55305a4","69787ca9.214c84"]]},{"id":"8697da6f.c8ae48","type":"other","name":"vnf-name","xml":"<outcome value='vnf-name'>\n","comments":"","outputs":1,"x":1461.428596496582,"y":1358.0001373291016,"z":"3766be45.1340f2","wires":[["800e2b0e.618c48"]]},{"id":"69787ca9.214c84","type":"other","name":"nf-role","xml":"<outcome value='nf-role'>\n","comments":"","outputs":1,"x":1467.1428451538086,"y":1400.8570976257324,"z":"3766be45.1340f2","wires":[["d288cf3.e768b3"]]},{"id":"61ce5ca.55305a4","type":"other","name":"vlan-tag-type","xml":"<outcome value='vlan-tag-type'>\n","comments":"","outputs":1,"x":1480.0000228881836,"y":1442.2857456207275,"z":"3766be45.1340f2","wires":[["969a9d1c.4858b"]]},{"id":"d288cf3.e768b3","type":"set","name":"set rel-entity-type","xml":"<set>\n<parameter name='sscap.rel-entity-type' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1628.571533203125,"y":1403.7142333984375,"z":"3766be45.1340f2","wires":[]},{"id":"969a9d1c.4858b","type":"set","name":"set rel-endpoint-position","xml":"<set>\n<parameter name='sscap.rel-endpoint-position' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1668.5714111328125,"y":1446.5715618133545,"z":"3766be45.1340f2","wires":[]},{"id":"7ff997e7.61cb38","type":"for","name":"for each resource key","xml":"<for index='rkIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key_length`' >","comments":"","outputs":1,"x":996.5356750488281,"y":708.0357646942139,"z":"3766be45.1340f2","wires":[["2bb15b3.0f680a4"]]},{"id":"2bb15b3.0f680a4","type":"switchNode","name":"switch resource key name","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].name`\">\n","comments":"","outputs":1,"x":1225.2856826782227,"y":708.1430397033691,"z":"3766be45.1340f2","wires":[["59f7ea26.4a1e04","db8ed527.405a78","ad6405c8.bf6b98","cfc08671.cb24b8","122b1ec8.a072f1"]]},{"id":"59f7ea26.4a1e04","type":"other","name":"vnf-name","xml":"<outcome value='vnf-name'>\n","comments":"","outputs":1,"x":1449.750144958496,"y":675.6431837081909,"z":"3766be45.1340f2","wires":[["c5534768.1726f8"]]},{"id":"ad6405c8.bf6b98","type":"other","name":"aic-site-id","xml":"<outcome value='aic-site-id'>\n","comments":"","outputs":1,"x":1451.8926239013672,"y":767.071605682373,"z":"3766be45.1340f2","wires":[["22b48e8b.a805c2"]]},{"id":"db8ed527.405a78","type":"other","name":"vlan-tag-type","xml":"<outcome value='vlan-tag-type'>\n","comments":"","outputs":1,"x":1458.5000457763672,"y":817.071704864502,"z":"3766be45.1340f2","wires":[["4b7b97b2.2d0078"]]},{"id":"c5534768.1726f8","type":"set","name":"set res-entity-id","xml":"<set>\n<parameter name='sscap.res-entity-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1629.0355987548828,"y":674.0713577270508,"z":"3766be45.1340f2","wires":[]},{"id":"22b48e8b.a805c2","type":"set","name":"set res-target-id","xml":"<set>\n<parameter name='sscap.res-target-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1634.571922302246,"y":766.8930892944336,"z":"3766be45.1340f2","wires":[]},{"id":"4b7b97b2.2d0078","type":"set","name":"set res-endpoint-position","xml":"<set>\n<parameter name='sscap.res-endpoint-position' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1664.928565979004,"y":819.036060333252,"z":"3766be45.1340f2","wires":[]},{"id":"d7f90361.864ba","type":"set","name":"set res-target-type","xml":"<set>\n<parameter name='sscap.res-target-type' value='`$prop.restapi.ss.capreserve.targettype`' />","comments":"","x":997.0715103149414,"y":643.2143783569336,"z":"3766be45.1340f2","wires":[]},{"id":"122b1ec8.a072f1","type":"other","name":"vlan-recipe","xml":"<outcome value='vlan-recipe'>\n","comments":"","outputs":1,"x":1446.8928146362305,"y":622.857195854187,"z":"3766be45.1340f2","wires":[["29007a85.cf4516"]]},{"id":"29007a85.cf4516","type":"set","name":"set res-service-model","xml":"<set>\n<parameter name='sscap.res-service-model' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1627.249855041504,"y":621.9996271133423,"z":"3766be45.1340f2","wires":[]},{"id":"cfc08671.cb24b8","type":"other","name":"nf-role","xml":"<outcome value='nf-role'>\n","comments":"","outputs":1,"x":1442.607566833496,"y":722.6786842346191,"z":"3766be45.1340f2","wires":[["a8aa861e.5b9688"]]},{"id":"a8aa861e.5b9688","type":"set","name":"set res-entity-type","xml":"<set>\n<parameter name='sscap.res-entity-type' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />\n","comments":"","x":1634.3931198120117,"y":723.2495822906494,"z":"3766be45.1340f2","wires":[]},{"id":"6a3a1d2b.9f2594","type":"set","name":"set FAILED in service-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />\n","comments":"","x":2043.0356063842773,"y":1218.714391708374,"z":"3766be45.1340f2","wires":[]},{"id":"6f5a407a.3f11e","type":"set","name":"set DELETED in service-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='DELETED' />\n","comments":"","x":1972.8570709228516,"y":1605.7143592834473,"z":"3766be45.1340f2","wires":[]},{"id":"bbd58db3.9c973","type":"set","name":"set FAILED in service-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />\n","comments":"","x":1971.4289627075195,"y":1730.178565979004,"z":"3766be45.1340f2","wires":[]},{"id":"31e3cce8.0d9774","type":"set","name":"set pmIdx","xml":"<set>\n<parameter name='pmIdx' value='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' />\n","comments":"","x":2005.7142868041992,"y":1071.642807006836,"z":"3766be45.1340f2","wires":[]},{"id":"990090e6.ae127","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='self-serve-vlan-tag-assign: release failed' />\n","comments":"","x":1930.000057220459,"y":1776.750051498413,"z":"3766be45.1340f2","wires":[]},{"id":"55fe953b.9fcd0c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='self-serve-vlan-tag-assign: release failed' />\n","comments":"","x":1510.75,"y":1621.25,"z":"3766be45.1340f2","wires":[]},{"id":"6463f94e.c389a8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='self-serve-vlan-tag-assign: reserve failed' />\n","comments":"","x":1577.5357151031494,"y":1017.607159614563,"z":"3766be45.1340f2","wires":[]},{"id":"15d5c5ea.944a4a","type":"record","name":"record reserve params","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: reserve params\"/>\n<parameter name=\"field4\" value='`$sscap.res-service-model`'/>\n<parameter name=\"field5\" value='`$sscap.res-entity-type`'/>\n<parameter name=\"field6\" value='`$sscap.res-entity-id`'/>\n<parameter name=\"field7\" value='`$sscap.res-target-type.`' />\n<parameter name=\"field8\" value='`$sscap.res-target-id`'/>\n<parameter name=\"field9\" value='`$sscap.res.endpoint-position`' />\n","comments":"","outputs":1,"x":1020.5000305175781,"y":795.5000267028809,"z":"3766be45.1340f2","wires":[[]]},{"id":"1a2b41b4.0bac5e","type":"record","name":"record release params","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API\"/>\n<parameter name=\"field3\" value=\"self-serve-vlan-tag-assign: release params\"/>\n<parameter name=\"field4\" value='`$sscap.res-entity-type`'/>\n<parameter name=\"field5\" value='`$sscap.res-entity-id`'/>\n<parameter name=\"field6\" value='`$sscap.res.endpoint-position`' />\n","comments":"","outputs":1,"x":1026.75,"y":1505,"z":"3766be45.1340f2","wires":[[]]},{"id":"993da09.d6dd36","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":226.25000762939453,"y":900.7500457763672,"z":"3766be45.1340f2","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index 0992fa6..185815d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "e71077a5.449178",
+    "id": "b2b2fc12.cf96d",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 94.00001907348633,
-    "y": 67.0000991821289,
-    "z": "ab45b2a0.2d254",
+    "x": 96.50000190734863,
+    "y": 38.00000286102295,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "e230874f.1ced38"
+        "6e50c528.de9a7c"
       ]
     ]
   },
   {
-    "id": "e230874f.1ced38",
+    "id": "6e50c528.de9a7c",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1311 +22,1311 @@
     "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": 269.0000228881836,
-    "y": 139.0001163482666,
-    "z": "ab45b2a0.2d254",
+    "x": 237.50000381469727,
+    "y": 115.0000171661377,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "fda28de9.a9688"
+        "f4bf8d69.ecd28"
       ]
     ]
   },
   {
-    "id": "fda28de9.a9688",
+    "id": "f4bf8d69.ecd28",
     "type": "method",
     "name": "sotn-attachment-topology-operation-create",
     "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 257.0001411437988,
-    "y": 227.0000991821289,
-    "z": "ab45b2a0.2d254",
+    "x": 225.5001220703125,
+    "y": 203,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "8e26551b.7dfe18"
+        "3bd3ace.6bd7c54"
       ]
     ]
   },
   {
-    "id": "8e26551b.7dfe18",
+    "id": "3bd3ace.6bd7c54",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 177.00007247924805,
-    "y": 976.0003471374512,
-    "z": "ab45b2a0.2d254",
+    "x": 145.50005340576172,
+    "y": 952.0002479553223,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "c93c04d7.3e5348",
-        "9950e65d.3636a8",
-        "1ae547a2.eaba88",
-        "65f23dcc.6522b4",
-        "3e30e763.22be28",
-        "aa28416d.6d08a",
-        "15ca2e29.9a7dd2",
-        "9b1a0521.5c3978",
-        "f24b78b1.fdc468",
-        "a64f1b8.759c3e8",
-        "ab5d9313.ad157",
-        "6c39c83c.d7b048",
-        "8b5e7723.d59fc8",
-        "6b976d2c.2711d4",
-        "c9e7bba5.2bcb28",
-        "5aa40ff8.faf21",
-        "46cb4068.e43d3",
-        "8bddffb6.5284",
-        "abedf313.5d507",
-        "fac542dd.1d112",
-        "b07d75d2.a2b088",
-        "26fdc495.60ac0c",
-        "a63f9a77.c174a8",
-        "e02c5c21.82a2",
-        "bde5bdf6.37338"
+        "e49d7cd0.24623",
+        "4a92eb0d.67e9c4",
+        "2dd15073.0da3b",
+        "5e1f3d4f.82c794",
+        "afc1bdf5.4b836",
+        "7d9ca6fb.249298",
+        "f5e2658.10ace98",
+        "3342f593.51121a",
+        "458e8426.a4810c",
+        "506bd024.3cd4a",
+        "ca1aa6f6.be5228",
+        "a07927be.544a08",
+        "2adeb8b.a94ce48",
+        "c51e932f.b0db6",
+        "16ace716.f64f39",
+        "91c11379.3848",
+        "c018ef66.ea6f",
+        "d7ef6ed3.36d06",
+        "9a473067.67045",
+        "91b59706.e4cdc8",
+        "cfbbadf0.d1c3a",
+        "e88d2834.1fdcf8",
+        "8fb59fb4.b6b0c",
+        "c224a6bb.b7b288",
+        "c765719e.98d15"
       ]
     ]
   },
   {
-    "id": "c90f1d50.24dc",
+    "id": "bc77dabb.b8dfe8",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 661.0767707824707,
-    "y": 136.4340181350708,
-    "z": "ab45b2a0.2d254",
+    "x": 629.5767517089844,
+    "y": 112.4339189529419,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "c93c04d7.3e5348",
+    "id": "e49d7cd0.24623",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 607.0000495910645,
-    "y": 192.00009155273438,
-    "z": "ab45b2a0.2d254",
+    "x": 575.5000305175781,
+    "y": 167.99999237060547,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "213269bc.4275f6",
-        "6419db5e.a2c0c4"
+        "ede8227d.3da0a",
+        "871d8b04.92b798"
       ]
     ]
   },
   {
-    "id": "213269bc.4275f6",
+    "id": "ede8227d.3da0a",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 805.0001373291016,
-    "y": 162.00008010864258,
-    "z": "ab45b2a0.2d254",
+    "x": 773.5001182556152,
+    "y": 137.99998092651367,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "eccd2036.554d7"
+        "8efccbca.23f2f8"
       ]
     ]
   },
   {
-    "id": "6419db5e.a2c0c4",
+    "id": "871d8b04.92b798",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 804.0000457763672,
-    "y": 199.00009059906006,
-    "z": "ab45b2a0.2d254",
+    "x": 772.5000267028809,
+    "y": 174.99999141693115,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "4ab8dc05.8f0984"
+        "4fdaace7.615964"
       ]
     ]
   },
   {
-    "id": "4ab8dc05.8f0984",
+    "id": "4fdaace7.615964",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
     "comments": "",
-    "x": 1002.0000343322754,
-    "y": 196.0001096725464,
-    "z": "ab45b2a0.2d254",
+    "x": 970.5000152587891,
+    "y": 172.00001049041748,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "9950e65d.3636a8",
+    "id": "4a92eb0d.67e9c4",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 574.9999732971191,
-    "y": 413.0001983642578,
-    "z": "ab45b2a0.2d254",
+    "x": 543.4999542236328,
+    "y": 389.0000991821289,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "1ae547a2.eaba88",
+    "id": "2dd15073.0da3b",
     "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": 575.261890411377,
-    "y": 494.66687965393066,
-    "z": "ab45b2a0.2d254",
+    "x": 543.7618713378906,
+    "y": 470.66678047180176,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "65f23dcc.6522b4",
+    "id": "5e1f3d4f.82c794",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 628.2619514465332,
-    "y": 581.6667976379395,
-    "z": "ab45b2a0.2d254",
+    "x": 596.7619323730469,
+    "y": 557.6666984558105,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "eccd2036.554d7",
+    "id": "8efccbca.23f2f8",
     "type": "execute",
     "name": "execute tmp.ar.allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1020.000114440918,
-    "y": 163.00008583068848,
-    "z": "ab45b2a0.2d254",
+    "x": 988.5000953674316,
+    "y": 138.99998664855957,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "90c2cdec.e7c9c"
+        "d4c15c7f.c9c6b"
       ]
     ]
   },
   {
-    "id": "90c2cdec.e7c9c",
+    "id": "d4c15c7f.c9c6b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1238.000156402588,
-    "y": 163.00004959106445,
-    "z": "ab45b2a0.2d254",
+    "x": 1206.5001373291016,
+    "y": 138.99995040893555,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "a192b9fd.7610f8"
+        "4780ce03.07d49"
       ]
     ]
   },
   {
-    "id": "a192b9fd.7610f8",
+    "id": "4780ce03.07d49",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
     "comments": "",
-    "x": 1404.0001106262207,
-    "y": 163.0000638961792,
-    "z": "ab45b2a0.2d254",
+    "x": 1372.5000915527344,
+    "y": 138.9999647140503,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "66a512c5.0faacc",
+    "id": "cd668aab.887ef8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1134.000249862671,
-    "y": 653.7779703140259,
-    "z": "ab45b2a0.2d254",
+    "x": 1102.5002307891846,
+    "y": 629.777871131897,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "19566392.15832c"
+        "43f948c5.8e3c48"
       ]
     ]
   },
   {
-    "id": "2a3354d7.ee765c",
+    "id": "fff5fcf9.b91b7",
     "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: Existing connection attachment allotted resource\" />\n    \n",
     "comments": "",
-    "x": 1867.5186290740967,
-    "y": 654.8440418243408,
-    "z": "ab45b2a0.2d254",
+    "x": 1836.0186100006104,
+    "y": 630.8439426422119,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "70da4f2f.1d3ca",
+    "id": "ae16b108.dde0f",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 990.000171661377,
-    "y": 587.778037071228,
-    "z": "ab45b2a0.2d254",
+    "x": 958.5001525878906,
+    "y": 563.7779378890991,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "66ac283c.bd2348",
+    "id": "ada117fc.11b638",
     "type": "for",
     "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
     "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1510.6667175292969,
-    "y": 798.0001494884491,
-    "z": "ab45b2a0.2d254",
+    "x": 1479.1666984558105,
+    "y": 774.0000503063202,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "c03dacc1.547db"
+        "e40e8409.36d7f8"
       ]
     ]
   },
   {
-    "id": "aa28416d.6d08a",
+    "id": "7d9ca6fb.249298",
     "type": "switchNode",
     "name": "switch service-data.consumed-allotted-resources_length",
     "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 692.6660423278809,
-    "y": 774.7141819000244,
-    "z": "ab45b2a0.2d254",
+    "x": 661.1660232543945,
+    "y": 750.7140827178955,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "ae723a2a.13be98",
-        "1678938e.1bfafc"
+        "6fbc583.8ed6aa8",
+        "2f545e93.6ba8a2"
       ]
     ]
   },
   {
-    "id": "ae723a2a.13be98",
+    "id": "6fbc583.8ed6aa8",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 996.8089408874512,
-    "y": 743.5716190338135,
-    "z": "ab45b2a0.2d254",
+    "x": 965.3089218139648,
+    "y": 719.5715198516846,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "9ff14f9b.0b3b"
+        "a95f5b55.d6e9b8"
       ]
     ]
   },
   {
-    "id": "1678938e.1bfafc",
+    "id": "2f545e93.6ba8a2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 973.8089904785156,
-    "y": 804.5715742111206,
-    "z": "ab45b2a0.2d254",
+    "x": 942.3089714050293,
+    "y": 780.5714750289917,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "79d1a933.7fd6a8"
+        "7d9f20d0.5505c"
       ]
     ]
   },
   {
-    "id": "79d1a933.7fd6a8",
+    "id": "7d9f20d0.5505c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1133.9360809326172,
-    "y": 802.6975507736206,
-    "z": "ab45b2a0.2d254",
+    "x": 1102.4360618591309,
+    "y": 778.6974515914917,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "66ac283c.bd2348",
-        "3b659fae.e519",
-        "a32862a8.8af3d"
+        "ada117fc.11b638",
+        "67b14806.59d9a8",
+        "458ffc55.d5db04"
       ]
     ]
   },
   {
-    "id": "9ff14f9b.0b3b",
+    "id": "a95f5b55.d6e9b8",
     "type": "set",
     "name": "set cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
     "comments": "",
-    "x": 1146.6659240722656,
-    "y": 741.2856693267822,
-    "z": "ab45b2a0.2d254",
+    "x": 1115.1659049987793,
+    "y": 717.2855701446533,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "15ca2e29.9a7dd2",
+    "id": "f5e2658.10ace98",
     "type": "set",
     "name": "set consumed allotted resources",
     "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
     "comments": "",
-    "x": 621.5233345031738,
-    "y": 878.2857465744019,
-    "z": "ab45b2a0.2d254",
+    "x": 590.0233154296875,
+    "y": 854.285647392273,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "3b659fae.e519",
+    "id": "67b14806.59d9a8",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1323.0511283874512,
-    "y": 834.7090735435486,
-    "z": "ab45b2a0.2d254",
+    "x": 1291.5511093139648,
+    "y": 810.7089743614197,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "966db31a.47786"
+        "b4f07caa.1eece"
       ]
     ]
   },
   {
-    "id": "966db31a.47786",
+    "id": "b4f07caa.1eece",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1513.051082611084,
-    "y": 834.7090106010437,
-    "z": "ab45b2a0.2d254",
+    "x": 1481.5510635375977,
+    "y": 810.7089114189148,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "b95410b0.660fd"
+        "9b5a2a9b.791398"
       ]
     ]
   },
   {
-    "id": "b95410b0.660fd",
+    "id": "9b5a2a9b.791398",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1679.051082611084,
-    "y": 834.7090106010437,
-    "z": "ab45b2a0.2d254",
+    "x": 1647.5510635375977,
+    "y": 810.7089114189148,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "2ab57899.a130b8"
+        "82e04cf1.4917b"
       ]
     ]
   },
   {
-    "id": "c03dacc1.547db",
+    "id": "e40e8409.36d7f8",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1927.7783470153809,
-    "y": 795.0001764297485,
-    "z": "ab45b2a0.2d254",
+    "x": 1896.2783279418945,
+    "y": 771.0000772476196,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "ba9ad589.8abb58"
+        "f29e0cd9.704ae"
       ]
     ]
   },
   {
-    "id": "ba9ad589.8abb58",
+    "id": "f29e0cd9.704ae",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2109.587921142578,
-    "y": 795.4646234512329,
-    "z": "ab45b2a0.2d254",
+    "x": 2078.087902069092,
+    "y": 771.464524269104,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "ef75ff36.6e6a8"
+        "60273371.090a2c"
       ]
     ]
   },
   {
-    "id": "2ab57899.a130b8",
+    "id": "82e04cf1.4917b",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
     "comments": "",
-    "x": 1840.9244651794434,
-    "y": 834.2207117080688,
-    "z": "ab45b2a0.2d254",
+    "x": 1809.424446105957,
+    "y": 810.2206125259399,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "e6f158d3.3c83a8",
+    "id": "9b1a4b9d.344fd8",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 713.6672554016113,
-    "y": 705.0001459121704,
-    "z": "ab45b2a0.2d254",
+    "x": 682.167236328125,
+    "y": 681.0000467300415,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "464592d5.7d3adc",
+    "id": "57f62d80.43fe94",
     "type": "comment",
     "name": "This set resource will be added to MDSAL by provider code",
     "info": "Below we add to service-data.consumed-allotted-resource at last index",
     "comments": "",
-    "x": 701.000171661377,
-    "y": 843.7782382965088,
-    "z": "ab45b2a0.2d254",
+    "x": 669.5001525878906,
+    "y": 819.7781391143799,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "a63f9a77.c174a8",
+    "id": "8fb59fb4.b6b0c",
     "type": "update",
     "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 577.6909523010254,
-    "y": 1914.5320167541504,
-    "z": "ab45b2a0.2d254",
+    "x": 556.1909332275391,
+    "y": 1876.5319156646729,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "8865c331.63809",
-        "3795c6dc.0749ba"
+        "a1966a3.5032b98",
+        "3409a13c.09f89e"
       ]
     ]
   },
   {
-    "id": "8865c331.63809",
+    "id": "a1966a3.5032b98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 801.4528045654297,
-    "y": 1884.4845905303955,
-    "z": "ab45b2a0.2d254",
+    "x": 769.9527854919434,
+    "y": 1860.4844913482666,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "4e95350f.9bd78c"
+        "9c3ee63e.5c5548"
       ]
     ]
   },
   {
-    "id": "4e95350f.9bd78c",
+    "id": "9c3ee63e.5c5548",
     "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=\"AAI failed\" />\n",
     "comments": "",
-    "x": 967.9766845703125,
-    "y": 1896.1036615371704,
-    "z": "ab45b2a0.2d254",
+    "x": 936.4766654968262,
+    "y": 1872.1035623550415,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "3795c6dc.0749ba",
+    "id": "3409a13c.09f89e",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 808.5480918884277,
-    "y": 1917.246558189392,
-    "z": "ab45b2a0.2d254",
+    "x": 777.0480728149414,
+    "y": 1893.2464590072632,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "4e95350f.9bd78c"
+        "9c3ee63e.5c5548"
       ]
     ]
   },
   {
-    "id": "e8bcac4.3e63b5",
+    "id": "72ae40d1.ad37d",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 583.5005073547363,
-    "y": 1836.8339614868164,
-    "z": "ab45b2a0.2d254",
+    "x": 552.00048828125,
+    "y": 1812.8338623046875,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "9ada057d.8d0ed8",
+    "id": "a332d2fb.609ff",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 647.0000190734863,
-    "y": 245.0000991821289,
-    "z": "ab45b2a0.2d254",
+    "x": 615.5,
+    "y": 221,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "3e30e763.22be28",
+    "id": "afc1bdf5.4b836",
     "type": "switchNode",
     "name": "switch allotted-resource-type",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 608.9233283996582,
-    "y": 285.5661554336548,
-    "z": "ab45b2a0.2d254",
+    "x": 577.4233093261719,
+    "y": 261.5660562515259,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "1b1ef42.aa2a50c",
-        "5b1a6ad6.d32444"
+        "cf33bc7c.594b3",
+        "977436f5.c716c8"
       ]
     ]
   },
   {
-    "id": "1b1ef42.aa2a50c",
+    "id": "cf33bc7c.594b3",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 811.9234809875488,
-    "y": 270.56615829467773,
-    "z": "ab45b2a0.2d254",
+    "x": 780.4234619140625,
+    "y": 246.56605911254883,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "23a0059d.3f004a"
+        "382edb8d.38df44"
       ]
     ]
   },
   {
-    "id": "5b1a6ad6.d32444",
+    "id": "977436f5.c716c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 804.9233093261719,
-    "y": 310.5661783218384,
-    "z": "ab45b2a0.2d254",
+    "x": 773.4232902526855,
+    "y": 286.5660791397095,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "e101a8fa.94ec78"
+        "2162049e.dcac4c"
       ]
     ]
   },
   {
-    "id": "e101a8fa.94ec78",
+    "id": "2162049e.dcac4c",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
     "comments": "",
-    "x": 1036.9232940673828,
-    "y": 310.56618309020996,
-    "z": "ab45b2a0.2d254",
+    "x": 1005.4232749938965,
+    "y": 286.56608390808105,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "535c3465.db6a5c",
+    "id": "689a35d2.e3d7ac",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 671.9999809265137,
-    "y": 380.0000991821289,
-    "z": "ab45b2a0.2d254",
+    "x": 640.4999618530273,
+    "y": 356,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "7158b402.34b20c",
+    "id": "adaba0c1.0cdca",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 646.9999656677246,
-    "y": 461.8890085220337,
-    "z": "ab45b2a0.2d254",
+    "x": 615.4999465942383,
+    "y": 437.8889093399048,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "8b7046e5.63a738",
+    "id": "bdfc2cb5.718fd",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 613.0000495910645,
-    "y": 550.8890256881714,
-    "z": "ab45b2a0.2d254",
+    "x": 581.5000305175781,
+    "y": 526.8889265060425,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "41e867cd.171798",
+    "id": "882372f2.e4c61",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 614.4444923400879,
-    "y": 736.888970375061,
-    "z": "ab45b2a0.2d254",
+    "x": 582.9444732666016,
+    "y": 712.8888711929321,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "abedf313.5d507",
+    "id": "9a473067.67045",
     "type": "set",
     "name": "set output to api handler",
     "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 592.2681541442871,
-    "y": 1800.3592882156372,
-    "z": "ab45b2a0.2d254",
+    "x": 560.7681350708008,
+    "y": 1776.3591890335083,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "fac542dd.1d112",
+    "id": "91b59706.e4cdc8",
     "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": 536.6813507080078,
-    "y": 2033.975341796875,
-    "z": "ab45b2a0.2d254",
+    "x": 510.18128967285156,
+    "y": 2026.9751167297363,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "23a0059d.3f004a",
+    "id": "382edb8d.38df44",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1051.0001678466797,
-    "y": 271.00008487701416,
-    "z": "ab45b2a0.2d254",
+    "x": 1019.5001487731934,
+    "y": 246.99998569488525,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "77c2c758.5059b8",
+    "id": "7cc17548.dbfedc",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 893.9941749572754,
-    "y": 1649.4938287734985,
-    "z": "ab45b2a0.2d254",
+    "x": 862.4941558837891,
+    "y": 1625.4937295913696,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bddffb6.5284",
+    "id": "d7ef6ed3.36d06",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 643.0002861022949,
-    "y": 1734.0002174377441,
-    "z": "ab45b2a0.2d254",
+    "x": 611.5002670288086,
+    "y": 1710.0001182556152,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "d13a7894.7c9648",
-        "a17ed53e.8a7c48",
-        "2a45ba4f.903ad6"
+        "5ed47414.f6a9ec",
+        "9d623053.1780e",
+        "f8eb328d.71989"
       ]
     ]
   },
   {
-    "id": "d13a7894.7c9648",
+    "id": "5ed47414.f6a9ec",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 892.6416397094727,
-    "y": 1772.3315477371216,
-    "z": "ab45b2a0.2d254",
+    "x": 861.1416206359863,
+    "y": 1748.3314485549927,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "2a58bb37.857ca4"
+        "ee36b0d3.645c5"
       ]
     ]
   },
   {
-    "id": "a17ed53e.8a7c48",
+    "id": "9d623053.1780e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 883.6416893005371,
-    "y": 1740.8315734863281,
-    "z": "ab45b2a0.2d254",
+    "x": 852.1416702270508,
+    "y": 1716.8314743041992,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "2a58bb37.857ca4"
+        "ee36b0d3.645c5"
       ]
     ]
   },
   {
-    "id": "2a45ba4f.903ad6",
+    "id": "f8eb328d.71989",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 887.3917274475098,
-    "y": 1711.1886783614755,
-    "z": "ab45b2a0.2d254",
+    "x": 855.8917083740234,
+    "y": 1687.1885791793466,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "4b685690.de2cf8"
+        "3e7a6f90.4daaf"
       ]
     ]
   },
   {
-    "id": "2a58bb37.857ca4",
+    "id": "ee36b0d3.645c5",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1053.3917274475098,
-    "y": 1741.581597328186,
-    "z": "ab45b2a0.2d254",
+    "x": 1021.8917083740234,
+    "y": 1717.5814981460571,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "4b685690.de2cf8",
+    "id": "3e7a6f90.4daaf",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1029.047695159912,
-    "y": 1707.3808475509286,
-    "z": "ab45b2a0.2d254",
+    "x": 997.5476760864258,
+    "y": 1683.3807483687997,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab5d9313.ad157",
+    "id": "ca1aa6f6.be5228",
     "type": "execute",
     "name": "execute RestApiCallNode - Update parent provided service AR",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 712.9999732971191,
-    "y": 1160.0002641677856,
-    "z": "ab45b2a0.2d254",
+    "x": 681.4999542236328,
+    "y": 1136.0001649856567,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "9094ff9e.53d26",
-        "43bc3599.27bffc",
-        "fc9fd873.a374e8"
+        "10d6c8ff.30a7e7",
+        "fdb9bed8.ececf",
+        "d7a65ee0.6afc7"
       ]
     ]
   },
   {
-    "id": "9094ff9e.53d26",
+    "id": "10d6c8ff.30a7e7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1021.308032989502,
-    "y": 1191.9985399246216,
-    "z": "ab45b2a0.2d254",
+    "x": 989.8080139160156,
+    "y": 1167.9984407424927,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "421ec30a.485b8c"
+        "c03cc053.bc771"
       ]
     ]
   },
   {
-    "id": "43bc3599.27bffc",
+    "id": "fdb9bed8.ececf",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1012.3080825805664,
-    "y": 1160.4985656738281,
-    "z": "ab45b2a0.2d254",
+    "x": 980.8080635070801,
+    "y": 1136.4984664916992,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "421ec30a.485b8c"
+        "c03cc053.bc771"
       ]
     ]
   },
   {
-    "id": "fc9fd873.a374e8",
+    "id": "d7a65ee0.6afc7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1016.0581207275391,
-    "y": 1130.8556705489755,
-    "z": "ab45b2a0.2d254",
+    "x": 984.5581016540527,
+    "y": 1106.8555713668466,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "c6163b00.f85308"
+        "c4688568.f7e6a8"
       ]
     ]
   },
   {
-    "id": "421ec30a.485b8c",
+    "id": "c03cc053.bc771",
     "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1182.058120727539,
-    "y": 1161.248589515686,
-    "z": "ab45b2a0.2d254",
+    "x": 1150.5581016540527,
+    "y": 1137.2484903335571,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "c6163b00.f85308",
+    "id": "c4688568.f7e6a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1157.7140884399414,
-    "y": 1127.0478397384286,
-    "z": "ab45b2a0.2d254",
+    "x": 1126.214069366455,
+    "y": 1103.0477405562997,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "f91628dc.a22298",
+    "id": "8a0df30e.6ab87",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 641.9999198913574,
-    "y": 1122.0001707077026,
-    "z": "ab45b2a0.2d254",
+    "x": 610.4999008178711,
+    "y": 1098.0000715255737,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "8b5e7723.d59fc8",
+    "id": "2adeb8b.a94ce48",
     "type": "set",
     "name": "set connection-attachment-ar-identifiers",
     "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
     "comments": "",
-    "x": 638.357105255127,
-    "y": 1324.571789741516,
-    "z": "ab45b2a0.2d254",
+    "x": 606.8570861816406,
+    "y": 1300.5716905593872,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "6c39c83c.d7b048",
+    "id": "a07927be.544a08",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
     "comments": "",
-    "x": 552.2138862609863,
-    "y": 1292.3811464309692,
-    "z": "ab45b2a0.2d254",
+    "x": 520.7138671875,
+    "y": 1268.3810472488403,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "6b976d2c.2711d4",
+    "id": "c51e932f.b0db6",
     "type": "set",
     "name": "set identifiers in overall structure",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
     "comments": "",
-    "x": 617.1669044494629,
-    "y": 1358.6669750213623,
-    "z": "ab45b2a0.2d254",
+    "x": 585.6668853759766,
+    "y": 1334.6668758392334,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "c9e7bba5.2bcb28",
+    "id": "16ace716.f64f39",
     "type": "execute",
     "name": "execute getTime",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 569.4997444152832,
-    "y": 1432.0005025863647,
-    "z": "ab45b2a0.2d254",
+    "x": 537.9997253417969,
+    "y": 1408.0004034042358,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "5aa40ff8.faf21",
+    "id": "91c11379.3848",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 620.4867820739746,
-    "y": 1487.951735496521,
-    "z": "ab45b2a0.2d254",
+    "x": 588.9867630004883,
+    "y": 1463.951636314392,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "46cb4068.e43d3",
+    "id": "c018ef66.ea6f",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 565.0554008483887,
-    "y": 1393.5558605194092,
-    "z": "ab45b2a0.2d254",
+    "x": 533.5553817749023,
+    "y": 1369.5557613372803,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "b1148074.b83dc",
+    "id": "34c8d9e7.5935d6",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 682.3888893127441,
-    "y": 1258.5557069778442,
-    "z": "ab45b2a0.2d254",
+    "x": 650.8888702392578,
+    "y": 1234.5556077957153,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "a64f1b8.759c3e8",
+    "id": "506bd024.3cd4a",
     "type": "execute",
     "name": "generate parent-ar url - replace allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 677.5000343322754,
-    "y": 1086.0001096725464,
-    "z": "ab45b2a0.2d254",
+    "x": 646.0000152587891,
+    "y": 1062.0000104904175,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "f24b78b1.fdc468",
+    "id": "458e8426.a4810c",
     "type": "execute",
     "name": "generate parent-ar url - replace service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 673.4999580383301,
-    "y": 1043.0002460479736,
-    "z": "ab45b2a0.2d254",
+    "x": 641.9999389648438,
+    "y": 1019.0001468658447,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c890ede.9091d",
+    "id": "cd63ec4b.ff1cb",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 591.500415802002,
-    "y": 972.0001993179321,
-    "z": "ab45b2a0.2d254",
+    "x": 560.0003967285156,
+    "y": 948.0001001358032,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "9b1a0521.5c3978",
+    "id": "3342f593.51121a",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 630.5002098083496,
-    "y": 1005.500138759613,
-    "z": "ab45b2a0.2d254",
+    "x": 599.0001907348633,
+    "y": 981.5000395774841,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "1dce57cb.3a2f28",
+    "id": "367a31a2.e26f2e",
     "type": "comment",
     "name": "Required for filling template values",
     "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
     "comments": "",
-    "x": 820.0003776550293,
-    "y": 1612.4999017715454,
-    "z": "ab45b2a0.2d254",
+    "x": 788.500358581543,
+    "y": 1588.4998025894165,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "ef75ff36.6e6a8",
+    "id": "60273371.090a2c",
     "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
     "comments": "",
-    "x": 2187.756992340088,
-    "y": 843.6459283828735,
-    "z": "ab45b2a0.2d254",
+    "x": 2156.2569732666016,
+    "y": 819.6458292007446,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "a32862a8.8af3d",
+    "id": "458ffc55.d5db04",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1313.6461639404297,
-    "y": 755.3126714229584,
-    "z": "ab45b2a0.2d254",
+    "x": 1282.1461448669434,
+    "y": 731.3125722408295,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "46efcfd6.a7a1a",
+    "id": "9861d990.de9418",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 702.2015266418457,
-    "y": 939.9793558120728,
-    "z": "ab45b2a0.2d254",
+    "x": 670.7015075683594,
+    "y": 915.9792566299438,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "b6eb1599.cd85e8",
+    "id": "3b543dd4.ce0012",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 622.9687156677246,
-    "y": 1225.969036102295,
-    "z": "ab45b2a0.2d254",
+    "x": 591.4686965942383,
+    "y": 1201.968936920166,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "19566392.15832c",
+    "id": "43f948c5.8e3c48",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1296.0000705718994,
-    "y": 653.2778596878052,
-    "z": "ab45b2a0.2d254",
+    "x": 1264.500051498413,
+    "y": 629.2777605056763,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "be105cba.576f"
+        "8dd70ad1.fb4fc8"
       ]
     ]
   },
   {
-    "id": "be105cba.576f",
+    "id": "8dd70ad1.fb4fc8",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1483.8574504852295,
-    "y": 653.8969950675964,
-    "z": "ab45b2a0.2d254",
+    "x": 1452.3574314117432,
+    "y": 629.8968958854675,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "a5af4603.e786b8"
+        "fbc1bfeb.141c9"
       ]
     ]
   },
   {
-    "id": "a5af4603.e786b8",
+    "id": "fbc1bfeb.141c9",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1683.1905727386475,
-    "y": 653.8970737457275,
-    "z": "ab45b2a0.2d254",
+    "x": 1651.6905536651611,
+    "y": 629.8969745635986,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "2a3354d7.ee765c"
+        "fff5fcf9.b91b7"
       ]
     ]
   },
   {
-    "id": "b07d75d2.a2b088",
+    "id": "cfbbadf0.d1c3a",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 768.000072479248,
-    "y": 648.0001354217529,
-    "z": "ab45b2a0.2d254",
+    "x": 736.5000534057617,
+    "y": 624.000036239624,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "66a512c5.0faacc",
-        "9a3ff920.b9ec88"
+        "cd668aab.887ef8",
+        "bae083e9.e29fb"
       ]
     ]
   },
   {
-    "id": "9a3ff920.b9ec88",
+    "id": "bae083e9.e29fb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1136.0001029968262,
-    "y": 618.0001335144043,
-    "z": "ab45b2a0.2d254",
+    "x": 1104.5000839233398,
+    "y": 594.0000343322754,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "9cab679f.f79248"
+        "3e8fa261.9dd48e"
       ]
     ]
   },
   {
-    "id": "9cab679f.f79248",
+    "id": "3e8fa261.9dd48e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1288.0001029968262,
-    "y": 617.0001335144043,
-    "z": "ab45b2a0.2d254",
+    "x": 1256.5000839233398,
+    "y": 593.0000343322754,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "26fdc495.60ac0c",
+    "id": "e88d2834.1fdcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 564.5556297302246,
-    "y": 1567.6667528152466,
-    "z": "ab45b2a0.2d254",
+    "x": 533.0556106567383,
+    "y": 1543.6666536331177,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "3267c7d4.904798",
-        "77c2c758.5059b8"
+        "89eae9c8.150108",
+        "7cc17548.dbfedc"
       ]
     ]
   },
   {
-    "id": "3267c7d4.904798",
+    "id": "89eae9c8.150108",
     "type": "for",
     "name": "for each sotn-get-request-input-param",
     "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 834.5556945800781,
-    "y": 1567.6668004989624,
-    "z": "ab45b2a0.2d254",
+    "x": 803.0556755065918,
+    "y": 1543.6667013168335,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "2605999a.01d556"
+        "a8e3f2e1.dc676"
       ]
     ]
   },
   {
-    "id": "2051e6d6.e5a81a",
+    "id": "2789cf1d.918af",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1374.555477142334,
-    "y": 1523.6668338775635,
-    "z": "ab45b2a0.2d254",
+    "x": 1343.0554580688477,
+    "y": 1499.6667346954346,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "43dec0c4.9aa5a",
+    "id": "b944f1f.576e11",
     "type": "execute",
     "name": "execute split parameterName",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1332.590145111084,
-    "y": 1558.6459770202637,
-    "z": "ab45b2a0.2d254",
+    "x": 1301.0901260375977,
+    "y": 1534.6458778381348,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "e2d39b7e.8a6eb8",
+    "id": "ab8b4370.c5cdb",
     "type": "set",
     "name": "set parameterName",
     "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
     "comments": "",
-    "x": 1303.0346717834473,
-    "y": 1591.6459770202637,
-    "z": "ab45b2a0.2d254",
+    "x": 1271.534652709961,
+    "y": 1567.6458778381348,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "36eb754f.ed7b4a",
+    "id": "426abdbb.ca9194",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 775.5556221008301,
-    "y": 1535.1111145019531,
-    "z": "ab45b2a0.2d254",
+    "x": 744.0556030273438,
+    "y": 1511.1110153198242,
+    "z": "f5fcb4a8.869698",
     "wires": []
   },
   {
-    "id": "2605999a.01d556",
+    "id": "a8e3f2e1.dc676",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1081.5555305480957,
-    "y": 1566.1111450195312,
-    "z": "ab45b2a0.2d254",
+    "x": 1050.0555114746094,
+    "y": 1542.1110458374023,
+    "z": "f5fcb4a8.869698",
     "wires": [
       [
-        "43dec0c4.9aa5a",
-        "e2d39b7e.8a6eb8"
+        "b944f1f.576e11",
+        "ab8b4370.c5cdb"
       ]
     ]
   },
   {
-    "id": "e02c5c21.82a2",
+    "id": "c224a6bb.b7b288",
     "type": "save",
     "name": "save srcLTP relationship in AAI",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 590.0041046142578,
-    "y": 1988.0046367645264,
-    "z": "ab45b2a0.2d254",
+    "x": 569.5040016174316,
+    "y": 1976.004249572754,
+    "z": "f5fcb4a8.869698",
     "wires": [
       []
     ]
   },
   {
-    "id": "bde5bdf6.37338",
+    "id": "c765719e.98d15",
     "type": "set",
     "name": "set src-ltpId",
     "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n",
     "comments": "",
-    "x": 534.0001983642578,
-    "y": 1952.0004014968872,
-    "z": "ab45b2a0.2d254",
+    "x": 509.5000991821289,
+    "y": 1933.0003423690796,
+    "z": "f5fcb4a8.869698",
     "wires": []
   }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 212b3cb..2a7ca5e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "75ca7680.1d3a58",
+    "id": "341efa5d.3b64a6",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 115,
-    "y": 94,
-    "z": "1c0ed07d.5c9b3",
+    "x": 86,
+    "y": 31,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "129f94ba.7fe03b"
+        "6fe36a2a.e8f534"
       ]
     ]
   },
   {
-    "id": "129f94ba.7fe03b",
+    "id": "6fe36a2a.e8f534",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1032 +22,1032 @@
     "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": 333.49999237060547,
-    "y": 174.9999928767793,
-    "z": "1c0ed07d.5c9b3",
+    "x": 281.49999237060547,
+    "y": 100.99999287677929,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "436daa76.7579c4"
+        "2163ea38.5f8506"
       ]
     ]
   },
   {
-    "id": "436daa76.7579c4",
+    "id": "2163ea38.5f8506",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 332.49999237060547,
-    "y": 274.9999928767793,
-    "z": "1c0ed07d.5c9b3",
+    "x": 280.49999237060547,
+    "y": 200.9999928767793,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "d7bbd3b7.969f1"
+        "1daa1b23.85b095"
       ]
     ]
   },
   {
-    "id": "d7bbd3b7.969f1",
+    "id": "1daa1b23.85b095",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 472.49999237060547,
-    "y": 374.9999928767793,
-    "z": "1c0ed07d.5c9b3",
+    "x": 420.49999237060547,
+    "y": 300.9999928767793,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "5f387e8f.fd62",
-        "eb116abb.3ac2e8",
-        "4aa45281.84acec",
-        "a532dc93.80ef6",
-        "b1588e73.71447",
-        "553a6b9e.729ec4",
-        "36ffcb33.4e1fd4",
-        "77abacf.f4efc54",
-        "5a59ba8.9380644",
-        "582840e.ea42fc",
-        "fc2a5352.16901"
+        "1e60363f.72490a",
+        "83353300.c2eb9",
+        "a088e585.2065b8",
+        "238d29fd.4aeea6",
+        "f0b2c8c2.dc78a8",
+        "59d7449b.dee92c",
+        "26e9888d.5c8d38",
+        "8485dd7a.a3edc",
+        "db1f06f2.603038",
+        "939c727d.3556b",
+        "f50551ee.ae1a3"
       ]
     ]
   },
   {
-    "id": "5f387e8f.fd62",
+    "id": "1e60363f.72490a",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 902.5000038146973,
-    "y": 192.7777447993867,
-    "z": "1c0ed07d.5c9b3",
+    "x": 850.5000038146973,
+    "y": 118.77774479938671,
+    "z": "12958f29.9139d1",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb116abb.3ac2e8",
+    "id": "83353300.c2eb9",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 696.0556488037109,
-    "y": 370.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 644.0556488037109,
+    "y": 296.2222046852112,
+    "z": "12958f29.9139d1",
     "wires": [
       []
     ]
   },
   {
-    "id": "4aa45281.84acec",
+    "id": "a088e585.2065b8",
     "type": "execute",
     "name": "execute generate-sotn-vpn-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 796.5000038146973,
-    "y": 232.7777447993867,
-    "z": "1c0ed07d.5c9b3",
+    "x": 744.5000038146973,
+    "y": 158.7777447993867,
+    "z": "12958f29.9139d1",
     "wires": [
       []
     ]
   },
   {
-    "id": "a532dc93.80ef6",
+    "id": "238d29fd.4aeea6",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 789.0556564331055,
-    "y": 321.2221913631074,
-    "z": "1c0ed07d.5c9b3",
+    "x": 737.0556564331055,
+    "y": 247.2221913631074,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "d42a3b2a.ffbae8",
-        "2876f1e7.3bf11e"
+        "ed404518.0f77e8",
+        "ad805a2f.932de8"
       ]
     ]
   },
   {
-    "id": "d42a3b2a.ffbae8",
+    "id": "ed404518.0f77e8",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1016.0556488037109,
-    "y": 310.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 964.0556488037109,
+    "y": 236.22220468521118,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "fde1029e.0da77"
+        "7b7e8d7f.4eda74"
       ]
     ]
   },
   {
-    "id": "2876f1e7.3bf11e",
+    "id": "ad805a2f.932de8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1016.0556488037109,
-    "y": 350.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 964.0556488037109,
+    "y": 276.2222046852112,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "895d1c39.9fd62"
+        "c276afed.a21aa"
       ]
     ]
   },
   {
-    "id": "fde1029e.0da77",
+    "id": "7b7e8d7f.4eda74",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1158.555648803711,
-    "y": 310.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1106.555648803711,
+    "y": 236.22220468521118,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "e9c489d1.6bc028",
+    "id": "4ebe96fe.9f23b8",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1292.1111679077148,
-    "y": 311.77781438827515,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1240.1111679077148,
+    "y": 237.77781438827515,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "b1588e73.71447",
+    "id": "f0b2c8c2.dc78a8",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name='service-data.networks.network_length' value='`$nidx+1`' />\n\n",
     "comments": "",
-    "x": 757.5556488037109,
-    "y": 410.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 705.5556488037109,
+    "y": 336.2222046852112,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "553a6b9e.729ec4",
+    "id": "59d7449b.dee92c",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 793.0556488037109,
-    "y": 450.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 741.0556488037109,
+    "y": 376.2222046852112,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "36ffcb33.4e1fd4",
+    "id": "26e9888d.5c8d38",
     "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": 716.7224884033203,
-    "y": 616.8889315128326,
-    "z": "1c0ed07d.5c9b3",
+    "x": 664.7224884033203,
+    "y": 542.8889315128326,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "77abacf.f4efc54",
+    "id": "8485dd7a.a3edc",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 764.5556488037109,
-    "y": 490.2222046852112,
-    "z": "1c0ed07d.5c9b3",
+    "x": 712.5556488037109,
+    "y": 416.2222046852112,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "5a59ba8.9380644",
+    "id": "db1f06f2.603038",
     "type": "save",
     "name": "save SOTN connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->\n<!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->\n<!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
     "outputs": 1,
-    "x": 797.0556488037109,
-    "y": 536.8888936042786,
-    "z": "1c0ed07d.5c9b3",
+    "x": 745.0556488037109,
+    "y": 462.88889360427856,
+    "z": "12958f29.9139d1",
     "wires": [
       []
     ]
   },
   {
-    "id": "582840e.ea42fc",
+    "id": "939c727d.3556b",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 772.0556602478027,
-    "y": 574.666645526886,
-    "z": "1c0ed07d.5c9b3",
+    "x": 720.0556602478027,
+    "y": 500.666645526886,
+    "z": "12958f29.9139d1",
     "wires": [
       []
     ]
   },
   {
-    "id": "7821c135.be528",
+    "id": "5a63d0be.0dd08",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1161.5397109985352,
-    "y": 454.99995657848194,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1109.5397109985352,
+    "y": 380.99995657848194,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "c1a7031.d1ed7"
+        "f2a7b4ef.7dee18"
       ]
     ]
   },
   {
-    "id": "895d1c39.9fd62",
+    "id": "c276afed.a21aa",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1160.4126930236816,
-    "y": 350.1587166786194,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1108.4126930236816,
+    "y": 276.1587166786194,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "7821c135.be528",
-        "e9c489d1.6bc028"
+        "5a63d0be.0dd08",
+        "4ebe96fe.9f23b8"
       ]
     ]
   },
   {
-    "id": "c1a7031.d1ed7",
+    "id": "f2a7b4ef.7dee18",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1436.8254318237305,
-    "y": 454.5714592640288,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1384.8254318237305,
+    "y": 380.5714592640288,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "9367b5e2.953668"
+        "69e5d9d8.6152c8"
       ]
     ]
   },
   {
-    "id": "9367b5e2.953668",
+    "id": "69e5d9d8.6152c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1337.5556297302246,
-    "y": 513.142890424002,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1285.5556297302246,
+    "y": 439.14289042400196,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "4001ac49.be63c4"
+        "2aa1e5e3.a3646a"
       ]
     ]
   },
   {
-    "id": "2f9e76b8.9b7e8a",
+    "id": "7fda1459.886ccc",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1385.1904411315918,
-    "y": 413.2540139858611,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1333.1904411315918,
+    "y": 339.2540139858611,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "4001ac49.be63c4",
+    "id": "2aa1e5e3.a3646a",
     "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-topology-operation-input.network-request-input.network-id already found in service-data\" />\n",
     "comments": "",
-    "x": 1485.3057327270508,
-    "y": 513.0000824928284,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1433.3057327270508,
+    "y": 439.00008249282837,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "e30a216c.06ee1",
+    "id": "bf34c45.8795338",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1451.9572257995605,
-    "y": 282.77780199050903,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1399.9572257995605,
+    "y": 208.77780199050903,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "64587c87.c4ced4",
-        "8393b82d.d5e438",
-        "6c36148d.1e8d6c",
-        "723317bf.383f98",
-        "86d16c8d.31d4e",
-        "26134e93.750692",
-        "5c4d7e43.e8961",
-        "729993a3.c5fcac",
-        "14dc371b.e7d799",
-        "b6721dfb.b1a0a",
-        "a5bddbeb.2c8598",
-        "9f8ad772.f86798",
-        "6553f7b8.604f48",
-        "ccf147e.f3f84b8",
-        "ca42d623.87ba58"
+        "12be9566.c7eb7b",
+        "7bec5917.3ffc18",
+        "a1288c23.b615f",
+        "af84978c.aabb08",
+        "8d1b65f0.441d58",
+        "4a9af7ad.2879c8",
+        "ba3dcad9.481608",
+        "5806cf92.6a521",
+        "bd6407fd.e5e7e8",
+        "37b39115.cca1ce",
+        "5e46e6d8.c63f48",
+        "13ee1e74.912c62",
+        "79a54f85.8c9c5",
+        "d44eb5ab.296838",
+        "c0af4869.cb2978"
       ]
     ]
   },
   {
-    "id": "64587c87.c4ced4",
+    "id": "12be9566.c7eb7b",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1710.178970336914,
-    "y": 140.11110544204712,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1658.178970336914,
+    "y": 66.11110544204712,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "c4b37985.1946d8"
+        "ae97dc6a.f8715"
       ]
     ]
   },
   {
-    "id": "c4b37985.1946d8",
+    "id": "ae97dc6a.f8715",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1897.178970336914,
-    "y": 136.11110544204712,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1845.178970336914,
+    "y": 62.11110544204712,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "5fad2e08.81224"
+        "bc3e07b4.946d68"
       ]
     ]
   },
   {
-    "id": "5fad2e08.81224",
+    "id": "bc3e07b4.946d68",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2047.179100036621,
-    "y": 134.7111120223999,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1995.179100036621,
+    "y": 60.7111120223999,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "8393b82d.d5e438",
+    "id": "7bec5917.3ffc18",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1721.0186309814453,
-    "y": 180.1111035346985,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1669.0186309814453,
+    "y": 106.11110353469849,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "e7f48cb.3fc207"
+        "39bacf03.cf3f9"
       ]
     ]
   },
   {
-    "id": "e7f48cb.3fc207",
+    "id": "39bacf03.cf3f9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1891.0186309814453,
-    "y": 176.1111035346985,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1839.0186309814453,
+    "y": 102.11110353469849,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "5c031099.8cebf"
+        "5f54eacf.46e154"
       ]
     ]
   },
   {
-    "id": "5c031099.8cebf",
+    "id": "5f54eacf.46e154",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2078.352071762085,
-    "y": 174.57226037979126,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2026.352071762085,
+    "y": 100.57226037979126,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "fc2a5352.16901",
+    "id": "f50551ee.ae1a3",
     "type": "for",
     "name": "for loop i - Network input parameters",
     "xml": "<for index=\"idx\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 790.7343673706055,
-    "y": 281.5555348689668,
-    "z": "1c0ed07d.5c9b3",
+    "x": 738.7343673706055,
+    "y": 207.5555348689668,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "e30a216c.06ee1"
+        "bf34c45.8795338"
       ]
     ]
   },
   {
-    "id": "6c36148d.1e8d6c",
+    "id": "a1288c23.b615f",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1711.4010124206543,
-    "y": 223.44443082809448,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1659.4010124206543,
+    "y": 149.44443082809448,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "b44c76e.15dfe88"
+        "85b237c8.6a5728"
       ]
     ]
   },
   {
-    "id": "b44c76e.15dfe88",
+    "id": "85b237c8.6a5728",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1898.4010124206543,
-    "y": 219.44443082809448,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1846.4010124206543,
+    "y": 145.44443082809448,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "96f73c26.559e8"
+        "1f01ba7.909de46"
       ]
     ]
   },
   {
-    "id": "96f73c26.559e8",
+    "id": "1f01ba7.909de46",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2066.4010124206543,
-    "y": 220.0444369316101,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2014.4010124206543,
+    "y": 146.0444369316101,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "723317bf.383f98",
+    "id": "af84978c.aabb08",
     "type": "switchNode",
     "name": "switch cir",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1693.2406692504883,
-    "y": 313.4444890022278,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1641.2406692504883,
+    "y": 239.44448900222778,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "1a52097e.d09ff7"
+        "68c32198.953bc"
       ]
     ]
   },
   {
-    "id": "1a52097e.d09ff7",
+    "id": "68c32198.953bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1901.240737915039,
-    "y": 309.4445023536682,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1849.240737915039,
+    "y": 235.4445023536682,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "f62306dc.1325f8"
+        "fcd5f3e.122b91"
       ]
     ]
   },
   {
-    "id": "f62306dc.1325f8",
+    "id": "fcd5f3e.122b91",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2050.574058532715,
-    "y": 307.9056496620178,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1998.5740585327148,
+    "y": 233.90564966201782,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "86d16c8d.31d4e",
+    "id": "8d1b65f0.441d58",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1712.5491409301758,
-    "y": 267.2222080230713,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1660.5491409301758,
+    "y": 193.2222080230713,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "703f29bd.fdd258"
+        "aeee7e59.41fe6"
       ]
     ]
   },
   {
-    "id": "703f29bd.fdd258",
+    "id": "aeee7e59.41fe6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1899.5491409301758,
-    "y": 263.2222080230713,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1847.5491409301758,
+    "y": 189.2222080230713,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "ebf1a004.f1ef9"
+        "efbe141c.2693e8"
       ]
     ]
   },
   {
-    "id": "ebf1a004.f1ef9",
+    "id": "efbe141c.2693e8",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2068.8827743530273,
-    "y": 260.68337297439575,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2016.8827743530273,
+    "y": 186.68337297439575,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "26134e93.750692",
+    "id": "4a9af7ad.2879c8",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1734.030776977539,
-    "y": 589.6667265892029,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1682.030776977539,
+    "y": 515.6667265892029,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "4515fd29.b598c4"
+        "8268dacb.9b51a8"
       ]
     ]
   },
   {
-    "id": "5c4d7e43.e8961",
+    "id": "ba3dcad9.481608",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1726.5862579345703,
-    "y": 635.0000557899475,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1674.5862579345703,
+    "y": 561.0000557899475,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "47c3d65c.233b78"
+        "a95546f9.dbc8c8"
       ]
     ]
   },
   {
-    "id": "729993a3.c5fcac",
+    "id": "5806cf92.6a521",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1731.0307159423828,
-    "y": 673.8889412879944,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1679.0307159423828,
+    "y": 599.8889412879944,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "c3fc1f87.71129"
+        "2720e3f9.d49aac"
       ]
     ]
   },
   {
-    "id": "4515fd29.b598c4",
+    "id": "8268dacb.9b51a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.030776977539,
-    "y": 588.666741847992,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1866.030776977539,
+    "y": 514.666741847992,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "48e66b6b.492674"
+        "4e3a7098.974c8"
       ]
     ]
   },
   {
-    "id": "47c3d65c.233b78",
+    "id": "a95546f9.dbc8c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1913.5862579345703,
-    "y": 631.0000557899475,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1861.5862579345703,
+    "y": 557.0000557899475,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "d6533a63.6dbd38"
+        "640cc28a.98572c"
       ]
     ]
   },
   {
-    "id": "c3fc1f87.71129",
+    "id": "2720e3f9.d49aac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.0307159423828,
-    "y": 669.8889412879944,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1866.0307159423828,
+    "y": 595.8889412879944,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "7c60d7e3.12f4c8"
+        "21bffbdb.c6eb94"
       ]
     ]
   },
   {
-    "id": "48e66b6b.492674",
+    "id": "4e3a7098.974c8",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2101.2531356811523,
-    "y": 587.7779259681702,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2049.2531356811523,
+    "y": 513.7779259681702,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "d6533a63.6dbd38",
+    "id": "640cc28a.98572c",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2090.14217376709,
-    "y": 629.0105323791504,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2038.1421737670898,
+    "y": 555.0105323791504,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "7c60d7e3.12f4c8",
+    "id": "21bffbdb.c6eb94",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2100.031089782715,
-    "y": 667.8993887901306,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2048.031089782715,
+    "y": 593.8993887901306,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "14dc371b.e7d799",
+    "id": "bd6407fd.e5e7e8",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1731.845474243164,
-    "y": 720.5555849075317,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1679.845474243164,
+    "y": 646.5555849075317,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "d1fbb326.d667a"
+        "7f7eda44.4baf24"
       ]
     ]
   },
   {
-    "id": "d1fbb326.d667a",
+    "id": "7f7eda44.4baf24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.845474243164,
-    "y": 716.5555849075317,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1866.845474243164,
+    "y": 642.5555849075317,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "aecd373e.842bf8"
+        "932f3665.ab2778"
       ]
     ]
   },
   {
-    "id": "b6721dfb.b1a0a",
+    "id": "37b39115.cca1ce",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1728.6232452392578,
-    "y": 763.0000615119934,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1676.6232452392578,
+    "y": 689.0000615119934,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "3439641.1ff369c"
+        "da95a048.53cf8"
       ]
     ]
   },
   {
-    "id": "3439641.1ff369c",
+    "id": "da95a048.53cf8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1915.6232452392578,
-    "y": 759.0000615119934,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1863.6232452392578,
+    "y": 685.0000615119934,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "668b4d7f.54d754"
+        "4432e921.5fd6d8"
       ]
     ]
   },
   {
-    "id": "aecd373e.842bf8",
+    "id": "932f3665.ab2778",
     "type": "set",
     "name": "set access-node-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2090.84578704834,
-    "y": 715.2327189445496,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2038.8457870483398,
+    "y": 641.2327189445496,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "668b4d7f.54d754",
+    "id": "4432e921.5fd6d8",
     "type": "set",
     "name": "set access-ltp-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2081.289939880371,
-    "y": 758.0104908943176,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2029.289939880371,
+    "y": 684.0104908943176,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "a5bddbeb.2c8598",
+    "id": "5e46e6d8.c63f48",
     "type": "switchNode",
     "name": "switch eir",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'eir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1694.531120300293,
-    "y": 356.1423554420471,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1642.531120300293,
+    "y": 282.1423554420471,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "b200bce6.41ba6"
+        "fc17f5c5.ae3be8"
       ]
     ]
   },
   {
-    "id": "b200bce6.41ba6",
+    "id": "fc17f5c5.ae3be8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1896.5310821533203,
-    "y": 351.14237546920776,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1844.5310821533203,
+    "y": 277.14237546920776,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "179fefa2.e4ec6"
+        "5963427e.099eec"
       ]
     ]
   },
   {
-    "id": "179fefa2.e4ec6",
+    "id": "5963427e.099eec",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2052.864585876465,
-    "y": 350.6035113334656,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2000.8645858764648,
+    "y": 276.6035113334656,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "9f8ad772.f86798",
+    "id": "13ee1e74.912c62",
     "type": "switchNode",
     "name": "switch cbs",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cbs'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1694.531120300293,
-    "y": 405.1423554420471,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1642.531120300293,
+    "y": 331.1423554420471,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "9fcff056.2543f"
+        "52037d34.46c984"
       ]
     ]
   },
   {
-    "id": "9fcff056.2543f",
+    "id": "52037d34.46c984",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1893.5310821533203,
-    "y": 401.14236211776733,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1841.5310821533203,
+    "y": 327.14236211776733,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "a1886f40.011c"
+        "87d5db86.520f08"
       ]
     ]
   },
   {
-    "id": "a1886f40.011c",
+    "id": "87d5db86.520f08",
     "type": "set",
     "name": "set cbs",
     "xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2051.864646911621,
-    "y": 399.60352182388306,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1999.864646911621,
+    "y": 325.60352182388306,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "6553f7b8.604f48",
+    "id": "79a54f85.8c9c5",
     "type": "switchNode",
     "name": "switch ebs",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ebs'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1694.531120300293,
-    "y": 450.1423554420471,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1642.531120300293,
+    "y": 376.1423554420471,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "4251079.c8008f8"
+        "c2f96fa0.ad15c"
       ]
     ]
   },
   {
-    "id": "4251079.c8008f8",
+    "id": "c2f96fa0.ad15c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1893.5310821533203,
-    "y": 443.14236307144165,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1841.5310821533203,
+    "y": 369.14236307144165,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "d1fd139b.e3892"
+        "9e90ea61.5694f8"
       ]
     ]
   },
   {
-    "id": "d1fd139b.e3892",
+    "id": "9e90ea61.5694f8",
     "type": "set",
     "name": "set ebs",
     "xml": "<set>\n<parameter name='prop.sotn.ebs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2054.864646911621,
-    "y": 444.60352182388306,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2002.864646911621,
+    "y": 370.60352182388306,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "ccf147e.f3f84b8",
+    "id": "d44eb5ab.296838",
     "type": "switchNode",
     "name": "switch colorAware",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'colorAware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1716.5312042236328,
-    "y": 497.1423726081848,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1664.5312042236328,
+    "y": 423.1423726081848,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "b84d7f0e.a9757"
+        "b8905300.a37c5"
       ]
     ]
   },
   {
-    "id": "b84d7f0e.a9757",
+    "id": "b8905300.a37c5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1894.53120803833,
-    "y": 491.1423649787903,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1842.53120803833,
+    "y": 417.1423649787903,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "72e50f94.71d84"
+        "a701fe84.51e22"
       ]
     ]
   },
   {
-    "id": "72e50f94.71d84",
+    "id": "a701fe84.51e22",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2075.864585876465,
-    "y": 490.6035237312317,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2023.8645858764648,
+    "y": 416.6035237312317,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "ca42d623.87ba58",
+    "id": "c0af4869.cb2978",
     "type": "switchNode",
     "name": "switch couplingFlag",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'couplingFlag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1716.5312118530273,
-    "y": 543.142397403717,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1664.5312118530273,
+    "y": 469.14239740371704,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "40eab97.899c148"
+        "b6ad72cc.3d503"
       ]
     ]
   },
   {
-    "id": "40eab97.899c148",
+    "id": "b6ad72cc.3d503",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1894.5312042236328,
-    "y": 535.1423659324646,
-    "z": "1c0ed07d.5c9b3",
+    "x": 1842.5312042236328,
+    "y": 461.1423659324646,
+    "z": "12958f29.9139d1",
     "wires": [
       [
-        "af755d0d.ba992"
+        "189417c4.cf2b18"
       ]
     ]
   },
   {
-    "id": "af755d0d.ba992",
+    "id": "189417c4.cf2b18",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2079.864585876465,
-    "y": 535.6035485267639,
-    "z": "1c0ed07d.5c9b3",
+    "x": 2027.8645858764648,
+    "y": 461.6035485267639,
+    "z": "12958f29.9139d1",
     "wires": []
   },
   {
-    "id": "e55153cb.9f1cd",
+    "id": "75b2fbdb.c98244",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 761.0312728881836,
-    "y": 139.14243173599243,
-    "z": "1c0ed07d.5c9b3",
+    "x": 709.0312728881836,
+    "y": 65.14243173599243,
+    "z": "12958f29.9139d1",
     "wires": []
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index e8f26f7..6d06cce 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -105,22 +105,21 @@
 GENERIC-RESOURCE-API security-zone-topology-operation-delete ${project.version} sync
 GENERIC-RESOURCE-API security-zone-topology-operation-unassign ${project.version} sync
 GENERIC-RESOURCE-API security-zone-topology-operation ${project.version} sync
-GENERIC-RESOURCE-API self-serve-aai-vfmodule-put ${project.version} sync
-GENERIC-RESOURCE-API self-serve-alts-assignment ${project.version} sync
+GENERIC-RESOURCE-API self-serve-aai-vf-module-put ${project.version} sync
+GENERIC-RESOURCE-API self-serve-aai-vnf-put ${project.version} sync
 GENERIC-RESOURCE-API self-serve-capability-param-resolution ${project.version} sync
-GENERIC-RESOURCE-API self-serve-create-vpe-pool ${project.version} sync
-GENERIC-RESOURCE-API self-serve-eipam-create-pool ${project.version} sync
-GENERIC-RESOURCE-API self-serve-eipam-ip-assignment ${project.version} sync
-GENERIC-RESOURCE-API self-serve-generate-FQPN ${project.version} sync
 GENERIC-RESOURCE-API self-serve-generate-name ${project.version} sync
-GENERIC-RESOURCE-API self-serve-mac-address-assign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-generate-name-changeassign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-mS-mac-address-assign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-mS-vlan-tag-assign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-netbox-ip-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-unresolved-composite-data ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vf-module-assign ${project.version} sync
-GENERIC-RESOURCE-API self-serve-vfmodule-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vf-module-unassign ${project.version} sync
-GENERIC-RESOURCE-API self-serve-vlan-tag-assign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vfmodule-changeassign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vfmodule-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-assign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vnf-changeassign ${project.version} sync 
 GENERIC-RESOURCE-API self-serve-vnf-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-unassign ${project.version} sync
 GENERIC-RESOURCE-API service-topology-operation-assign ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 75d05fa..f86a75f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -247,7 +247,8 @@
                 <parameter name="role" value="`$prop.connection-attachment.role`" />
                 <parameter name="vpn-name" value="`$prop.connection-attachment.sdwanVpnName`" />
                 <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
                 <parameter name="operational-status" value="Created" />
                 <outcome value='failure'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
index 5b00ed1..c6147a0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
@@ -108,6 +108,12 @@
                     </switch>
                     <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`">
                         <outcome value='true'>
+                            <block>
+                                <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].value`">
+                                    <outcome value=''>
+                                        <block></block>
+                                    </outcome>
+                                    <outcome value='Other'>
                             <block atomic="true">
                                 <set>
                                     <parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
@@ -117,6 +123,9 @@
                                     <parameter name="regex" value=","/>
                                     <parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>
                                 </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
                             </block>
                         </outcome>
                     </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.xml
deleted file mode 100644
index 0ca7cde..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vfmodule-put.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<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}'>
-    <method rpc='self-serve-aai-vfmodule-put' mode='sync'>
-        <block atomic='true'>
-            <switch test='`$vnf-index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='error-code' value='500' />
-                        <parameter name='error-message' value='vnf-index is required' />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block>
-                        <for index="k" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                            <block>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>
-                                    <outcome value='vnf-id'>
-                                        <block>
-                                            <set>
-                                                <parameter name='vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='ipv4-loopback0-address'>
-                                        <block>
-                                            <set>
-                                                <parameter name='ipv4-loopback0-address' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='as-number'>
-                                        <block>
-                                            <set>
-                                                <parameter name='as-number' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='vlan-id-outer'>
-                                        <block>
-                                            <set>
-                                                <parameter name='vlan-id-outer' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].value`' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </for>
-                        <for index="j" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`" >
-                            <block>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].name`'>
-                                    <outcome value='vf-module-id'>
-                                        <set>
-                                            <parameter name='vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='vf-module-name'>
-                                        <set>
-                                            <parameter name='vf-module-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='volume-group-id'>
-                                        <set>
-                                            <parameter name='volume-group-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='volume-group-name'>
-                                        <set>
-                                            <parameter name='volume-group-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='cloud-region'>
-                                        <set>
-                                            <parameter name='cloud-region' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="generic-vnf"
-		key="generic-vnf.vnf-id = $vnf-id "
-	pfx="tmp.AnAI-data.vnf" >
-                    <parameter name="ipv4-loopback0-address" value='`$ipv4-loopback0-address`' />
-                    <parameter name="ipv4-oam-address" value='`$ipv4-oam-address`' />
-                    <parameter name="as-number" value='`$as-number`' />
-                    <parameter name="vlan-id-outer" value='`$vlan-id-outer`' />
-                    <outcome value='failure'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log" />
-                            <parameter name="level" value="error" />
-                            <parameter name="field1" value="Error for PUT in AAI for generic-vnf." />
-                            <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                            <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                        </record>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log" />
-                            <parameter name="level" value="error" />
-                            <parameter name="field1" value="Error for PUT in AAI for generic-vnf." />
-                            <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                            <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                        </record>
-                    </outcome>
-                    <outcome value='success'>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="vf-module"
-		key="vf-module.vf-module-id = $vf-module-id "
-	pfx="tmp.AnAI-data.vfmodule" >
-                            <parameter name="vf-module-name" value='`$vf-module-name`' />
-                            <outcome value='failure'>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                    <parameter name="logger" value="message-log" />
-                                    <parameter name="level" value="error" />
-                                    <parameter name="field1" value="Error for PUT in AAI for vf-module" />
-                                    <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                    <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                </record>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                    <parameter name="logger" value="message-log" />
-                                    <parameter name="level" value="error" />
-                                    <parameter name="field1" value="Error for PUT in AAI for vf-module" />
-                                    <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                    <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                </record>
-                            </outcome>
-                            <outcome value='success'>
-                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="volume-group"
-		key="volume-group-id = $volume-group-id and 
-				cloud-region.cloud-owner = $prop.cloud-region.cloud-owner and
-				cloud-region.cloud-region-id = $cloud-region "
-		pfx="tmp.AnAI-data.vnf" >
-                                    <parameter name="volume-group-name" value='`$volume-group-name`' />
-                                    <outcome value='failure'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log" />
-                                            <parameter name="level" value="error" />
-                                            <parameter name="field1" value="Error Saving in AAI" />
-                                            <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                            <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                        </record>
-                                    </outcome>
-                                    <outcome value='not-found'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log" />
-                                            <parameter name="level" value="error" />
-                                            <parameter name="field1" value="Error Saving in AAI" />
-                                            <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                            <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                        </record>
-                                    </outcome>
-                                    <outcome value='success'>
-                                        <return status='success'></return>
-                                    </outcome>
-                                </update>
-                            </outcome>
-                        </update>
-                    </outcome>
-                </update>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-alts-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-alts-assignment.xml
deleted file mode 100644
index c26b666..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-alts-assignment.xml
+++ /dev/null
@@ -1,653 +0,0 @@
-<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}'>
-    <method rpc='self-serve-alts-assignment' mode='sync'>
-        <block>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
-            <switch test='`$ss.capability-name`'>
-                <outcome value='alts-license-assign'>
-                    <switch test='`$ss.capability-action`'>
-                        <outcome value='assign'>
-                            <block atomic='true'>
-                                <switch test='`$vnf-index`'>
-                                    <outcome value=''>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value='vnf-index is required' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='Other'>
-                                        <block>
-                                            <for index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name`'>
-                                                        <outcome value='alts-license-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='alts-entitlement-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <for index="k" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>
-                                                        <outcome value='license-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='entitlement-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <switch test='`$ss.capability-name`'>
-                                                <outcome value='alts-license-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$license-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='alts-entitlement-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$entitlement-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <for index="j" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].name`'>
-                                                        <outcome value='vnf-id'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='vnf_name'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='license-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.license-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='entitlement-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.entitlement-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                                <execute plugin="com.att.sdnctl.sli.plugin.altsTools.AltsTools" method="acquireLicense" >
-                                    <parameter name="error-prefix" value="alts.error" />
-                                    <parameter name="prefix" value="alts.resp" />
-                                    <parameter name="assignment-group" value="`$alts.license-assignment-group-uuid`" />
-                                    <parameter name="hostname" value="`$alts.vnf-name`" />
-                                    <parameter name="vnf-id" value="`$alts.vnf-id`" />
-                                    <outcome value='success'>
-                                        <block>
-                                            <set>
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$license-key-index].value' value='`$alts.resp.license-key`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='SUCCESS' />
-                                            </set>
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="license"
-		key="generic-vnf.vnf-id = $alts.vnf-id 
-			AND license.group-uuid = $alts.license-assignment-group-uuid
-			AND license.resource-uuid = $alts.resp.license-key"
-	pfx="tmp.AnAI.license" >
-                                                <parameter name="group-uuid" value='`$alts.license-assignment-group-uuid`' />
-                                                <parameter name="resource-uuid" value='`$alts.resp.license-key`' />
-                                                <outcome value='failure'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error Saving in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error Saving in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                            </save>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="failure">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="not-found">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="unsupported-method">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                </execute>
-                            </block>
-                        </outcome>
-                        <outcome value='unassign'>
-                            <block atomic='true'>
-                                <switch test='`$vnf-index`'>
-                                    <outcome value=''>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value='vnf-index is required' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='Other'>
-                                        <block>
-                                            <for index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name`'>
-                                                        <outcome value='alts-license-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='alts-entitlement-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <for index="k" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>
-                                                        <outcome value='license-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='entitlement-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <switch test='`$ss.capability-name`'>
-                                                <outcome value='alts-license-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$license-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='alts-entitlement-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$entitlement-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <for index="j" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].name`'>
-                                                        <outcome value='vnf-id'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='vnf_name'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='license-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.license-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='entitlement-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.entitlement-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                                <execute plugin="com.att.sdnctl.sli.plugin.altsTools.AltsTools" method="releaseLicense" >
-                                    <parameter name="asset-uuid" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$license-key-index].value`" />
-                                    <parameter name="error-prefix" value="alts.error" />
-                                    <parameter name="prefix" value="alts.resp" />
-                                    <parameter name="assignment-group" value="`$alts.license-assignment-group-uuid`" />
-                                    <parameter name="hostname" value="`$alts.vnf-name`" />
-                                    <parameter name="vnf-id" value="`$alts.vnf-id`" />
-                                    <outcome value='success'>
-                                        <block>
-                                            <set>
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='DELETED' />
-                                            </set>
-                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-resource="license"
-key="generic-vnf.vnf-id = $alts.vnf-id "
-force="true"
-local-only="false"
-pfx="tmp.AnAI-data.vnf" >
-                                                <parameter name="group-uuid" value='' />
-                                                <parameter name="resource-uuid" value='' />
-                                                <outcome value='failure'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error updating in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error updating in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                            </update>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="failure">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="not-found">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="unsupported-method">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                </execute>
-                            </block>
-                        </outcome>
-                    </switch>
-                </outcome>
-                <outcome value='alts-entitlement-assign'>
-                    <switch test='`$ss.capability-action`'>
-                        <outcome value='assign'>
-                            <block atomic='true'>
-                                <switch test='`$vnf-index`'>
-                                    <outcome value=''>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value='vnf-index is required' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='Other'>
-                                        <block>
-                                            <for index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name`'>
-                                                        <outcome value='alts-license-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='alts-entitlement-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <for index="k" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>
-                                                        <outcome value='license-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='entitlement-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <switch test='`$ss.capability-name`'>
-                                                <outcome value='alts-license-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$license-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='alts-entitlement-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$entitlement-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <for index="j" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].name`'>
-                                                        <outcome value='vnf-id'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='vnf_name'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='license-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.license-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='entitlement-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.entitlement-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                                <execute plugin="com.att.sdnctl.sli.plugin.altsTools.AltsTools" method="acquireEntitlement" >
-                                    <parameter name="error-prefix" value="alts.error" />
-                                    <parameter name="prefix" value="alts.resp" />
-                                    <parameter name="assignment-group" value="`$alts.entitlement-assignment-group-uuid`" />
-                                    <parameter name="hostname" value="`$alts.vnf-name`" />
-                                    <parameter name="vnf-id" value="`$alts.vnf-id`" />
-                                    <outcome value='success'>
-                                        <block>
-                                            <set>
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$entitlement-key-index].value' value='`$alts.resp.license-key`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='SUCCESS' />
-                                            </set>
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="entitlement"
-		key="generic-vnf.vnf-id = $alts.vnf-id  
-			AND entitlement.group-uuid = $alts.entitlement-assignment-group-uuid 
-			AND entitlement.resource-uuid = $alts.resp.license-key "
-	pfx="tmp.AnAI.entitlement" >
-                                                <parameter name="group-uuid" value='`$alts.entitlement-assignment-group-uuid`' />
-                                                <parameter name="resource-uuid" value='`$alts.resp.license-key`' />
-                                                <outcome value='failure'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error Saving in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error Saving in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                            </save>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="failure">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="not-found">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="unsupported-method">
-                                        <block>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status`' value='FAILED' />
-                                            </set>
-                                        </block>
-                                    </outcome>
-                                </execute>
-                            </block>
-                        </outcome>
-                        <outcome value='unassign'>
-                            <block atomic='true'>
-                                <switch test='`$vnf-index`'>
-                                    <outcome value=''>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='500' />
-                                            <parameter name='error-message' value='vnf-index is required' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='Other'>
-                                        <block>
-                                            <for index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name`'>
-                                                        <outcome value='alts-license-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='alts-entitlement-assign'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-param-index' value='`$i`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <for index="k" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$k].name`'>
-                                                        <outcome value='license-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='license-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='entitlement-key'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='entitlement-key-index' value='`$k`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                            <switch test='`$ss.capability-name`'>
-                                                <outcome value='alts-license-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$license-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='alts-entitlement-assign'>
-                                                    <set>
-                                                        <parameter name='param-index' value='`$entitlement-param-index`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <for index="j" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key_length`" >
-                                                <block>
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].name`'>
-                                                        <outcome value='vnf-id'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='vnf_name'>
-                                                            <set>
-                                                                <parameter name='alts.vnf-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='license-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.license-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                        <outcome value='entitlement-assignment-group-uuid'>
-                                                            <set>
-                                                                <parameter name='alts.entitlement-assignment-group-uuid' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.resource-key[$j].value`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </block>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                                <execute plugin="com.att.sdnctl.sli.plugin.altsTools.AltsTools" method="releaseEntitlement" >
-                                    <parameter name="asset-uuid" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$entitlement-key-index].value`" />
-                                    <parameter name="error-prefix" value="alts.error" />
-                                    <parameter name="prefix" value="alts.resp" />
-                                    <parameter name="assignment-group" value="`$alts.entitlement-assignment-group-uuid`" />
-                                    <parameter name="hostname" value="`$alts.vnf-name`" />
-                                    <parameter name="vnf-id" value="`$alts.vnf-id`" />
-                                    <outcome value='success'>
-                                        <block>
-                                            <set>
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].resource-resolution-data.status' value='DELETED' />
-                                            </set>
-                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-resource="license"
-key="generic-vnf.vnf-id = $alts.vnf-id "
-force="true"
-local-only="false"
-pfx="tmp.AnAI-data.vnf" >
-                                                <parameter name="group-uuid" value='' />
-                                                <parameter name="resource-uuid" value='' />
-                                                <outcome value='failure'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error updating in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                        <parameter name="logger" value="message-log" />
-                                                        <parameter name="level" value="error" />
-                                                        <parameter name="field1" value="Error updating in AAI" />
-                                                        <parameter name="field2" value="`$tmp.AnAI-data.vnf.error-code`" />
-                                                        <parameter name="field3" value="`$tmp.AnAI-data.vnf.error-message`" />
-                                                    </record>
-                                                </outcome>
-                                            </update>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="failure">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="not-found">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value="unsupported-method">
-                                        <block>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='`$alts.error.error-code`' />
-                                                <parameter name='error-message' value='`$alts.error.error-message`' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                </execute>
-                            </block>
-                        </outcome>
-                    </switch>
-                </outcome>
-            </switch>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.xml
deleted file mode 100755
index 800ded3..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-create-vpe-pool.xml
+++ /dev/null
@@ -1,486 +0,0 @@
-<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}'>
-    <method rpc='self-serve-create-vpe-pool' mode='sync'>
-        <block atomic='true'>
-            <switch test="`$ss.capability-name`">
-                <outcome value='Other'></outcome>
-                <outcome value=''>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-create-vpe-pool: ss.capability-name is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-name is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='null'></outcome>
-                <outcome value='create-vpe-pool'>
-                    <record plugin="com.att.sdnctl.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-create-vpe-pool: ss.capability-name is create-vpe-pool"/>
-                    </record>
-                </outcome>
-            </switch>
-            <switch test="`$ss.capability-action`">
-                <outcome value='Other'></outcome>
-                <outcome value=''>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-create-vpe-pool: ss.capability-action is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-action is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='null'></outcome>
-                <outcome value='ASSIGN'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-create-vpe-pool: ss.capability-action is ASSIGN"/>
-                    </record>
-                </outcome>
-                <outcome value='UNASSIGN'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-create-vpe-pool: ss.capability-action is UNASSIGN"/>
-                    </record>
-                </outcome>
-            </switch>
-            <block atomic='true'>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                    <parameter name="logger" value="message-log"/>
-                    <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="self-serve-create-vpe-pool: call self-service-capability-param-resolution DG"/>
-                </record>
-                <set>
-                    <!--<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />-->
-                </set>
-                <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >
-                    <outcome value='failure'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-create-vpe-pool: Failure calling self-service-capability-param-resolution"/>
-                            </record>
-                            <return status='failure'>
-                                <parameter name='error-code' value='402' />
-                                <parameter name='error-message' value='Failure calling self-service-capability-param-resolution' />
-                            </return>
-                        </block>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </call>
-            </block>
-            <block atomic='true'>
-                <set>
-                    <parameter name='tmp.vf-module-parameters-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />
-                </set>
-                <for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-create-vpe-pool: vf-module-param-index"/>
-                        <parameter name="field3" value='`$vf-module-param-index`'/>
-                    </record>
-                    <block>
-                        <set>
-                            <parameter name='vfModuleParamsCapabilityName' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.capability-name`'  />
-                        </set>
-                        <switch test="`$ss.capability-name == $vfModuleParamsCapabilityName`">
-                            <outcome value='true'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-create-vpe-pool: Found ss.capability-name MATCH"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='tmp.resource-resolution-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.`'  />
-                                    </set>
-                                    <break/>
-                                </block>
-                            </outcome>
-                            <outcome value='false'></outcome>
-                        </switch>
-                    </block>
-                </for>
-            </block>
-            <switch test="`$tmp.resource-resolution-data.status == 'PENDING'`">
-                <outcome value='false'>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-create-vpe-pool: reseouce-resolution-data.status is not PENDING"/>
-                        </record>
-                        <set>
-                            <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                        </set>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='reseouce-resolution-data.status is not PENDING' />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block atomic='true'>
-                <set>
-                    <parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />
-                </set>
-                <for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-create-vpe-pool: key-index"/>
-                        <parameter name="field3" value='`$key-index`'/>
-                    </record>
-                    <block>
-                        <switch test="`$tmp.resource-resolution-data.resource-key[$key-index].name == 'vpe_name'`">
-                            <outcome value='true'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-create-vpe-pool: Found resource-resolution-data.name = vpe_name"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='tmp.vpe_name' value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'  />
-                                    </set>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: resolved vpe_name: "/>
-                                        <parameter name="field3" value='`$tmp.vpe_name`'/>
-                                    </record>
-                                    <break/>
-                                </block>
-                            </outcome>
-                            <outcome value='false'></outcome>
-                        </switch>
-                    </block>
-                </for>
-                <switch test="`$tmp.vpe_name`">
-                    <outcome value='null'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: hostname is not set"/>
-                            </record>
-                            <set>
-                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                            </set>
-                            <return status='failure'>
-                                <parameter name='error-code' value='403' />
-                                <parameter name='error-message' value='vpe_name is not valid' />
-                            </return>
-                        </block>
-                    </outcome>
-                    <outcome value=''>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: hostname is not set"/>
-                            </record>
-                            <set>
-                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                            </set>
-                            <return status='failure'>
-                                <parameter name='error-code' value='403' />
-                                <parameter name='error-message' value='vpe_name is not valid' />
-                            </return>
-                        </block>
-                    </outcome>
-                </switch>
-            </block>
-            <block atomic='true'>
-                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="select * FROM VPE_POOL WHERE vpe_name= $tmp.vpe_name" pfx='tmp.vpe_pool_data'>
-                    <outcome value='failure'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: Unable to access VPE_POOL"/>
-                            </record>
-                            <set>
-                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                            </set>
-                            <return status='failure'>
-                                <parameter name='error-code' value='405' />
-                                <parameter name='error-message' value='Unable to access VPE_POOL' />
-                            </return>
-                        </block>
-                    </outcome>
-                </get-resource>
-                <switch test="`$tmp.vpe_pool_data.vpe-name`">
-                    <outcome value=''>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: data not found in VPE_POOL for vpe_name: "/>
-                            <parameter name="field3" value='`$tmp.vpe_name`'/>
-                        </record>
-                    </outcome>
-                    <outcome value='null'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: data not found in VPE_POOL for vpe_name: "/>
-                            <parameter name="field3" value='`$tmp.vpe_name`'/>
-                        </record>
-                    </outcome>
-                    <outcome value='Other'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: data already found in VPE_POOL for vpe_name: "/>
-                                <parameter name="field3" value='`$tmp.vpe_name`'/>
-                            </record>
-                            <switch test="`$ss.capability-action == 'ASSIGN'`">
-                                <outcome value='true'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log"/>
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="self-serve-mac-address-assign: Unable to create vpe-pool, data already exists in VPE_POOL for vpe_name"/>
-                                        </record>
-                                        <set>
-                                            <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='405' />
-                                            <parameter name='error-message' value='Unable to create vpe-pool, data already exists in VPE_POOL for vpe_name' />
-                                        </return>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </block>
-            <switch test='`$ss.capability-action`'>
-                <outcome value='ASSIGN'>
-                    <block atomic='true'>
-                        <set>
-                            <parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />
-                            <!-- String to build VPE_POOL table SQL insert statement -->
-                            <parameter name='tmp.resource-insert-columns' value='' />
-                            <parameter name='tmp.resource-insert-values' value='' />
-                            <!-- These are the resources to insert into VPE_POOL -->
-                            <parameter name='tmp.resource-names-length' value='19' />
-                            <parameter name='tmp.resource-names[0]' value='vpe_name' />
-                            <parameter name='tmp.resource-names[1]' value='ipv4_oam_address' />
-                            <parameter name='tmp.resource-names[2]' value='loopback0' />
-                            <parameter name='tmp.resource-names[3]' value='provisioning_status' />
-                            <parameter name='tmp.resource-names[4]' value='aic_site_id' />
-                            <parameter name='tmp.resource-names[5]' value='avaiablity_zone' />
-                            <parameter name='tmp.resource-names[6]' value='vlan_id_outer' />
-                            <parameter name='tmp.resource-names[7]' value='vendor' />
-                            <parameter name='tmp.resource-names[8]' value='physical_intf_name' />
-                            <parameter name='tmp.resource-names[9]' value='phyiscal_intf_speed' />
-                            <parameter name='tmp.resource-names[10]' value='phyiscal_intf_units' />
-                            <parameter name='tmp.resource-names[11]' value='vpe_uuid' />
-                            <parameter name='tmp.resource-names[12]' value='vpe_id' />
-                            <parameter name='tmp.resource-names[13]' value='image_filename' />
-                            <parameter name='tmp.resource-names[14]' value='as_number' />
-                            <parameter name='tmp.resource-names[15]' value='loopback5000' />
-                            <parameter name='tmp.resource-names[16]' value='loopback10' />
-                            <parameter name='tmp.resource-names[17]' value='aic_version' />
-                            <parameter name='tmp.resource-names[18]' value='vpe_capacity' />
-                        </set>
-                        <for index='names-index' start='0' end='`$tmp.resource-names-length`' >
-                            <for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                    <parameter name="logger" value="message-log"/>
-                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                    <parameter name="field2" value="self-serve-create-vpe-pool: key-index, resource-key.name, resource-names"/>
-                                    <parameter name="field3" value='`$key-index`'/>
-                                    <parameter name="field4" value='`$tmp.resource-resolution-data.resource-key[$key-index].name`'/>
-                                    <parameter name="field5" value='`$tmp.resource-names[$names-index]`'/>
-                                </record>
-                                <switch test="`$tmp.resource-resolution-data.resource-key[$key-index].name == $tmp.resource-names[$names-index]`">
-                                    <outcome value='true'>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="self-serve-create-vpe-pool: resource-name MATCH: "/>
-                                                <parameter name="field3" value='`$tmp.resource-names[$names-index]`'/>
-                                                <parameter name="field4" value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'/>
-                                            </record>
-                                            <switch test="`$tmp.insert-columns`">
-                                                <outcome value=''>
-                                                    <set>
-                                                        <parameter name='tmp.insert-columns' value="`$tmp.resource-resolution-data.resource-key[$key-index].name`"  />
-                                                        <parameter name='tmp.insert-values' value="$tmp.resource-resolution-data.resource-key[$key-index].value`"  />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <set>
-                                                        <parameter name='tmp.insert-columns' value="`$tmp.insert-columns + ', ' + $tmp.resource-resolution-data.resource-key[$key-index].name`"  />
-                                                        <parameter name='tmp.insert-values' value="`$tmp.insert-values + ', ' + $tmp.resource-resolution-data.resource-key[$key-index].value`"  />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <set>
-                                                <parameter name="`'tmp.forInsert.' + $tmp.resource-resolution-data.resource-key[$key-index].name`" value="`$tmp.resource-resolution-data.resource-key[$key-index].value`"  />
-                                            </set>
-                                            <break/>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </for>
-                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
-resource="SQL" 
-key="INSERT INTO VPE_POOL ( vpe_name, ipv4_oam_address, loopback0_ipv4_address, provisioning_status, aic_site_id, availability_zone, vlan_id_outer, vendor, physical_intf_name, physical_intf_speed, physical_intf_units, vpe_uuid, vpe_id, image_filename, as_number, loopback5000, loopback10, aic_version, vpe_capacity ) 
-VALUES ( $tmp.forInsert.vpe_name , $tmp.forInsert.ipv4_oam_address , $tmp.forInsert.loopback0_ipv4_address , $tmp.forInsert.provisioning_status , $tmp.forInsert.aic_site_id , $tmp.forInsert.availability_zone , $tmp.forInsert.vlan_id_outer , $tmp.forInsert.vendor , $tmp.forInsert.physical_intf_name , $tmp.forInsert.physical_intf_speed , $tmp.forInsert.physical_intf_units , $tmp.forInsert.vpe_uuid , $tmp.forInsert.vpe_id , $tmp.forInsert.image_filename , $tmp.forInsert.as_number , $tmp.forInsert.loopback5000 , $tmp.forInsert.loopback10 , $tmp.forInsert.aic_version , $tmp.forInsert.vpe_capacity )" 
-force='true' pfx='save_val'>
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Unable to create VPE Pool in VPE_POOL"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='406' />
-                                        <parameter name='error-message' value='Unable to create VPE Pool in VPE_POOL' />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </save>
-                    </block>
-                </outcome>
-                <outcome value='UNASSIGN'>
-                    <block atomic="true">
-                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="select * FROM VPE_POOL WHERE vpe_name= $tmp.vpe_name" pfx='tmp.pool'>
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: vpe_name not found in VPE_POOL on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='vpe_name not found in VPE_POOL on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </get-resource>
-                        <switch test="`$tmp.pool.vpe-name`">
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: vpe_name not found in VPE_POOL on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='vpe_name not found in VPE_POOL on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value=''>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: vpe_name not found in VPE_POOL on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='vpe_name not found in VPE_POOL on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='null'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: vpe_name not found in VPE_POOL on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='vpe_name not found in VPE_POOL on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key='DELETE from VPE_POOL WHERE vpe_name = $tmp.vpe_name'>
-                                    <outcome value='failure'>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="self-serve-mac-address-assign: Failure deleting from VPE_POOL on UNASSIGN operation"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                            </set>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='405' />
-                                                <parameter name='error-message' value='Failure deleting from VPE_POOL on UNASSIGN operation' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='success'>
-                                        <block>
-                                            <for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >
-                                                <set>
-                                                    <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`" value="DELETED"  />
-                                                </set>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </delete>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/self-serve-create-vpe-pool.log' />
-            </execute>
-            <return status='success'>
-                <parameter name="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`" value='SUCCESS'  />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.xml
deleted file mode 100644
index 15648b4..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-create-pool.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<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}'>
-    <method rpc='self-serve-eipam-create-pool' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='vnf-index' value='0' />
-                <parameter name='vf-module-index' value='0' />
-                <parameter name='ss.capability-name' value='self-serve-eipam-create-pool' />
-                <parameter name='ss.capability-action' value='assign' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' 
-	value='true' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param_length' value = '1' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].name' value = 'ipv4-wan-address-pool' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].value' value = '${ipv4-wan-address-pool}' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.capability-name' value = 'eipam-create-pool' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].name' value = 'group-flag' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[0].value' value = 'Y' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[1].name' value = 'plan-name' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[1].value' value = 'GMIS_V4_VPE_WAN' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[2].name' value = 'service-instance-id' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[2].value' value = '12345' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[3].name' value = 'region' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[3].value' value = 'mtn6' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[4].name' value = 'address-family' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[4].value' value = 'ipv4' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[5].name' value = 'equipment' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[5].value' value = 'VPE' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[6].name' value = 'mask' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[6].value' value = '32' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[7].name' value = 'allocateSubnetFlag' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[7].value' value = 'N' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[8].name' value = 'service-instance-id' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key[8].value' value = '111222' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.resource-key_length' value = '9' />
-                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.param[0].resource-resolution-data.status' value = 'PENDING' />
-            </set>
-            <switch test='`$ss.capability-name`'>
-                <outcome value=''>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="ss.capability-name is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.capability-action`'>
-                <outcome value=''>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="ss.capability-action is null" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="`'Invalid capability-action: '+ ss.capability-action + 'only assign is supported'`" />
-                    </return>
-                </outcome>
-                <outcome value='assign'>
-                    <block atomic="true">
-                        <block>
-                            <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                <set>
-                                    <parameter name='tmp.ss.param.capability-name' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />
-                                </set>
-                                <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
-                                    <outcome value='true'>
-                                        <break/>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
-                            </record>
-                            <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
-                                    <outcome value='group-flag'>
-                                        <set>
-                                            <parameter name='tmp.ss.group-flag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='allocateSubnetFlag'>
-                                        <set>
-                                            <parameter name='tmp.ss.allocateSubnetFlag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='plan-name'>
-                                        <set>
-                                            <parameter name='tmp.ss.plan-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='service-instance-id'>
-                                        <set>
-                                            <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='address-family'>
-                                        <set>
-                                            <parameter name='tmp.ss.address-family' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='mask'>
-                                        <set>
-                                            <parameter name='tmp.ss.mask' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </block>
-                        <set>
-                            <parameter name='aai.cloud-region.cloud-region-id' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
-                        </set>
-                        <set>
-                            <parameter name='tmp.skip-first-level' value='Y' />
-                            <parameter name='tmp.allocate-subnet-flag' value='`$tmp.ss.allocateSubnetFlag`' />
-                            <parameter name='eipam-ip-block.group-flag' value='`$tmp.ss.group-flag`' />
-                        </set>
-                        <switch test='`$tmp.ss.address-family`'>
-                            <outcome value='ipv4'>
-                                <set>
-                                    <parameter name='network-model.eipam-v4-address-plan' value='tmp.ss.plan-name' />
-                                    <parameter name='network-model.use-ipv4' value='Y' />
-                                    <parameter name='network-model.ipv4-ip-version' value='tmp.ss.address-family' />
-                                    <parameter name='network-model.ipv4-cidr-mask' value='tmp.ss.mask' />
-                                </set>
-                            </outcome>
-                            <outcome value='ipv6'>
-                                <set>
-                                    <parameter name='network-model.eipam-v6-address-plan' value='tmp.ss.plan-name' />
-                                    <parameter name='network-model.use-ipv6' value='Y' />
-                                    <parameter name='network-model.ipv6-ip-version' value='tmp.ss.address-family' />
-                                    <parameter name='network-model.ipv6-cidr-mask' value='tmp.ss.mask' />
-                                </set>
-                            </outcome>
-                        </switch>
-                        <call module='GENERIC-RESOURCE-API' rpc='process-generic-eipam-pools' mode='sync' >
-                            <outcome value='failure'>
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
-                                    <parameter name="error-code" value="500"/>
-                                    <parameter name="error-message" value="`'Error from process-generic-eipam-pools, ' + $error-message`" />
-                                </return>
-                            </outcome>
-                        </call>
-                    </block>
-                </outcome>
-            </switch>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.xml
deleted file mode 100644
index 7b81307..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-eipam-ip-assignment.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<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}'>
-    <method rpc='self-serve-eipam-ip-assignment' mode='sync'>
-        <block atomic="true">
-            <switch test='`$ss.capability-name`'>
-                <outcome value=''>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="ss.capability-name is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.capability-action`'>
-                <outcome value=''>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="ss.capability-action is null" />
-                    </return>
-                </outcome>
-                <outcome value='assign'>
-                    <block atomic="true">
-                        <call module='GENERIC-RESOURCE-API' rpc='self-service-capability-param-resolution' mode='sync' >
-                            <outcome value='failure'>
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
-                                    <parameter name="error-code" value="500"/>
-                                    <parameter name="error-message" value="`'Not all assignments are resolved' + $error-message`" />
-                                </return>
-                            </outcome>
-                        </call>
-                        <block>
-                            <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                <set>
-                                    <parameter name='tmp.ss.param.capability-name' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />
-                                </set>
-                                <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
-                                    <outcome value='true'>
-                                        <break/>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
-                            </record>
-                            <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
-                                    <outcome value='group-flag'>
-                                        <set>
-                                            <parameter name='tmp.ss.group-flag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='plan-name'>
-                                        <set>
-                                            <parameter name='tmp.ss.plan-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='address-family'>
-                                        <set>
-                                            <parameter name='tmp.ss.address-family' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='client-key'>
-                                        <set>
-                                            <parameter name='tmp.ss.client-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </block>
-                        <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-FQPN' mode='sync' >
-                            <outcome value='failure'>
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
-                                    <parameter name="error-code" value="500"/>
-                                    <parameter name="error-message" value="`'Not all assignments are resolved' + $error-message`" />
-                                </return>
-                            </outcome>
-                        </call>
-                        <set>
-                            <parameter name='eipam-ip-block.plans[0].requests[0].'
-    value='self-serve-generate-FQPN-output.' />
-                        </set>
-                        <set>
-                            <parameter name='eipam-ip-block.group-flag'
-    value='`$tmp.ss.group-flag`' />
-                            <parameter name='eipam-ip-block.plans[0].plan-name'
-    value='`$tmp.ss.plan-name`' />
-                            <parameter name='eipam-ip-block.plans[0].address-family'
-    value="`$tmp.ss.address-family`" />
-                            <parameter name='eipam-ip-block.plans[0].requests[0].client-key'
-	value="`$tmp.ss.client-key`" />
-                        </set>
-                        <set>
-                            <parameter name='eipam-ip-block.plans[0].requests_length' value='1' />
-                        </set>
-                        <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="assignIPAddress">
-                            <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' value='FAILED' />
-                                    </set>
-                                    <return status="failure">
-                                        <parameter name="ack-final" value="Y" />
-                                        <parameter name="error-code" value="500"/>
-                                        <parameter name="error-message" value="`'An error occured while obtaining ip addresses from EIPAM: ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </execute>
-                        <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                <outcome value='vmxvre_oam_ip_0'>
-                                    <block>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
-	value='`$eipam-ip-block.plans[0].requests[0].ip-prefix`' />
-                                        </set>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='SUCCESS' />
-                                        </set>
-                                    </block>
-                                </outcome>
-                                <outcome value='vmxvre_oam_ip_prefix_0'>
-                                    <block>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
-	value='`$eipam-ip-block.plans[0].requests[0].ip-prefix-length`' />
-                                        </set>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='SUCCESS' />
-                                        </set>
-                                    </block>
-                                </outcome>
-                                <outcome value='vmxvre_oam_gateway'>
-                                    <block>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
-	value='`$eipam-ip-block.plans[0].requests[0].ReservedAssignments[0].ReservedAssignment[3].ReservedKeyIPAddress`' />
-                                        </set>
-                                        <set>
-                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='SUCCESS' />
-                                        </set>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </block>
-                </outcome>
-                <outcome value='unassign'>
-                    <block atomic="true">
-                        <block>
-                            <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                <set>
-                                    <parameter name='tmp.ss.param.capability-name' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />
-                                </set>
-                                <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
-                                    <outcome value='true'>
-                                        <break/>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
-                            </record>
-                            <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
-                                    <outcome value='group-flag'>
-                                        <set>
-                                            <parameter name='tmp.ss.group-flag' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='plan-name'>
-                                        <set>
-                                            <parameter name='tmp.ss.plan-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='address-family'>
-                                        <set>
-                                            <parameter name='tmp.ss.address-family' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='client-key'>
-                                        <set>
-                                            <parameter name='tmp.ss.client-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </block>
-                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-	key='SELECT * from EIPAM_IP_ASSIGNMENTS 
-		WHERE service_instance_id = $tmp.ss.service-instance-id
-		AND client_key = $tmp.ss.client-key'>
-                            <outcome value='not-found'>
-                                <block></block>
-                            </outcome>
-                            <outcome value='success'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.status' value="PENDING_DELETE" />
-                                    </set>
-                                    <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
-	key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status 
-		WHERE service_instance_id = $tmp.ss.service-instance-id 
-		AND client_key = $tmp.ss.client-key" >
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Error updating EIPAM_IP_ASSIGNMENTS table to unassign ip with client_key=' + $tmp.ss.client-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
-                                            </return>
-                                        </outcome>
-                                    </update>
-                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="unassignIPAddress">
-                                        <parameter name="deleteEIPAM_status" value="`$tmp.status`" />
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Error in EIPAMPlugin.unassignIPAddress with client-key='+ $tmp.ss.client-key`" />
-                                            </return>
-                                        </outcome>
-                                    </execute>
-                                </block>
-                            </outcome>
-                        </get-resource>
-                        <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                <outcome value='vmxvre_oam_ip_0'>
-                                    <set>
-                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                    </set>
-                                </outcome>
-                                <outcome value='vmxvre_oam_ip_prefix_0'>
-                                    <set>
-                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                    </set>
-                                </outcome>
-                                <outcome value='vmxvre_oam_gateway'>
-                                    <set>
-                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss.eipam.log' />
-            </execute>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-FQPN.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-FQPN.xml
deleted file mode 100644
index 1c4903e..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-FQPN.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<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}'>
-    <method rpc='self-serve-generate-FQPN' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='eipam-ip-block.plan-name' value='`$tmp.ss.plan-name`' />
-            </set>
-            <set>
-                <parameter name='self-serve-generate-FQPN-output.' value='' />
-            </set>
-            <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="getPlanTopology">
-                <outcome value='failure'>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="`'An error occured while getting Keyname and Keyvalue for address plan, '+ $eipam-ip-block.planName + ', from EIPAM'`" />
-                    </return>
-                </outcome>
-            </execute>
-            <switch test='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`'>
-                <outcome value=''>
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="eipam-ip-block.getPlanTopologyResponse.topologyDetails is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index="resp-index" start="0" end="`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`">
-                <switch test='`$eipam-ip-block.plan-name == $eipam-ip-block.getPlanTopologyResponse.planName`'>
-                    <outcome value='false'>
-                        <return status="failure">
-                            <parameter name="ack-final" value="Y" />
-                            <parameter name="error-code" value="500"/>
-                            <parameter name="error-message" value="`'eipam response plan-name ['+ $eipam-ip-block.getPlanTopologyResponse.planName + ' is not the same as input '+$eipam-ip-block.planName`" />
-                        </return>
-                    </outcome>
-                </switch>
-                <set>
-                    <parameter name='pool-index'
-   value='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].level - 1`' />
-                </set>
-                <set>
-                    <parameter name='tmp.getPlanTopologyResponse.key-name' 
-	value='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].keyName`' />
-                </set>
-                <set>
-                    <parameter name='tmp.getPlanTopologyResponse.key-value-format' 
-	value='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails[$resp-index].keyValueFormat`' />
-                </set>
-                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                    <parameter name="original_string" value="`$tmp.getPlanTopologyResponse.key-value-format`" />
-                    <parameter name="regex" value=":" />
-                    <parameter name="ctx_memory_result_key" value="tmp.split.key-value-format" />
-                </execute>
-                <set>
-                    <parameter name='tmp.final.key-value' value="" />
-                </set>
-                <for index="split-index" start="0" end="`$tmp.split.key-value-format_length`">
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.split.key-value-format[$split-index]`" />
-                        <parameter name="target" value="${"/>
-                        <parameter name="replacement" value=""/>
-                        <parameter name="outputPath" value="tmp.split-value"/>
-                    </execute>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                        <parameter name="source" value="`$tmp.split-value`" />
-                        <parameter name="target" value="}"/>
-                        <parameter name="replacement" value=""/>
-                        <parameter name="outputPath" value="tmp.ss.split-value"/>
-                    </execute>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="`'SS: tmp.ss.split-value: ' + $tmp.ss.split-value`"/>
-                    </record>
-                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                        <set>
-                            <parameter name='tmp.ss.param.capability-name' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />
-                        </set>
-                        <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
-                            <outcome value='true'>
-                                <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$ss.param-index].resource-resolution-data.resource-key_length`">
-                                    <set>
-                                        <parameter name='tmp.ss.resource-key.name' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`' />
-                                    </set>
-                                    <switch test='`$tmp.ss.split-value == $tmp.ss.resource-key.name`'>
-                                        <outcome value='true'>
-                                            <set>
-                                                <parameter name='tmp.ss.partial.key-value' 
-	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                            </set>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                            </outcome>
-                        </switch>
-                    </for>
-                    <switch test='`$split-index == 0`'>
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='tmp.ss.final.key-value' value="`$tmp.ss.partial.key-value`" />
-                            </set>
-                        </outcome>
-                        <outcome value='false'>
-                            <set>
-                                <parameter name='tmp.ss.final.key-value' 
-	value="`$tmp.ss.final.key-value + ':' + $tmp.ss.partial.key-value`" />
-                            </set>
-                        </outcome>
-                    </switch>
-                </for>
-                <set>
-                    <parameter name='self-serve-generate-FQPN-output.pools[$pool-index].key-name'
-   value='`$tmp.getPlanTopologyResponse.key-name`' />
-                    <parameter name='self-serve-generate-FQPN-output.pools[$pool-index].key-value'
-	value='`$tmp.ss.final.key-value`' />
-                </set>
-            </for>
-            <set>
-                <parameter name='self-serve-generate-FQPN-output.pools_length' 
-	value='`$eipam-ip-block.getPlanTopologyResponse.topologyDetails_length`' />
-            </set>
-        </block>
-    </method>
-</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mac-address-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mac-address-assign.xml
deleted file mode 100755
index 0d56b23..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-mac-address-assign.xml
+++ /dev/null
@@ -1,615 +0,0 @@
-<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}'>
-    <method rpc='self-serve-mac-address-assign' mode='sync'>
-        <block atomic='true'>
-            <switch test="`$ss.capability-name`">
-                <outcome value='Other'>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-name is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-name is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value=''>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-name is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-name is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='null'>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-name is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-name is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='mac-address-assign'>
-                    <record plugin="com.att.sdnctl.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-name is mac-address-assign"/>
-                    </record>
-                </outcome>
-            </switch>
-            <switch test="`$ss.capability-action`">
-                <outcome value='Other'></outcome>
-                <outcome value=''>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-action is not set"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='ss.capability-action is not set' />
-                        </return>
-                    </block>
-                </outcome>
-                <outcome value='null'></outcome>
-                <outcome value='ASSIGN'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-action is ASSIGN"/>
-                    </record>
-                </outcome>
-                <outcome value='UNASSIGN'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-mac-address-assign: ss.capability-action is UNASSIGN"/>
-                    </record>
-                </outcome>
-            </switch>
-            <block atomic='true'>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                    <parameter name="logger" value="message-log"/>
-                    <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="self-serve-mac-address-assign: call self-service-capability-param-resolution DG"/>
-                </record>
-                <set>
-                    <!--<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />-->
-                </set>
-                <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >
-                    <outcome value='failure'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: Failure calling self-service-capability-param-resolution"/>
-                            </record>
-                            <return status='failure'>
-                                <parameter name='error-code' value='402' />
-                                <parameter name='error-message' value='Failure calling self-service-capability-param-resolution' />
-                            </return>
-                        </block>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </call>
-            </block>
-            <block atomic='true'>
-                <set>
-                    <parameter name='tmp.vf-module-parameters-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />
-                </set>
-                <for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-mac-address-assign: vf-module-param-index"/>
-                        <parameter name="field3" value='`$vf-module-param-index`'/>
-                    </record>
-                    <block>
-                        <set>
-                            <parameter name='vfModuleParamsCapabilityName' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.capability-name`'  />
-                        </set>
-                        <switch test="`$ss.capability-name == $vfModuleParamsCapabilityName`">
-                            <outcome value='true'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Found ss.capability-name MATCH"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='tmp.resource-resolution-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.`'  />
-                                    </set>
-                                    <break/>
-                                </block>
-                            </outcome>
-                            <outcome value='false'></outcome>
-                        </switch>
-                    </block>
-                </for>
-            </block>
-            <switch test="`$tmp.resource-resolution-data.status == 'PENDING'`">
-                <outcome value='false'>
-                    <block>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                        </record>
-                        <set>
-                            <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                        </set>
-                        <return status='failure'>
-                            <parameter name='error-code' value='401' />
-                            <parameter name='error-message' value='reseouce-resolution-data.status is not PENDING' />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block atomic='true'>
-                <set>
-                    <parameter name='tmp.resource-key-length' value='`$tmp.resource-resolution-data.resource-key_length`' />
-                </set>
-                <for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="self-serve-mac-address-assign: key-index"/>
-                        <parameter name="field3" value='`$key-index`'/>
-                    </record>
-                    <block>
-                        <switch test="`$tmp.resource-resolution-data.resource-key[$key-index].name == 'vnf-name'`">
-                            <outcome value='true'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Found resource-resolution-data.name = vnf-name"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='tmp.hostname' value='`$tmp.resource-resolution-data.resource-key[$key-index].value`'  />
-                                    </set>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: resolved hostname: "/>
-                                        <parameter name="field3" value='`$tmp.hostname`'/>
-                                    </record>
-                                </block>
-                            </outcome>
-                            <outcome value='false'></outcome>
-                        </switch>
-                    </block>
-                </for>
-                <switch test="`$tmp.hostname`">
-                    <outcome value='null'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: hostname is not set"/>
-                            </record>
-                            <set>
-                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                            </set>
-                            <return status='failure'>
-                                <parameter name='error-code' value='403' />
-                                <parameter name='error-message' value='hostname is not set' />
-                            </return>
-                        </block>
-                    </outcome>
-                    <outcome value=''>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                <parameter name="logger" value="message-log"/>
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="self-serve-mac-address-assign: hostname is not set"/>
-                            </record>
-                            <set>
-                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                            </set>
-                            <return status='failure'>
-                                <parameter name='error-code' value='403' />
-                                <parameter name='error-message' value='hostname is not set' />
-                            </return>
-                        </block>
-                    </outcome>
-                </switch>
-            </block>
-            <switch test='`$ss.capability-action`'>
-                <outcome value='ASSIGN'>
-                    <block atomic="true">
-                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="select * FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE HOSTNAME= $tmp.hostname" pfx='tmp.map'>
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Unable to access VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='Unable to access VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </get-resource>
-                        <switch test="`$tmp.map.hostname`">
-                            <outcome value='failure'>
-                                <block>
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="SELECT MIN(pool.id) as pool_id, pool.mac_address FROM VPE_MAC_ADDRESS_POOL pool WHERE NOT EXISTS(SELECT ID FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map where pool.ID = map.ID)" pfx='tmp.availid'>
-                                        <!--
-tmp.availid.mac_address is the mac_address we need to have finally.
--->
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </get-resource>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
-resource="SQL" 
-key="INSERT INTO VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING ( id , hostname , assigned_user, assigned_date ) VALUES ( $tmp.availid.pool-id , $tmp.hostname , 'SDNC' , NOW())" 
-force='true' pfx='save_val'>
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </save>
-                                    <set>
-                                        <parameter name="tmp.mac-address.mac-address" value="`$tmp.availid.mac-address`" />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value=''>
-                                <block>
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="SELECT MIN(pool.id) as pool_id, pool.mac_address FROM VPE_MAC_ADDRESS_POOL pool WHERE NOT EXISTS(SELECT ID FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map where pool.ID = map.ID)" pfx='tmp.availid'>
-                                        <!--
-tmp.availid.mac_address is the mac_address we need to have finally.
--->
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </get-resource>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
-resource="SQL" 
-key="INSERT INTO VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING ( id , hostname , assigned_user, assigned_date ) VALUES ( $tmp.availid.pool-id , $tmp.hostname , 'SDNC' , NOW())" 
-force='true' pfx='save_val'>
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </save>
-                                    <set>
-                                        <parameter name="tmp.mac-address.mac-address" value="`$tmp.availid.mac-address`" />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='null'>
-                                <block>
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="SELECT MIN(pool.id) as pool_id, pool.mac_address FROM VPE_MAC_ADDRESS_POOL pool WHERE NOT EXISTS(SELECT ID FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map where pool.ID = map.ID)" pfx='tmp.availid'>
-                                        <!--
-tmp.availid.mac_address is the mac_address we need to have finally.
--->
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </get-resource>
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
-resource="SQL" 
-key="INSERT INTO VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING ( id , hostname , assigned_user, assigned_date ) VALUES ( $tmp.availid.pool-id , $tmp.hostname , 'SDNC' , NOW())" 
-force='true' pfx='save_val'>
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='406' />
-                                                    <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </save>
-                                    <set>
-                                        <parameter name="tmp.mac-address.mac-address" value="`$tmp.availid.mac-address`" />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="SELECT pool.mac_address FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING map, VPE_MAC_ADDRESS_POOL pool WHERE pool.ID = map.ID AND map.HOSTNAME = $tmp.hostname" pfx="tmp.mac-address">
-                                    <outcome value='failure'>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="self-serve-mac-address-assign: reseouce-resolution-data.status is not PENDING"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                            </set>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='406' />
-                                                <parameter name='error-message' value='Failed to insert into VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                </get-resource>
-                            </outcome>
-                        </switch>
-                        <switch test="`$tmp.mac-address.mac-address`">
-                            <outcome value=''>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: tmp.mac_address not set"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='tmp.mac_address not set' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='null'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: tmp.mac_address not set"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='tmp.mac_address not set' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block>
-                                    <for index='vf-module-param-index' start='0' end='`$tmp.vf-module-parameters-length`' >
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log"/>
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="self-serve-mac-address-assign: vf-module-param-index"/>
-                                            <parameter name="field3" value='`$vf-module-param-index`'/>
-                                        </record>
-                                        <block>
-                                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].name`">
-                                                <outcome value='vmxvpfe_sriov41_0_port_mac'>
-                                                    <set>
-                                                        <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].value`" value="`$tmp.mac-address.mac-address`"  />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vmxvpfe_sriov41_1_port_mac'>
-                                                    <set>
-                                                        <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].value`" value="`$tmp.mac-address.mac-address`"  />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vmxvpfe_sriov41_3_port_mac'>
-                                                    <set>
-                                                        <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].value`" value="`$tmp.mac-address.mac-address`"  />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vmxvpfe_sriov41_4_port_mac'>
-                                                    <set>
-                                                        <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].value`" value="`$tmp.mac-address.mac-address`"  />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </block>
-                                    </for>
-                                    <set>
-                                        <parameter name="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`" value='SUCCESS'  />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='UNASSIGN'>
-                    <block atomic="true">
-                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key="select * FROM VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE HOSTNAME= $tmp.hostname" pfx='tmp.map'>
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </get-resource>
-                        <switch test="`$tmp.map.hostname`">
-                            <outcome value='failure'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value=''>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='null'>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="self-serve-mac-address-assign: Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation"/>
-                                    </record>
-                                    <set>
-                                        <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='405' />
-                                        <parameter name='error-message' value='Hostname not found in VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
-key='DELETE from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING WHERE hostname = $tmp.hostname'>
-                                    <outcome value='failure'>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="self-serve-mac-address-assign: Failure deleting from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation"/>
-                                            </record>
-                                            <set>
-                                                <parameter name='$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-param-index].resource-resolution-data.status' value='FAILED'  />
-                                            </set>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='405' />
-                                                <parameter name='error-message' value='Failure deleting from VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING on UNASSIGN operation' />
-                                            </return>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='success'>
-                                        <block>
-                                            <for index='key-index' start='0' end='`$tmp.resource-resolution-data.resource-key_length`' >
-                                                <set>
-                                                    <parameter name="`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`" value="DELETED"  />
-                                                </set>
-                                            </for>
-                                        </block>
-                                    </outcome>
-                                </delete>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/self-serv-mac-address-assign.log' />
-            </execute>
-            <return status='success'>
-                <parameter name="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$vf-module-parameters-index].resource-resolution-data.status`" value='SUCCESS'  />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.xml
deleted file mode 100755
index db5066d..0000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vlan-tag-assign.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<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}'>
-    <method rpc='self-serve-vlan-tag-assign' mode='sync'>
-        <block atomic='true'>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-                <outcome value='success'>
-                    <record  plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                        <parameter name="field3" value="self-serve-vlan-tag-assign: read properties file." />
-                    </record>
-                </outcome>
-                <outcome value='failure'>
-                    <block>
-                        <record  plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log"/>
-                            <parameter name="field1" value="__TIMESTAMP__"/>
-                            <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                            <parameter name="field3" value="self-serve-vlan-tag-assign: failed to read properties file." />
-                            <parameter name="field4" value="generic-resource-api-dg.properties"/>
-                        </record>
-                        <return status='failure'>
-                            <parameter name='error-code' value='500' />
-                            <parameter name='error-message' value='self-serve-vlan-tag-assign: could not read generic-resource-api properties' />
-                        </return>
-                    </block>
-                </outcome>
-            </execute>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
-            <for index='capIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
-                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module.param[$capIdx].resource-resolution-data.capability-name == $ss.capability-name`">
-                    <outcome value='true'>
-                        <switch test="`$ss.capability-action`">
-                            <outcome value='assign'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='sscap.res-target-type' value='`$prop.restapi.ss.capreserve.targettype`' />
-                                    </set>
-                                    <for index='rkIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key_length`' >
-                                        <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].name`">
-                                            <outcome value='vlan-recipe'>
-                                                <set>
-                                                    <parameter name='sscap.res-service-model' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='vnf-name'>
-                                                <set>
-                                                    <parameter name='sscap.res-entity-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='nf-role'>
-                                                <set>
-                                                    <parameter name='sscap.res-entity-type' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='aic-site-id'>
-                                                <set>
-                                                    <parameter name='sscap.res-target-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='vlan-tag-type'>
-                                                <set>
-                                                    <parameter name='sscap.res-endpoint-position' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                        <parameter name="field3" value="self-serve-vlan-tag-assign: reserve params"/>
-                                        <parameter name="field4" value='`$sscap.res-service-model`'/>
-                                        <parameter name="field5" value='`$sscap.res-entity-type`'/>
-                                        <parameter name="field6" value='`$sscap.res-entity-id`'/>
-                                        <parameter name="field7" value='`$sscap.res-target-type.`' />
-                                        <parameter name="field8" value='`$sscap.res-target-id`'/>
-                                        <parameter name="field9" value='`$sscap.res.endpoint-position`' />
-                                    </record>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.capreserve.templatefile`" />
-                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                        <parameter name='format' value='json' />
-                                        <parameter name='httpMethod' value='post' />
-                                        <parameter name='responsePrefix' value='tmp.sscapres-response' />
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                    <parameter name="field3" value="self-serve-vlan-tag-assign: restapi reserve execution failed"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='sscap.reserve.response-code' value='500' />
-                                                    <parameter name='sscap.reserve.response-message' value='Self Serve Capacity Api restapi reserve execution failed' />
-                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value='self-serve-vlan-tag-assign: reserve failed' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='success'>
-                                            <switch test="`$tmp.sscapres-response.response-code`">
-                                                <outcome value='200'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                            <parameter name="logger" value="message-log"/>
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                                            <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                            <parameter name="field3" value="self-serve-vlan-tag-assign: reserve successful"/>
-                                                            <parameter name="field4" value='`$tmp.sscapres-response.response-code`'/>
-                                                            <parameter name="field5" value='`$tmp.sscapres-response.response-message`'/>
-                                                            <parameter name="field6" value='`$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].allocated`' />
-                                                            <parameter name="field7" value='`$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].end-point-position`' />
-                                                        </record>
-                                                        <set>
-                                                            <parameter name='pmIdx' value='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' />
-                                                        </set>
-                                                        <set>
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='SUCCESS' />
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pmIdx].value' value='$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].allocated' />
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pmIdx].name' value='$tmp.sscapres-response.output.reservation-entity-list[0].reservation-target-list[0].resource-list[0].end-point-position' />
-                                                        </set>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                            <parameter name="logger" value="message-log"/>
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                                            <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                            <parameter name="field3" value="self-serve-vlan-tag-assign: reserve failed"/>
-                                                            <parameter name="field4" value='`$tmp.sscapres-response.response-code`'/>
-                                                            <parameter name="field5" value='`$tmp.sscapres-response.response-message`'/>
-                                                        </record>
-                                                        <set>
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />
-                                                        </set>
-                                                    </block>
-                                                </outcome>
-                                            </switch>
-                                        </outcome>
-                                    </execute>
-                                </block>
-                            </outcome>
-                            <outcome value='unassign'>
-                                <block atomic='true'>
-                                    <for index='rkIdx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key_length`' >
-                                        <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].name`">
-                                            <outcome value='vnf-name'>
-                                                <set>
-                                                    <parameter name='sscap.rel-entity-id' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='nf-role'>
-                                                <set>
-                                                    <parameter name='sscap.rel-entity-type' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='vlan-tag-type'>
-                                                <set>
-                                                    <parameter name='sscap.rel-endpoint-position' value='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.resource-key[$rkIdx].value`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                        <parameter name="logger" value="message-log"/>
-                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                        <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                        <parameter name="field3" value="self-serve-vlan-tag-assign: release params"/>
-                                        <parameter name="field4" value='`$sscap.res-entity-type`'/>
-                                        <parameter name="field5" value='`$sscap.res-entity-id`'/>
-                                        <parameter name="field6" value='`$sscap.res.endpoint-position`' />
-                                    </record>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.caprelease.templatefile`" />
-                                        <parameter name='restapiUrl' value='`$prop.controller.url`' />
-                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                        <parameter name='format' value='json' />
-                                        <parameter name='httpMethod' value='post' />
-                                        <parameter name='responsePrefix' value='tmp.sscaprel-response' />
-                                        <outcome value='failure'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                    <parameter name="field3" value="self-serve-vlan-tag-assign: restapi release execution failed"/>
-                                                </record>
-                                                <set>
-                                                    <parameter name='sscap.release.response-code' value='500' />
-                                                    <parameter name='sscap.release.response-message' value='Self Serve Capacity Api restapi release execution failed' />
-                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value='self-serve-vlan-tag-assign: release failed' />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='success'>
-                                            <switch test="`$tmp.sscaprel-response.response-code`">
-                                                <outcome value='200'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                            <parameter name="logger" value="message-log"/>
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                                            <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                            <parameter name="field3" value="self-serve-vlan-tag-assign: release successful"/>
-                                                            <parameter name="field4" value='`$tmp.sscaprel-response.response-code`'/>
-                                                            <parameter name="field5" value='`$tmp.sscaprel-response.response-message`'/>
-                                                        </record>
-                                                        <set>
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='DELETED' />
-                                                        </set>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                            <parameter name="logger" value="message-log"/>
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                                            <parameter name="field2" value="GENERIC-RESOURCE-API"/>
-                                                            <parameter name="field3" value="self-serve-vlan-tag-assign: release failed"/>
-                                                            <parameter name="field4" value='`$tmp.sscaprel-response.response-code`'/>
-                                                            <parameter name="field5" value='`$tmp.sscaprel-response.response-message`'/>
-                                                        </record>
-                                                        <set>
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-mofule[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$capIdx].resource-resolution-data.status' value='FAILED' />
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='error-code' value='500' />
-                                                            <parameter name='error-message' value='self-serve-vlan-tag-assign: release failed' />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </switch>
-                                        </outcome>
-                                    </execute>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </outcome>
-                </switch>
-            </for>
-            <return status='success'>
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 073b421..819c02b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,295 +1,296 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
-        <block atomic="true">
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='error-code' value='' />
-                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
-                            </return>
-                        </outcome>
-                    </execute>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                    </set>
-                </outcome>
-            </switch>
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
-                    </set>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='failure'>
-                    <block></block>
-                </outcome>
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </execute>
-            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.cidx' value="`0`" />
-                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='tmp.found-cidx' value="`false`" />
-                        </set>
-                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.found-cidx`'>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.parent-ar-url`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="parent" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
-value="`$connection-attachment-ar-identifiers.`" />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <block atomic="true">
-                <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
-                    <block atomic="true">
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                            <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
-                            <parameter name="regex" value="_"/>
-                            <parameter name="ctx_memory_result_key" value="param-prefix"/>
-                        </execute>
-                        <set>
-                            <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
-                        </set>
-                    </block>
-                </for>
-                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
-            </block>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
-			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
-                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
-                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
-                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
-                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
-                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
-                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
-                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
-                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
-                <parameter name="operational-status" value="Created" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </save>
-            <set>
-                <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
-            </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
-			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id" 
-      force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
-            </save>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='' />
+                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+                            </return>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                    </set>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+                    </set>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='failure'>
+                    <block></block>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </execute>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.cidx' value="`0`" />
+                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='tmp.found-cidx' value="`false`" />
+                        </set>
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-cidx`'>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.parent-ar-url`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="parent" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
+value="`$connection-attachment-ar-identifiers.`" />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <block atomic="true">
+                <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
+                    <block atomic="true">
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
+                            <parameter name="regex" value="_"/>
+                            <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                        </execute>
+                        <set>
+                            <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+                        </set>
+                    </block>
+                </for>
+                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            </block>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
+                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
+                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Created" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </save>
+            <set>
+                <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
+            </set>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource:relationship-list" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id" 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+            </save>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index e5e6d07..af67bd6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -184,9 +184,9 @@
                 <parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
                 <parameter name='cvlan' value='`$prop.sotn.cVLAN`' />
                 <parameter name='operational-status' value='Created' />
-                <!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->
-                <!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->
-                <!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->
+                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
diff --git a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
index 30ee561..fcd3d4f 100755
--- a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "distribute-traffic",
         "xml": "<method rpc='distribute-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$distribute-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$distribute-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='distribute-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/json/LCM_lock.json b/platform-logic/lcm/src/main/json/LCM_lock.json
index 32f1f8c..dea68fa 100644
--- a/platform-logic/lcm/src/main/json/LCM_lock.json
+++ b/platform-logic/lcm/src/main/json/LCM_lock.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "lock",
-        "xml": "<method rpc='lock' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "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='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "lock",
+        "xml": "<method rpc='lock' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "version": "${project.version}",
+        "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='LCM' version='${project.version}'>",
+        "outputs": 1,
+        "x": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "type": "execute",
+        "name": "execute DmaapMsg",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
+        "comments": "",
+        "x": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
index b88d314..d6f757a 100644
--- a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "quiesce-traffic",
         "xml": "<method rpc='quiesce-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$quiesce-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$quiesce-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='quiesce-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
index 6024d14..405e58b 100644
--- a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "resume-traffic",
         "xml": "<method rpc='resume-traffic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$resume-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$resume-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='resume-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/json/LCM_snapshot.json b/platform-logic/lcm/src/main/json/LCM_snapshot.json
index 549425c..76bb844 100644
--- a/platform-logic/lcm/src/main/json/LCM_snapshot.json
+++ b/platform-logic/lcm/src/main/json/LCM_snapshot.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "snapshot",
-        "xml": "<method rpc='snapshot' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "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='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "snapshot",
+        "xml": "<method rpc='snapshot' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "version": "${project.version}",
+        "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='LCM' version='${project.version}'>",
+        "outputs": 1,
+        "x": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Snapshot Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "type": "execute",
+        "name": "execute DmaapMsg",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",
+        "comments": "",
+        "x": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_unlock.json b/platform-logic/lcm/src/main/json/LCM_unlock.json
index 827259d..98d391d 100644
--- a/platform-logic/lcm/src/main/json/LCM_unlock.json
+++ b/platform-logic/lcm/src/main/json/LCM_unlock.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "unlock",
-        "xml": "<method rpc='unlock' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "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='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "unlock",
+        "xml": "<method rpc='unlock' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "version": "${project.version}",
+        "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='LCM' version='${project.version}'>",
+        "outputs": 1,
+        "x": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "type": "execute",
+        "name": "execute DmaapMsg",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>\n",
+        "comments": "",
+        "x": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
index 42534d6..d45b3d1 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
@@ -1,194 +1,164 @@
-[
-    {
-        "id": "85add9d3.6d38c8",
-        "type": "method",
-        "name": "upgrade-backup",
-        "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 535.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "a726273f.d4087"
-            ]
-        ]
-    },
-    {
-        "id": "6cc2acd4.57558c",
-        "type": "service-logic",
-        "name": "LCM ${project.version}",
-        "module": "LCM",
-        "version": "${project.version}",
-        "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='LCM' version='${project.version}'>",
-        "outputs": 1,
-        "x": 306.49993896484375,
-        "y": 84,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "85add9d3.6d38c8"
-            ]
-        ]
-    },
-    {
-        "id": "3b5bd72a.fb19f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
-        "comments": "",
-        "x": 388.5,
-        "y": 472,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "7bee7647.02e808",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103.5,
-        "y": 83,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "6cc2acd4.57558c"
-            ]
-        ]
-    },
-    {
-        "id": "a726273f.d4087",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 139.41668701171875,
-        "y": 237.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "c733c1eb.f6dc98",
-                "8a3a4a22.8cd238",
-                "5c905e45.08ff1",
-                "ff16f6f7.bb02d",
-                "3b5bd72a.fb19f8"
-            ]
-        ]
-    },
-    {
-        "id": "c733c1eb.f6dc98",
-        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.5,
-        "y": 222.08334350585938,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff16f6f7.bb02d",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 402.5,
-        "y": 399.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "4150232b.d9de94"
-            ]
-        ]
-    },
-    {
-        "id": "4150232b.d9de94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 611.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "1c38db15.1f052d"
-            ]
-        ]
-    },
-    {
-        "id": "f6eb674d.c21",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1506.9999389648438,
-        "y": 415.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            [
-                "db43d1c.5a1cab"
-            ]
-        ]
-    },
-    {
-        "id": "1c38db15.1f052d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.5,
-        "y": 397.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db43d1c.5a1cab",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1628.4166870117188,
-        "y": 416.0833511352539,
-        "z": "1bef9bfd.091c84",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c905e45.08ff1",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",
-        "comments": "",
-        "x": 374.5,
-        "y": 331.0833435058594,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    },
-    {
-        "id": "8a3a4a22.8cd238",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
-        "comments": "",
-        "x": 428.5,
-        "y": 274,
-        "z": "1bef9bfd.091c84",
-        "wires": []
-    }
-]
+[
+    {
+        "id": "c36c1e82.e47c",
+        "type": "method",
+        "name": "upgrade-backup",
+        "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 530,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "ea26f1ed.e963b"
+            ]
+        ]
+    },
+    {
+        "id": "4c2264b2.81a61c",
+        "type": "service-logic",
+        "name": "LCM ${project.version}",
+        "module": "LCM",
+        "version": "${project.version}",
+        "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='LCM' version='${project.version}'>",
+        "outputs": 1,
+        "x": 300.99993896484375,
+        "y": 122,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "c36c1e82.e47c"
+            ]
+        ]
+    },
+    {
+        "id": "a3360ab0.ce42c8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>",
+        "comments": "",
+        "x": 383,
+        "y": 510,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "7e67863d.7c42f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 121,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "4c2264b2.81a61c"
+            ]
+        ]
+    },
+    {
+        "id": "ea26f1ed.e963b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 133.91668701171875,
+        "y": 275.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f1d5fb31.fa3878",
+                "625601b.39b33",
+                "786cf009.ea481",
+                "cd184491.d656e8",
+                "a3360ab0.ce42c8"
+            ]
+        ]
+    },
+    {
+        "id": "f1d5fb31.fa3878",
+        "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 421,
+        "y": 260.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cd184491.d656e8",
+        "type": "execute",
+        "name": "execute DmaapMsg",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 397,
+        "y": 437.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "91133c94.04e29"
+            ]
+        ]
+    },
+    {
+        "id": "91133c94.04e29",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            [
+                "f3b86bb6.9cf808"
+            ]
+        ]
+    },
+    {
+        "id": "f3b86bb6.9cf808",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 435.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "786cf009.ea481",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",
+        "comments": "",
+        "x": 369,
+        "y": 369.0833435058594,
+        "z": "a439ae77.f8998",
+        "wires": []
+    },
+    {
+        "id": "625601b.39b33",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "comments": "",
+        "x": 423,
+        "y": 312,
+        "z": "a439ae77.f8998",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 60fe6a6..3808648 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-post-check",
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index 4f39f48..8657b53 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-pre-check",
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 95e0638..0ddbf91 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "1a420388.7ce24c",
+        "id": "fab0f7ed.c486b8",
         "type": "method",
         "name": "upgrade-software",
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 480,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "e635fd5d.f4087"
+                "5ccc8e8d.06e5"
             ]
         ]
     },
     {
-        "id": "c220826b.91906",
+        "id": "5c791eb8.0072b",
         "type": "service-logic",
         "name": "LCM ${project.version}",
         "module": "LCM",
@@ -24,528 +24,788 @@
         "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='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 337.99993896484375,
-        "y": 103,
-        "z": "af8f5cdd.6e4de",
+        "x": 267.99993896484375,
+        "y": 148,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1a420388.7ce24c"
+                "fab0f7ed.c486b8"
             ]
         ]
     },
     {
-        "id": "810e1e54.dec1c",
+        "id": "3503ece1.d7ad14",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 345.00001525878906,
-        "y": 379,
-        "z": "af8f5cdd.6e4de",
+        "x": 335.00001525878906,
+        "y": 755,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f279f5b8.9d49b8",
-                "895a0a53.e12ea8",
-                "fa759954.4e2068"
+                "734b2c42.973ee4",
+                "bb8a76ca.fb7058",
+                "a457fe79.46497"
             ]
         ]
     },
     {
-        "id": "f7db5396.7b5f1",
+        "id": "f17ff2aa.67075",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 690.9999389648438,
-        "y": 530.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 734.9999389648438,
+        "y": 863.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "bc5a2382.4973",
-                "84f0dd88.8438",
-                "ffd4aab1.e3c4b8"
+                "7ad5787f.1c20f8",
+                "b6f779a3.cc7ed8",
+                "f695f05e.abf31"
             ]
         ]
     },
     {
-        "id": "bc5a2382.4973",
+        "id": "7ad5787f.1c20f8",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835.9999389648438,
-        "y": 528.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 879.9999389648438,
+        "y": 861.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "84f0dd88.8438",
+        "id": "b6f779a3.cc7ed8",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.9999389648438,
-        "y": 571.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 918.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f44a47b3.3aa128"
+                "1a65bc45.b2fcb4"
             ]
         ]
     },
     {
-        "id": "f44a47b3.3aa128",
+        "id": "1a65bc45.b2fcb4",
         "type": "execute",
         "name": "execute reqExecResult",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9999389648438,
-        "y": 570.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1064.9999389648438,
+        "y": 917.0000305175781,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "dd2fe7e6.957248",
-                "6913b982.6c9bb8"
+                "5b0d24c6.9eb0ac",
+                "2b5e4322.1d495c"
             ]
         ]
     },
     {
-        "id": "895a0a53.e12ea8",
+        "id": "bb8a76ca.fb7058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.9999389648438,
-        "y": 439.0000534057617,
-        "z": "af8f5cdd.6e4de",
+        "x": 593.9999389648438,
+        "y": 776.0000915527344,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "f279f5b8.9d49b8",
+        "id": "734b2c42.973ee4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 583.9999389648438,
-        "y": 491.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 595.9999389648438,
+        "y": 828.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "f7db5396.7b5f1"
+                "f17ff2aa.67075"
             ]
         ]
     },
     {
-        "id": "dd2fe7e6.957248",
+        "id": "5b0d24c6.9eb0ac",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.9999389648438,
-        "y": 542.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 1233.9999389648438,
+        "y": 875.0000381469727,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "ffd4aab1.e3c4b8",
+        "id": "f695f05e.abf31",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.9999389648438,
-        "y": 486.00006103515625,
-        "z": "af8f5cdd.6e4de",
+        "x": 876.9999389648438,
+        "y": 819.0000686645508,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "80cc4946.3f0f78"
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "6913b982.6c9bb8",
+        "id": "2b5e4322.1d495c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191.9999389648438,
-        "y": 597.0000915527344,
-        "z": "af8f5cdd.6e4de",
+        "x": 1241.9998779296875,
+        "y": 923.0001220703125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "14c8dea1.b5b7a1"
+                "db1e6d62.a1404"
             ]
         ]
     },
     {
-        "id": "a32993f8.f8215",
+        "id": "c1a2b259.11e46",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
         "comments": "",
-        "x": 1467.9998779296875,
-        "y": 648.0000610351562,
-        "z": "af8f5cdd.6e4de",
+        "x": 1535.9998779296875,
+        "y": 980.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "d8c3f83d.d0b9d8",
+        "id": "566f9779.c05d38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 102,
-        "z": "af8f5cdd.6e4de",
+        "x": 83,
+        "y": 147,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c220826b.91906"
+                "5c791eb8.0072b"
             ]
         ]
     },
     {
-        "id": "e635fd5d.f4087",
+        "id": "5ccc8e8d.06e5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 139.91668701171875,
-        "y": 241.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 80.91668701171875,
+        "y": 239.08334350585938,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "810e1e54.dec1c",
-                "ee1802be.c5c18",
-                "e8d3b31a.f46c6",
-                "4d7f56db.9375c8"
+                "3503ece1.d7ad14",
+                "dc18f7c9.2e4ac8",
+                "814875d2.cac108",
+                "e9d89bdf.30f7a8",
+                "69e97f86.e07ef",
+                "fa9a8e1f.bba53",
+                "baba22fc.1ceb5",
+                "81510405.ca8868"
             ]
         ]
     },
     {
-        "id": "ee1802be.c5c18",
+        "id": "dc18f7c9.2e4ac8",
         "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%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 328.00001525878906,
-        "y": 225.08334350585938,
-        "z": "af8f5cdd.6e4de",
+        "x": 379.0000305175781,
+        "y": 272.0833435058594,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3830f5d4.87f1aa",
+        "id": "70d1c79a.089af8",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.9999389648438,
-        "y": 371.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1545.9998779296875,
+        "y": 725.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "1566d659.a0655a"
+                "d776c76b.1dd188"
             ]
         ]
     },
     {
-        "id": "1566d659.a0655a",
+        "id": "d776c76b.1dd188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1392.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1715.9998168945312,
+        "y": 724.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "22f8bfd0.6139e"
+                "eac6c260.d11fc"
             ]
         ]
     },
     {
-        "id": "80cc4946.3f0f78",
+        "id": "2b54a991.b17b16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.9998779296875,
-        "y": 395.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1348.9998168945312,
+        "y": 749.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "3830f5d4.87f1aa",
-                "fedbb5e6.fb3c28",
-                "898f667e.daf2e8"
+                "70d1c79a.089af8",
+                "7970fcd5.6f11b4",
+                "3d8934f9.d0339c"
             ]
         ]
     },
     {
-        "id": "7ce48bed.5b7c74",
+        "id": "e790e11b.4f947",
         "type": "execute",
         "name": "execute DmaapMsg",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1488.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1546.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "37e7fa80.2728b6"
+                "2e13891.034f576"
             ]
         ]
     },
     {
-        "id": "37e7fa80.2728b6",
+        "id": "2e13891.034f576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.4998779296875,
-        "y": 597.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1714.4998779296875,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "47c7511a.dd8fe"
+                "30475e40.9b8be2"
             ]
         ]
     },
     {
-        "id": "22f8bfd0.6139e",
+        "id": "eac6c260.d11fc",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1524.9998779296875,
-        "y": 370.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1835.9998779296875,
+        "y": 723.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedbb5e6.fb3c28",
+        "id": "7970fcd5.6f11b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1197.9165649414062,
-        "y": 408.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1527.91650390625,
+        "y": 776.0834045410156,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "47c7511a.dd8fe",
+        "id": "30475e40.9b8be2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1769.9166259765625,
-        "y": 598.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1842.9166259765625,
+        "y": 930.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
     },
     {
-        "id": "898f667e.daf2e8",
+        "id": "3d8934f9.d0339c",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1174.9999389648438,
-        "y": 318.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1532.9998779296875,
+        "y": 672.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "14c8dea1.b5b7a1",
+        "id": "db1e6d62.a1404",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1317.9998779296875,
-        "y": 596.0833435058594,
-        "z": "af8f5cdd.6e4de",
+        "x": 1369.9998779296875,
+        "y": 924.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "7ce48bed.5b7c74",
-                "70a28c6a.563d24",
-                "a32993f8.f8215"
+                "e790e11b.4f947",
+                "3a3f1d44.898da2",
+                "c1a2b259.11e46"
             ]
         ]
     },
     {
-        "id": "70a28c6a.563d24",
+        "id": "3a3f1d44.898da2",
         "type": "set",
-        "name": "set",
+        "name": "set DmaapReq",
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
-        "x": 1448.1666259765625,
-        "y": 549.0833740234375,
-        "z": "af8f5cdd.6e4de",
+        "x": 1536.1666259765625,
+        "y": 875.0833740234375,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "fa759954.4e2068",
+        "id": "a457fe79.46497",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 577.9999389648438,
-        "y": 392.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 602.9999389648438,
+        "y": 728.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "ed41675d.59c088"
+                "3d4c2c9a.7b1324"
             ]
         ]
     },
     {
-        "id": "756c2e53.ca6d7",
+        "id": "d512629f.bc625",
         "type": "set",
         "name": "set Defaults",
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
         "comments": "",
-        "x": 1009.9999389648438,
-        "y": 297.0000305175781,
-        "z": "af8f5cdd.6e4de",
+        "x": 893.9999389648438,
+        "y": 687,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "ed41675d.59c088",
+        "id": "3d4c2c9a.7b1324",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 384.0000228881836,
-        "z": "af8f5cdd.6e4de",
+        "x": 739.9999389648438,
+        "y": 722.0000610351562,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "756c2e53.ca6d7",
-                "80cc4946.3f0f78"
+                "d512629f.bc625",
+                "2b54a991.b17b16"
             ]
         ]
     },
     {
-        "id": "e8d3b31a.f46c6",
+        "id": "814875d2.cac108",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "name": "set default values",
+        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
         "comments": "",
-        "x": 336,
-        "y": 269,
-        "z": "af8f5cdd.6e4de",
+        "x": 372,
+        "y": 319,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "4d7f56db.9375c8",
+        "id": "442dbdff.6dfcb4",
         "type": "get-resource",
-        "name": "get aai.generic-vnf by vnf-id",
+        "name": "get aai.generic-vnf ",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
-        "x": 349.0000305175781,
-        "y": 325,
-        "z": "af8f5cdd.6e4de",
+        "x": 912,
+        "y": 495,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "fa69a126.2a554",
-                "f9cb9963.f9e368"
+                "1e57cb28.122ad5"
             ]
         ]
     },
     {
-        "id": "fa69a126.2a554",
-        "type": "failure",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 589.86083984375,
-        "y": 312.53564453125,
-        "z": "af8f5cdd.6e4de",
-        "wires": [
-            [
-                "2d1a88c6.11f9d8"
-            ]
-        ]
-    },
-    {
-        "id": "f9cb9963.f9e368",
+        "id": "1e57cb28.122ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 591.3908081054688,
-        "y": 260.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "x": 1070.3907470703125,
+        "y": 493.28399658203125,
+        "z": "50de34e0.ace54c",
         "wires": [
             [
-                "c4d4de4d.3e19f"
+                "5a65efc0.bf413"
             ]
         ]
     },
     {
-        "id": "c4d4de4d.3e19f",
-        "type": "set",
-        "name": "set nodelist",
-        "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "id": "baba22fc.1ceb5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
         "comments": "",
-        "x": 740.3908081054688,
-        "y": 259.28399658203125,
-        "z": "af8f5cdd.6e4de",
+        "outputs": 1,
+        "x": 300.9998779296875,
+        "y": 683,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69e97f86.e07ef",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 354,
+        "y": 420,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "e43265e9.4c7f38",
+                "d78c93da.7125f"
+            ]
+        ]
+    },
+    {
+        "id": "e9d89bdf.30f7a8",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 366,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e43265e9.4c7f38",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 551,
+        "y": 399,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "abbc4ae4.be5328"
+            ]
+        ]
+    },
+    {
+        "id": "d78c93da.7125f",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.9999389648438,
+        "y": 460,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "f68ee407.ca6d88"
+            ]
+        ]
+    },
+    {
+        "id": "f68ee407.ca6d88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.9999389648438,
+        "y": 459,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "442dbdff.6dfcb4",
+                "80c560bb.eea5f"
+            ]
+        ]
+    },
+    {
+        "id": "abbc4ae4.be5328",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",
+        "comments": "",
+        "x": 712,
+        "y": 397,
+        "z": "50de34e0.ace54c",
         "wires": []
     },
     {
-        "id": "2d1a88c6.11f9d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+        "id": "80c560bb.eea5f",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 312,
-        "z": "af8f5cdd.6e4de",
+        "x": 921,
+        "y": 439,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa9a8e1f.bba53",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "1a5624d2.74e98b"
+            ]
+        ]
+    },
+    {
+        "id": "1a5624d2.74e98b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522,
+        "y": 552,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "524c17a1.30fbf8"
+            ]
+        ]
+    },
+    {
+        "id": "524c17a1.30fbf8",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "comments": "",
+        "x": 712,
+        "y": 551,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "81510405.ca8868",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 341,
+        "y": 610,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "7a126f.d2de2d9",
+                "8743a074.e8506"
+            ]
+        ]
+    },
+    {
+        "id": "7a126f.d2de2d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521,
+        "y": 603,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "c954af6f.c34df",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 678,
+        "y": 617,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "8743a074.e8506",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 520,
+        "y": 647,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c954af6f.c34df"
+            ]
+        ]
+    },
+    {
+        "id": "90b2891b.001708",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "c9dd0d76.432f7"
+            ]
+        ]
+    },
+    {
+        "id": "c9dd0d76.432f7",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1574,
+        "y": 482,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "6ea15b2b.d9cd74"
+            ]
+        ]
+    },
+    {
+        "id": "9706bdee.6acf9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1369,
+        "y": 535,
+        "z": "50de34e0.ace54c",
+        "wires": []
+    },
+    {
+        "id": "5a65efc0.bf413",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199,
+        "y": 492,
+        "z": "50de34e0.ace54c",
+        "wires": [
+            [
+                "90b2891b.001708",
+                "9706bdee.6acf9"
+            ]
+        ]
+    },
+    {
+        "id": "6ea15b2b.d9cd74",
+        "type": "execute",
+        "name": "set playbookname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1746,
+        "y": 480,
+        "z": "50de34e0.ace54c",
         "wires": [
             []
         ]
diff --git a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
index d83d149..9b550d32 100755
--- a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='distribute-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
index 9503899..36eec1d 100644
--- a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='quiesce-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
index 54d35bd..9d2795b 100644
--- a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='resume-traffic-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
index 4284f40..73d0885 100644
--- a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
@@ -50,4 +50,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_unlock.xml b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
index 37c36a0..f524af4 100644
--- a/platform-logic/lcm/src/main/xml/LCM_unlock.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
@@ -26,7 +26,7 @@
                 <parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>
                 <parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>
                 <parameter name='lcm-dmaap.status.code' value='400' />
-                <parameter name='lcm-dmaap.status.message' value='SDNC UnLock Mock returns success'/>
+                <parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
             </execute>
             <return status='success'>
                 <parameter name='status.code' value='400' />
-                <parameter name='status.message' value='SDNC UnLock Mock returns success'/>
+                <parameter name='status.message' value='SDNC Unlock Mock returns success'/>
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
index 4b9ef5c..39eb341 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
@@ -26,7 +26,7 @@
                 <parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>
                 <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>
                 <parameter name='lcm-dmaap.status.code' value='400' />
-                <parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>
+                <parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
             </execute>
             <return status='success'>
                 <parameter name='status.code' value='400' />
-                <parameter name='status.message' value='SDNC Lock Mock returns success'/>
+                <parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 50301a7..3338f1c 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-post-check-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index c0947ca..1bf68e5 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-pre-check-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 252b438..1a72c47 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -10,26 +10,75 @@
             <set>
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
-                <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                <parameter name='quote' value="'" />
             </set>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+                <parameter name='source' value='upgrade-software-input.payload' />
+                <parameter name='outputPath' value='payloadJson' />
+                <parameter name='isEscaped' value='true' />
+            </execute>
+            <switch test='`$payloadJson.pnf-flag`'>
+                <outcome value='true'>
+                    <set>
+                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
-                <outcome value='success'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$playbookname`'>
+                <outcome value=''>
                     <set>
-                        <parameter name='quote' value="'" />
-                        <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address +  $quote + ']'`"/>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                        <parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>
                     </set>
                 </outcome>
-                <outcome value='Other'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                        <parameter name="logger" value="message-log"/>
-                        <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
-                    </record>
+            </switch>
+            <switch test='`$nodelist`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
                 </outcome>
-            </get-resource>
+                <outcome value="['']">
+                    <set>
+                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+                    </set>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value='`$playbookname`'/>
+                <parameter name="field2" value='`$nodelist`'/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
                 <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
                 <parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
                 <parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>
-                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
                         <set>
@@ -219,7 +268,7 @@
                                 <parameter name='User' value='`$prop.ansible.user`'/>
                                 <parameter name='Password' value='`$prop.ansible.password`'/>
                                 <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
-                                <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+                                <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
                                         <set>