summaryrefslogtreecommitdiffstats
path: root/platform-logic/vnfapi/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic/vnfapi/src/main')
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json8
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json8
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json30
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json46
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json10
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json16
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_rollback-eipam-ip-assignment.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json6
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json10
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json12
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json14
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json4
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json4
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json6
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json10
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json12
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json14
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json4
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json4
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json6
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json10
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json12
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign-vfmodule.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-delete.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-rollback.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json6
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json12
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-preload-operation.json2
-rw-r--r--platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json4
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml2
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml4
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml2
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml2
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml2
-rw-r--r--platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml16
46 files changed, 164 insertions, 164 deletions
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json b/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json
index 04554cf1..5ff1cff4 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json
@@ -3,7 +3,7 @@
"id": "dd70f366.d125c",
"type": "execute",
"name": "execute: generateUUID",
- "xml": "<execute plugin=\"org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
"comments": "",
"outputs": 1,
"x": 508.75,
@@ -46,7 +46,7 @@
"id": "e113a5e5.a5dc38",
"type": "get-resource",
"name": "Query AnAI - l3-network",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\"\n resource=\"l3-network\"\n key=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\"\n local-only=\"false\"\n pfx=\"tmp.local-variables.generate-l3network-network-id.L3NETWORK\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n resource=\"l3-network\"\n key=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\"\n local-only=\"false\"\n pfx=\"tmp.local-variables.generate-l3network-network-id.L3NETWORK\" >",
"comments": "",
"outputs": 1,
"x": 634.0000076293945,
@@ -172,7 +172,7 @@
"id": "401c414.4d08ac",
"type": "execute",
"name": "execute: generateUUID",
- "xml": "<execute plugin=\"org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
"comments": "",
"outputs": 1,
"x": 1207.5000076293945,
@@ -247,7 +247,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 239,
"y": 71.24999618530273,
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json b/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json
index dab8f422..90549fcb 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json
@@ -3,7 +3,7 @@
"id": "aaa6ff4b.724ea",
"type": "execute",
"name": "execute: generateUUID",
- "xml": "<execute plugin=\"org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-subnets-subnet-id.uuid\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-subnets-subnet-id.uuid\" />",
"comments": "",
"outputs": 1,
"x": 412.8571472167969,
@@ -46,7 +46,7 @@
"id": "a4f5c20.aaf894",
"type": "get-resource",
"name": "Query AnAI - subnets",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\"\n\tresource=\"subnet\"\n\t\tkey=\"l3-network.network-id = $tmp.local.network-id \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\"\n\t\tlocal-only=\"false\"\n\t\tpfx=\"tmp.local-variables.generate-subnets-subnet-id.SUBNETS\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"subnet\"\n\t\tkey=\"l3-network.network-id = $tmp.local.network-id \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\"\n\t\tlocal-only=\"false\"\n\t\tpfx=\"tmp.local-variables.generate-subnets-subnet-id.SUBNETS\" >",
"comments": "",
"outputs": 1,
"x": 538.1071548461914,
@@ -172,7 +172,7 @@
"id": "a44a8681.7894a8",
"type": "execute",
"name": "execute: generateUUID",
- "xml": "<execute plugin=\"org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-subnets-subnet-id.uuid\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-subnets-subnet-id.uuid\" />",
"comments": "",
"outputs": 1,
"x": 1111.6071548461914,
@@ -247,7 +247,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 143.10714721679688,
"y": 90.89284896850586,
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json
index c2751886..33a00737 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json
@@ -22,7 +22,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 295.4444351196289,
"y": 37.238101959228516,
@@ -86,7 +86,7 @@
"id": "e6608c59.2d82d",
"type": "save",
"name": "save AnAI - l3-network",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<!-- Create l3-network object -->\n<parameter name=\"network-id\" value=\"`$tmp.return.generate-l3network-network-id.uuid`\" />\n<parameter name=\"network-name\" value=\"`$network-topology-operation-input.network-request-information.network-name`\" />\n<parameter name=\"network-type\" value=\"`$network-topology-operation-input.network-request-information.network-type`\" />\n<parameter name=\"network-role\" value=\"`$preload-data.network-topology-information.network-topology-identifier.network-role`\" />\n<parameter name=\"network-technology\" value=\"`$preload-data.network-topology-information.network-topology-identifier.network-technology`\" />\n<parameter name=\"service-id\" value=\"`$network-topology-operation-input.service-information.service-id`\" />\n<parameter name=\"tenant-id\" value=\"`$network-topology-operation-input.network-request-information.tenant`\" />\n<parameter name=\"network-role-instance\" value=\"0\" />\n<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<!-- Create l3-network object -->\n<parameter name=\"network-id\" value=\"`$tmp.return.generate-l3network-network-id.uuid`\" />\n<parameter name=\"network-name\" value=\"`$network-topology-operation-input.network-request-information.network-name`\" />\n<parameter name=\"network-type\" value=\"`$network-topology-operation-input.network-request-information.network-type`\" />\n<parameter name=\"network-role\" value=\"`$preload-data.network-topology-information.network-topology-identifier.network-role`\" />\n<parameter name=\"network-technology\" value=\"`$preload-data.network-topology-information.network-topology-identifier.network-technology`\" />\n<parameter name=\"service-id\" value=\"`$network-topology-operation-input.service-information.service-id`\" />\n<parameter name=\"tenant-id\" value=\"`$network-topology-operation-input.network-request-information.tenant`\" />\n<parameter name=\"network-role-instance\" value=\"0\" />\n<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 436.1934051513672,
@@ -313,7 +313,7 @@
"id": "42bfa7b6.ab68a8",
"type": "save",
"name": "save relationship: vpn_bindings",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.vpn-binding-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.vpn-binding-id`\" />",
"comments": "",
"outputs": 1,
"x": 1053.856918334961,
@@ -575,7 +575,7 @@
"id": "fc2001b2.ee9d2",
"type": "save",
"name": "query AnAI - vpn-bindings",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vpn-binding\" \n\t\tkey=\"vpn-binding.global-route-target = $preload-data.network-topology-information.vpn-bindings[$i].global-route-target\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vpn-binding\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\" \n\t\tkey=\"vpn-binding.global-route-target = $preload-data.network-topology-information.vpn-bindings[$i].global-route-target\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vpn-binding\">",
"comments": "",
"outputs": 1,
"x": 1411.5635795593262,
@@ -638,7 +638,7 @@
"id": "e4f1cfec.80ca7",
"type": "delete",
"name": "delete l3-network",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\">",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\">",
"comments": "",
"outputs": 1,
"x": 1525.530288696289,
@@ -857,7 +857,7 @@
"id": "efde88cf.9b8748",
"type": "save",
"name": "save relationship: network-policy",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.network-policy.network-policy-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.network-policy.network-policy-id`\" />",
"comments": "",
"outputs": 1,
"x": 2268.0121154785156,
@@ -906,7 +906,7 @@
"id": "9a67180c.7e8c88",
"type": "save",
"name": "query AnAI - network-policy",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"network-policy\" \n\t\tkey=\"network-policy.network-policy-fqdn = $preload-data.network-topology-information.network-policy[$i].network-policy-fqdn\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.network-policy\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\" \n\t\tkey=\"network-policy.network-policy-fqdn = $preload-data.network-topology-information.network-policy[$i].network-policy-fqdn\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.network-policy\">",
"comments": "",
"outputs": 1,
"x": 1282.71869108412,
@@ -1062,7 +1062,7 @@
"id": "6a95cc4c.004c34",
"type": "save",
"name": "save relationship: tenant and cloud-region",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t<!-- create relationship-list -->\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tenant\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"Rackspace\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"tenant.tenant-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.tenant`\" />\n\t<parameter name=\"relationship-list.relationship[1].related-to\" value=\"cloud-region\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"Rackspace\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t<!-- create relationship-list -->\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tenant\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"Rackspace\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"tenant.tenant-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.tenant`\" />\n\t<parameter name=\"relationship-list.relationship[1].related-to\" value=\"cloud-region\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"Rackspace\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n\t<parameter name=\"relationship-list.relationship[1].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\" />",
"comments": "",
"outputs": 1,
"x": 495.5635681152344,
@@ -1167,7 +1167,7 @@
"id": "69434546.6b177c",
"type": "save",
"name": "save AnAI - l3-network.subnets",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\" >\n<!-- Create l3-network object -->\n<parameter name=\"network-id\" value=\"`$tmp.return.generate-l3network-network-id.uuid`\" />\n<parameter name=\"subnet-id\" value=\"`$tmp.return.generate-subnets-subnet-id.uuid`\" />\n<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$i].subnet-name`\" />\n<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\" />\n<parameter name=\"network-start-address\" value=\"`$preload-data.network-topology-information.subnets[$i].start-address`\" />\n<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$i].cidr-mask`\" />\n<parameter name=\"ip-version\" value=\"`$preload-data.network-topology-information.subnets[$i].ip-version`\" />\n<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-start-address`\" />\n<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-end-address`\" />\n<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\" />\n\t\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\" >\n<!-- Create l3-network object -->\n<parameter name=\"network-id\" value=\"`$tmp.return.generate-l3network-network-id.uuid`\" />\n<parameter name=\"subnet-id\" value=\"`$tmp.return.generate-subnets-subnet-id.uuid`\" />\n<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$i].subnet-name`\" />\n<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\" />\n<parameter name=\"network-start-address\" value=\"`$preload-data.network-topology-information.subnets[$i].start-address`\" />\n<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$i].cidr-mask`\" />\n<parameter name=\"ip-version\" value=\"`$preload-data.network-topology-information.subnets[$i].ip-version`\" />\n<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-start-address`\" />\n<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-end-address`\" />\n<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\" />\n\t\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 940.6379051208496,
@@ -1184,7 +1184,7 @@
"id": "cced61c2.cb78b",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $network-topology-operation-input.network-request-information.network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network.existed\">\n\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $network-topology-operation-input.network-request-information.network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network.existed\">\n\n",
"comments": "",
"outputs": 1,
"x": 458,
@@ -1320,7 +1320,7 @@
"id": "dfebf1ef.060d1",
"type": "save",
"name": "update AnAI - l3-network",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"is-bound-to-vpn\" value=\"true\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"is-bound-to-vpn\" value=\"true\" />",
"comments": "",
"outputs": 1,
"x": 655.3016128540039,
@@ -1666,7 +1666,7 @@
"id": "d92a7574.cd1b58",
"type": "save",
"name": "update AnAI - l3-network.provider-network-information",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"physical-network-name\" value=\"`$preload-data.network-topology-information.provider-network-information.physical-network-name`\" />\n<parameter name=\"is-provider-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-provider-network`\" />\n<parameter name=\"is-shared-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-shared-network`\" />\n<parameter name=\"is-external-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-external-network`\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"physical-network-name\" value=\"`$preload-data.network-topology-information.provider-network-information.physical-network-name`\" />\n<parameter name=\"is-provider-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-provider-network`\" />\n<parameter name=\"is-shared-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-shared-network`\" />\n<parameter name=\"is-external-network\" value=\"`$preload-data.network-topology-information.provider-network-information.is-external-network`\" />",
"comments": "",
"outputs": 1,
"x": 534.7499847412109,
@@ -1802,7 +1802,7 @@
"id": "75664f84.1ae09",
"type": "save",
"name": "save relationship: route-table-reference",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.route-table-reference.route-table-reference-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.route-table-reference.route-table-reference-id`\" />",
"comments": "",
"outputs": 1,
"x": 2454.9962632921006,
@@ -1851,7 +1851,7 @@
"id": "4c6ed27c.d3899c",
"type": "save",
"name": "query AnAI - route-table-reference",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"route-table-reference\" \n\t\tkey=\"route-table-reference.route-table-reference-fqdn = $preload-data.network-topology-information.route-table-reference[$i].route-table-reference-fqdn\" \n\t\tpfx=\"tmp.AnAI.route-table-reference\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"route-table-reference\" \n\t\tkey=\"route-table-reference.route-table-reference-fqdn = $preload-data.network-topology-information.route-table-reference[$i].route-table-reference-fqdn\" \n\t\tpfx=\"tmp.AnAI.route-table-reference\">",
"comments": "",
"outputs": 1,
"x": 1348.702838897705,
@@ -2083,7 +2083,7 @@
"id": "830f1b88.627bf8",
"type": "save",
"name": "save relationship: service-instance",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"customer.global-customer-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$network-topology-operation-input.service-information.subscriber-name`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"service-subscription.service-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.service-information.service-type`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"service-instance.service-instance-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$network-topology-operation-input.service-information.service-instance-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"customer.global-customer-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$network-topology-operation-input.service-information.subscriber-name`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"service-subscription.service-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$network-topology-operation-input.service-information.service-type`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"service-instance.service-instance-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$network-topology-operation-input.service-information.service-instance-id`\" />",
"comments": "",
"outputs": 1,
"x": 449.74998474121094,
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json
index 744fe022..e8a2de43 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json
@@ -34,7 +34,7 @@
"id": "c7828b0a.e799e8",
"type": "get-resource",
"name": "get AnAI - l3-network",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 424.80941009521484,
@@ -348,7 +348,7 @@
"id": "df441732.5a6038",
"type": "save",
"name": "update AnAI - subnet",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$k].subnet-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n\t\t",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$k].subnet-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n\t\t",
"comments": "",
"outputs": 1,
"x": 1410.3694496154785,
@@ -501,7 +501,7 @@
"id": "17ed7289.814ddd",
"type": "save",
"name": "update AnAI - subnet",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$k].subnet-id\" >\n\t<!-- Update l3network.subnet -->\n\t<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\"/>\n\t<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$n].subnet-name`\"/>\n\t<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$n].cidr-mask`\"/>\n\t<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$n].dhcp-start-address`\"/>\n\t<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$n].dhcp-end-address`\"/>\n\t<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\"/>\n\t<parameter name=\"orchestration-status\" value=\"pending-update\" />\n\t\t",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$k].subnet-id\" >\n\t<!-- Update l3network.subnet -->\n\t<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\"/>\n\t<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$n].subnet-name`\"/>\n\t<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$n].cidr-mask`\"/>\n\t<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$n].dhcp-start-address`\"/>\n\t<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$n].dhcp-end-address`\"/>\n\t<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\"/>\n\t<parameter name=\"orchestration-status\" value=\"pending-update\" />\n\t\t",
"comments": "",
"outputs": 1,
"x": 1941.5383796691895,
@@ -986,7 +986,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 282.5594940185547,
"y": 53.22220325469971,
@@ -1344,7 +1344,7 @@
"id": "84c3d0d1.e984c",
"type": "save",
"name": "save AnAI - l3-network.subnets.subnet",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\" >\n\t<!-- Create l3-network object -->\n\t<parameter name=\"network-id\" value=\"`$tmp.AnAI.l3network.network-id`\" />\n\t<parameter name=\"subnet-id\" value=\"`$tmp.return.generate-subnets-subnet-id.uuid`\" />\n\t<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\" />\n\t<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$i].subnet-name`\" />\t\t\n\t<parameter name=\"network-start-address\" value=\"`$preload-data.network-topology-information.subnets[$i].start-address`\" />\n\t<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$i].cidr-mask`\" />\n\t<parameter name=\"ip-version\" value=\"`$preload-data.network-topology-information.subnets[$i].ip-version`\" />\n\t<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-start-address`\" />\n\t<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-end-address`\" />\n\t<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\" />\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.return.generate-subnets-subnet-id.uuid\" >\n\t<!-- Create l3-network object -->\n\t<parameter name=\"network-id\" value=\"`$tmp.AnAI.l3network.network-id`\" />\n\t<parameter name=\"subnet-id\" value=\"`$tmp.return.generate-subnets-subnet-id.uuid`\" />\n\t<parameter name=\"gateway-address\" value=\"`$tmp.gateway-address`\" />\n\t<parameter name=\"subnet-name\" value=\"`$preload-data.network-topology-information.subnets[$i].subnet-name`\" />\t\t\n\t<parameter name=\"network-start-address\" value=\"`$preload-data.network-topology-information.subnets[$i].start-address`\" />\n\t<parameter name=\"cidr-mask\" value=\"`$preload-data.network-topology-information.subnets[$i].cidr-mask`\" />\n\t<parameter name=\"ip-version\" value=\"`$preload-data.network-topology-information.subnets[$i].ip-version`\" />\n\t<parameter name=\"dhcp-start\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-start-address`\" />\n\t<parameter name=\"dhcp-end\" value=\"`$preload-data.network-topology-information.subnets[$i].dhcp-end-address`\" />\n\t<parameter name=\"dhcp-enabled\" value=\"`$tmp.dhcpEnabled.boolean`\" />\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 1392.1628170013428,
@@ -1672,7 +1672,7 @@
"id": "e53a9499.9d4d28",
"type": "save",
"name": "update AnAI - l3-network.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-update\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-update\" />",
"comments": "",
"outputs": 1,
"x": 986.7340812683105,
@@ -1756,7 +1756,7 @@
"id": "7d587fe3.3f132",
"type": "save",
"name": "Rollback AnAI - l3-network.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.orchestration-status`\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.orchestration-status`\" />",
"comments": "",
"outputs": 1,
"x": 1280.6508178710938,
@@ -1828,7 +1828,7 @@
"id": "50318e70.387a9",
"type": "save",
"name": "delete relationship: vpn_binding",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\tAND related-to = vpn-binding\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\tAND related-to = vpn-binding\" >",
"comments": "",
"outputs": 1,
"x": 764.8055114746094,
@@ -1880,7 +1880,7 @@
"id": "d17665c3.e234d8",
"type": "save",
"name": "save relationship: vpn_bindings",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.vpn-binding-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.vpn-binding-id`\" />",
"comments": "",
"outputs": 1,
"x": 1557.5039176940918,
@@ -1958,7 +1958,7 @@
"id": "96fde5e9.4b32b8",
"type": "save",
"name": "query AnAI - vpn-bindings",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vpn-binding\" \n\t\tkey=\"vpn-binding.global-route-target = $preload-data.network-topology-information.vpn-bindings[$i].global-route-target\" \n\t\tpfx=\"tmp.AnAI.vpn-binding\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\" \n\t\tkey=\"vpn-binding.global-route-target = $preload-data.network-topology-information.vpn-bindings[$i].global-route-target\" \n\t\tpfx=\"tmp.AnAI.vpn-binding\">",
"comments": "",
"outputs": 1,
"x": 1808.5438596937393,
@@ -2251,7 +2251,7 @@
"id": "74c62ee.c142ad",
"type": "save",
"name": "save relationship: network-policy",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.network-policy.network-policy-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.network-policy.network-policy-id`\" />",
"comments": "",
"outputs": 1,
"x": 2095.9804649353027,
@@ -2301,7 +2301,7 @@
"id": "72405702.54bef8",
"type": "save",
"name": "query AnAI - network-policy",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"network-policy\" \n\t\tkey=\"network-policy.network-policy-fqdn = $preload-data.network-topology-information.network-policy[$i].network-policy-fqdn\" \n\t\tpfx=\"tmp.AnAI.network-policy\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\" \n\t\tkey=\"network-policy.network-policy-fqdn = $preload-data.network-topology-information.network-policy[$i].network-policy-fqdn\" \n\t\tpfx=\"tmp.AnAI.network-policy\" >",
"comments": "",
"outputs": 1,
"x": 1653.8297882080078,
@@ -2427,7 +2427,7 @@
"id": "85ca29b3.1bb488",
"type": "save",
"name": "delete relationship: network-policy",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t AND related-to = network-policy\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t AND related-to = network-policy\" >",
"comments": "",
"outputs": 1,
"x": 747.372989654541,
@@ -2851,7 +2851,7 @@
"id": "befdd7ed.7d6be8",
"type": "save",
"name": "Rollback to save relationship: vpn_binding",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-binding\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-binding.vpn-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
"comments": "",
"outputs": 1,
"x": 1294.21431350708,
@@ -2971,7 +2971,7 @@
"id": "a1822be9.e1be18",
"type": "save",
"name": "Rollback to save relationship: network-policy",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-policy\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-policy.network-policy-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
"comments": "",
"outputs": 1,
"x": 1309.16646194458,
@@ -3146,7 +3146,7 @@
"id": "74fc00ec.dc13f",
"type": "save",
"name": "Rollback AnAI delete - l3network.subnets.subnet",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.subnetRollback[$j].subnet-id\" >\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].orchestration-status`\" />\n\t\t",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.subnetRollback[$j].subnet-id\" >\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].orchestration-status`\" />\n\t\t",
"comments": "",
"outputs": 1,
"x": 1786.475700378418,
@@ -3179,7 +3179,7 @@
"id": "5e8f2f9e.a1436",
"type": "delete",
"name": "Rollback AnAI create - l3-network.subnets.subnet",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.subnetRollback[$j].subnet-id\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.subnetRollback[$j].subnet-id\" >",
"comments": "",
"outputs": 1,
"x": 1943.310344696045,
@@ -3244,7 +3244,7 @@
"id": "32bdc1c1.96f2ee",
"type": "save",
"name": "rollback AnAI update - l3-network.subnets.subnet ",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$j].subnet-id\" >\n<parameter name=\"subnet-name\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].subnet-name`\"/>\n<parameter name=\"gateway-address\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].gateway-address`\"/>\n<parameter name=\"cidr-mask\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].cidr-mask`\"/>\n<parameter name=\"dhcp-start\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-start`\"/>\n<parameter name=\"dhcp-end\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-end`\"/>\n<parameter name=\"dhcp-enabled\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-enabled`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].orchestration-status`\" />\n\t\t",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$j].subnet-id\" >\n<parameter name=\"subnet-name\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].subnet-name`\"/>\n<parameter name=\"gateway-address\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].gateway-address`\"/>\n<parameter name=\"cidr-mask\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].cidr-mask`\"/>\n<parameter name=\"dhcp-start\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-start`\"/>\n<parameter name=\"dhcp-end\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-end`\"/>\n<parameter name=\"dhcp-enabled\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].dhcp-enabled`\"/>\n<parameter name=\"orchestration-status\" value=\"`$tmp.AnAI.l3network.subnets.subnet[$i].orchestration-status`\" />\n\t\t",
"comments": "",
"outputs": 1,
"x": 1788.274269104004,
@@ -4471,7 +4471,7 @@
"id": "e761c57c.044408",
"type": "save",
"name": "save relationship: network-policy",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.route-table-reference.route-table-reference-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.route-table-reference.route-table-reference-id`\" />",
"comments": "",
"outputs": 1,
"x": 2229.8574409484863,
@@ -4521,7 +4521,7 @@
"id": "c3ff1f7e.223f6",
"type": "save",
"name": "query AnAI - route-table-reference",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"route-table-reference\" \n\t\tkey=\"route-table-reference.route-table-reference-fqdn = $preload-data.network-topology-information.route-table-reference[$i].route-table-reference-fqdn\" \n\t\tpfx=\"tmp.AnAI.route-table-reference\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"route-table-reference\" \n\t\tkey=\"route-table-reference.route-table-reference-fqdn = $preload-data.network-topology-information.route-table-reference[$i].route-table-reference-fqdn\" \n\t\tpfx=\"tmp.AnAI.route-table-reference\">",
"comments": "",
"outputs": 1,
"x": 1760.7067642211914,
@@ -4647,7 +4647,7 @@
"id": "c3dd4c7f.8ca1e",
"type": "save",
"name": "delete relationship: route-table-reference",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t AND related-to = route-table-reference\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id \n\t\t AND related-to = route-table-reference\" >",
"comments": "",
"outputs": 1,
"x": 751.2499656677246,
@@ -4900,7 +4900,7 @@
"id": "e64e8959.22cce8",
"type": "save",
"name": "Rollback to save relationship: route-table-reference",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network:relationship-list\" \n\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"route-table-reference\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"route-table-reference.route-table-reference-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.l3network.relationship-list.relationship[$z].relationship-data[0].relationship-value`\" />",
"comments": "",
"outputs": 1,
"x": 1304.368968963623,
@@ -5039,4 +5039,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json
index de7dc39c..d7bfdbdd 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json
@@ -46,7 +46,7 @@
"id": "7a75947e.dc19cc",
"type": "delete",
"name": "delete AnAI - l3-network",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $tmp.AnAI.l3network.network-id\" >",
"comments": "",
"outputs": 1,
"x": 1381.7546920776367,
@@ -106,7 +106,7 @@
"id": "28abb006.b3f25",
"type": "get-resource",
"name": "get AnAI - l3-network by network-name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $network-topology-operation-input.network-request-information.network-name\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $network-topology-operation-input.network-request-information.network-name\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1168.1371955871582,
@@ -124,7 +124,7 @@
"id": "6a7fc7cc.ee76d8",
"type": "get-resource",
"name": "get AnAI - l3-network by network-id",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 718.0410385131836,
@@ -379,7 +379,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 299.2754669189453,
"y": 47.142822265625,
@@ -421,4 +421,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json
index 0976a5e8..b48d882b 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json
@@ -1 +1 @@
-[{"id":"cc8952bd.01144","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$network-topology-operation-input.request-information.request-action`\">\n","comments":"","outputs":1,"x":372.8571472167969,"y":208.63279914855957,"z":"cf03aec.9922b5","wires":[["4c41531b.7bfc9c","e130a2cb.76694","77db12a6.c13bdc"]]},{"id":"4c41531b.7bfc9c","type":"other","name":"NetworkActivateRequest","xml":"<outcome value='NetworkActivateRequest'>","comments":"","outputs":1,"x":633.4604797363281,"y":207.8074131011963,"z":"cf03aec.9922b5","wires":[["3959ce4f.944012"]]},{"id":"86daa5ed.972558","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":155.53559112548828,"y":122.77776908874512,"z":"cf03aec.9922b5","wires":[["cc8952bd.01144"]]},{"id":"7d290301.28b16c","type":"method","name":"method network-topology-operation","xml":"<method rpc=\"network-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":217.09117889404297,"y":71.33332443237305,"z":"cf03aec.9922b5","wires":[["86daa5ed.972558"]]},{"id":"c478d676.6453f8","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":329.5356140136719,"y":20,"z":"cf03aec.9922b5","wires":[["7d290301.28b16c"]]},{"id":"c07c1301.4dfef","type":"dgstart","name":"DGSTART","outputs":1,"x":128.42449951171875,"y":20,"z":"cf03aec.9922b5","wires":[["c478d676.6453f8"]]},{"id":"fe0a67ff.83d1e8","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":1297.1108665466309,"y":703.3849267959595,"z":"cf03aec.9922b5","wires":[["588586d4.12fbc8"]]},{"id":"8c7a9569.d57008","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1276.9678535461426,"y":618.9527864456177,"z":"cf03aec.9922b5","wires":[["ead75f3a.51643"]]},{"id":"ead75f3a.51643","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action is not found'/>","comments":"","x":1432.3011054992676,"y":618.8099336624146,"z":"cf03aec.9922b5","wires":[]},{"id":"535fa224.5d6a7c","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":1277.3290367126465,"y":764.3809337615967,"z":"cf03aec.9922b5","wires":[["ae5d1f41.9b158"]]},{"id":"e130a2cb.76694","type":"other","name":"DisconnectNetworkRequest","xml":"<outcome value='DisconnectNetworkRequest'>","comments":"","outputs":1,"x":635.4273681640625,"y":804.8360719680786,"z":"cf03aec.9922b5","wires":[["36833426.9875fc"]]},{"id":"36833426.9875fc","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$network-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":1054.5842361450195,"y":804.6429119110107,"z":"cf03aec.9922b5","wires":[["9ce5608d.d74db","4585d7c1.f39d38","535fa224.5d6a7c"]]},{"id":"9ce5608d.d74db","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1274.7564392089844,"y":845.8952465057373,"z":"cf03aec.9922b5","wires":[["69ab51be.f77ab"]]},{"id":"4585d7c1.f39d38","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":1274.5265579223633,"y":805.2641544342041,"z":"cf03aec.9922b5","wires":[["6661afbb.fb47d"]]},{"id":"77db12a6.c13bdc","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":590.23779296875,"y":973.148886680603,"z":"cf03aec.9922b5","wires":[["64c62b7b.a65014"]]},{"id":"64c62b7b.a65014","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-action is not found'/>","comments":"","x":778.6143264770508,"y":972.8133153915405,"z":"cf03aec.9922b5","wires":[]},{"id":"aabe8f81.43c7f","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$network-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":1064.2219123840332,"y":619.3849020004272,"z":"cf03aec.9922b5","wires":[["8c7a9569.d57008","6e355467.bd533c","fe0a67ff.83d1e8","535fa224.5d6a7c"]]},{"id":"6e355467.bd533c","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":1275.9996490478516,"y":660.6071405410767,"z":"cf03aec.9922b5","wires":[["134ac69f.15aa29"]]},{"id":"134ac69f.15aa29","type":"call","name":"call network-topology-assign","xml":"<call module=\"VNF-API\" rpc=\"network-topology-assign\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1480.4442710876465,"y":660.2737684249878,"z":"cf03aec.9922b5","wires":[[]]},{"id":"588586d4.12fbc8","type":"call","name":"call network-topology-changeassign","xml":"<call module=\"VNF-API\" rpc=\"network-topology-changeassign\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1543.7774620056152,"y":703.2738027572632,"z":"cf03aec.9922b5","wires":[[]]},{"id":"6661afbb.fb47d","type":"call","name":"call network-topology-delete","xml":"<call module=\"VNF-API\" rpc=\"network-topology-delete\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1488.4402618408203,"y":805.0198135375977,"z":"cf03aec.9922b5","wires":[[]]},{"id":"ae5d1f41.9b158","type":"call","name":"call network-topology-rollback","xml":"<call module=\"VNF-API\" rpc=\"network-topology-rollback\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1495.1069526672363,"y":764.2698259353638,"z":"cf03aec.9922b5","wires":[[]]},{"id":"69ab51be.f77ab","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action is not found'/>","comments":"","x":1441.6623344421387,"y":846.2261772155762,"z":"cf03aec.9922b5","wires":[]},{"id":"657de4c7.50482c","type":"switchNode","name":"switch: INPUT tenant","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.tenant`\">","comments":"","outputs":1,"x":1074.3537902832031,"y":531.2381191253662,"z":"cf03aec.9922b5","wires":[["ccce555e.a5d1e8"]]},{"id":"8453258.a70d4d8","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1105.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[["4b54d3a.984b22c"]]},{"id":"4b54d3a.984b22c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1325.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[["57afe76d.be0978"]]},{"id":"57afe76d.be0978","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='aic-cloud-region is required.'/>","comments":"","x":1483.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[]},{"id":"7528b8c6.f78868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='tenant is required.'/>","comments":"","x":1422.0916442871094,"y":531.1388759613037,"z":"cf03aec.9922b5","wires":[]},{"id":"ccce555e.a5d1e8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1263.0916442871094,"y":531.1388759613037,"z":"cf03aec.9922b5","wires":[["7528b8c6.f78868"]]},{"id":"52e3c7a2.607c48","type":"switchNode","name":"switch: INPUT service-id","xml":"<switch test=\"`$network-topology-operation-input.service-information.service-id`\">","comments":"","outputs":1,"x":1084.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[["bc9b4f8e.0fd5f"]]},{"id":"bc9b4f8e.0fd5f","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1281.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[["dcd4ec18.41266"]]},{"id":"dcd4ec18.41266","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='service-id is required.'/>","comments":"","x":1439.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[]},{"id":"3959ce4f.944012","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":851.6071510314941,"y":207.21612358093262,"z":"cf03aec.9922b5","wires":[["8453258.a70d4d8","657de4c7.50482c","52e3c7a2.607c48","aabe8f81.43c7f","c6819f24.6143f","8b92cff3.8fb5c","d58471ed.067e"]]},{"id":"c6819f24.6143f","type":"switchNode","name":"switch test: INPUT network-name","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-name`\">","comments":"","outputs":1,"x":1108.9029693603516,"y":208.10726642608643,"z":"cf03aec.9922b5","wires":[["e79fabb5.3c1d58","68bd0f13.5871b"]]},{"id":"e79fabb5.3c1d58","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1334.3473663330078,"y":208.10725212097168,"z":"cf03aec.9922b5","wires":[["e298897.825df78"]]},{"id":"68bd0f13.5871b","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1334.1410446166992,"y":253.7580966949463,"z":"cf03aec.9922b5","wires":[["1123eaed.206925"]]},{"id":"e298897.825df78","type":"switchNode","name":"switch test: PRELOAD network-name","xml":"<switch test=\"`$preload-data.network-topology-information.network-topology-identifier.network-name`\">","comments":"","outputs":1,"x":1571.9707984924316,"y":208.3418140411377,"z":"cf03aec.9922b5","wires":[["75edc30c.2e5d1c","41291a34.1acd64"]]},{"id":"1123eaed.206925","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-name is required from input'/>","comments":"","x":1493.4188232421875,"y":253.6747341156006,"z":"cf03aec.9922b5","wires":[]},{"id":"75edc30c.2e5d1c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1827.7918701171875,"y":207.77392864227295,"z":"cf03aec.9922b5","wires":[["b37eb3cf.6ca5f"]]},{"id":"41291a34.1acd64","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1828.2521896362305,"y":249.3135986328125,"z":"cf03aec.9922b5","wires":[["de0d4c5.4679eb"]]},{"id":"b37eb3cf.6ca5f","type":"switchNode","name":"switch: network-name INPUT == PRELOAD","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-name == $preload-data.network-topology-information.network-topology-identifier.network-name`\">","comments":"","outputs":1,"x":2091.0494232177734,"y":208.468768119812,"z":"cf03aec.9922b5","wires":[["144a5081.bac47f"]]},{"id":"de0d4c5.4679eb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-name not found from preload-data'/>","comments":"","x":1989.7521286010742,"y":249.34133529663086,"z":"cf03aec.9922b5","wires":[]},{"id":"144a5081.bac47f","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2357.4586448669434,"y":207.77416324615479,"z":"cf03aec.9922b5","wires":[["86a746fe.7491e8"]]},{"id":"86a746fe.7491e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'No preload-data found to match input network-name = ' + $network-topology-operation-input.network-request-information.network-name`\"/>","comments":"","x":2525.014190673828,"y":207.10725212097168,"z":"cf03aec.9922b5","wires":[]},{"id":"8b92cff3.8fb5c","type":"switchNode","name":"switch test: INPUT network-type","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-type`\">","comments":"","outputs":1,"x":1110.0000610351562,"y":328.6327838897705,"z":"cf03aec.9922b5","wires":[["eb995458.ad64c8","eb85171a.141aa8"]]},{"id":"eb995458.ad64c8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1335.4444580078125,"y":328.63276958465576,"z":"cf03aec.9922b5","wires":[["d4b33de8.c3994"]]},{"id":"eb85171a.141aa8","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1335.238136291504,"y":374.28361415863037,"z":"cf03aec.9922b5","wires":[["510d46b5.7c8cc8"]]},{"id":"d4b33de8.c3994","type":"switchNode","name":"switch test: PRELOAD network-type","xml":"<switch test=\"`$preload-data.network-topology-information.network-topology-identifier.network-type`\">","comments":"","outputs":1,"x":1573.0678901672363,"y":328.8673315048218,"z":"cf03aec.9922b5","wires":[["79e007d7.cb0018","357acb99.e99cb4"]]},{"id":"510d46b5.7c8cc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-type is required from input'/>","comments":"","x":1494.5159149169922,"y":374.20025157928467,"z":"cf03aec.9922b5","wires":[]},{"id":"79e007d7.cb0018","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1828.8889617919922,"y":328.29944610595703,"z":"cf03aec.9922b5","wires":[["be09f603.e76d88"]]},{"id":"357acb99.e99cb4","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1829.3492813110352,"y":369.8391160964966,"z":"cf03aec.9922b5","wires":[["4d8c7f82.8fff1"]]},{"id":"be09f603.e76d88","type":"switchNode","name":"switch: network-type INPUT == PRELOAD","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-type == $preload-data.network-topology-information.network-topology-identifier.network-type`\">","comments":"","outputs":1,"x":2092.146514892578,"y":328.9942855834961,"z":"cf03aec.9922b5","wires":[["299c8dd.b652c72"]]},{"id":"4d8c7f82.8fff1","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-type not found from preload-data'/>","comments":"","x":1990.849220275879,"y":369.86685276031494,"z":"cf03aec.9922b5","wires":[]},{"id":"299c8dd.b652c72","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2358.555736541748,"y":328.29968070983887,"z":"cf03aec.9922b5","wires":[["da9775b6.375548"]]},{"id":"da9775b6.375548","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'No preload-data found to match input network-type = ' + $network-topology-operation-input.network-request-information.network-type`\"/>","comments":"","x":2526.111282348633,"y":327.63276958465576,"z":"cf03aec.9922b5","wires":[]},{"id":"d58471ed.067e","type":"switchNode","name":"switch: INPUT service-instance-id","xml":"<switch test=\"`$network-topology-operation-input.service-information.service-instance-id`\">","comments":"","outputs":1,"x":1112.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[["26657535.6feeaa"]]},{"id":"26657535.6feeaa","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1332.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[["3eb7a225.48f2be"]]},{"id":"3eb7a225.48f2be","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='service-instance-id is required.'/>","comments":"","x":1490.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[]}] \ No newline at end of file
+[{"id":"cc8952bd.01144","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$network-topology-operation-input.request-information.request-action`\">\n","comments":"","outputs":1,"x":372.8571472167969,"y":208.63279914855957,"z":"cf03aec.9922b5","wires":[["4c41531b.7bfc9c","e130a2cb.76694","77db12a6.c13bdc"]]},{"id":"4c41531b.7bfc9c","type":"other","name":"NetworkActivateRequest","xml":"<outcome value='NetworkActivateRequest'>","comments":"","outputs":1,"x":633.4604797363281,"y":207.8074131011963,"z":"cf03aec.9922b5","wires":[["3959ce4f.944012"]]},{"id":"86daa5ed.972558","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":155.53559112548828,"y":122.77776908874512,"z":"cf03aec.9922b5","wires":[["cc8952bd.01144"]]},{"id":"7d290301.28b16c","type":"method","name":"method network-topology-operation","xml":"<method rpc=\"network-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":217.09117889404297,"y":71.33332443237305,"z":"cf03aec.9922b5","wires":[["86daa5ed.972558"]]},{"id":"c478d676.6453f8","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":329.5356140136719,"y":20,"z":"cf03aec.9922b5","wires":[["7d290301.28b16c"]]},{"id":"c07c1301.4dfef","type":"dgstart","name":"DGSTART","outputs":1,"x":128.42449951171875,"y":20,"z":"cf03aec.9922b5","wires":[["c478d676.6453f8"]]},{"id":"fe0a67ff.83d1e8","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":1297.1108665466309,"y":703.3849267959595,"z":"cf03aec.9922b5","wires":[["588586d4.12fbc8"]]},{"id":"8c7a9569.d57008","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1276.9678535461426,"y":618.9527864456177,"z":"cf03aec.9922b5","wires":[["ead75f3a.51643"]]},{"id":"ead75f3a.51643","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action is not found'/>","comments":"","x":1432.3011054992676,"y":618.8099336624146,"z":"cf03aec.9922b5","wires":[]},{"id":"535fa224.5d6a7c","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":1277.3290367126465,"y":764.3809337615967,"z":"cf03aec.9922b5","wires":[["ae5d1f41.9b158"]]},{"id":"e130a2cb.76694","type":"other","name":"DisconnectNetworkRequest","xml":"<outcome value='DisconnectNetworkRequest'>","comments":"","outputs":1,"x":635.4273681640625,"y":804.8360719680786,"z":"cf03aec.9922b5","wires":[["36833426.9875fc"]]},{"id":"36833426.9875fc","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$network-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":1054.5842361450195,"y":804.6429119110107,"z":"cf03aec.9922b5","wires":[["9ce5608d.d74db","4585d7c1.f39d38","535fa224.5d6a7c"]]},{"id":"9ce5608d.d74db","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1274.7564392089844,"y":845.8952465057373,"z":"cf03aec.9922b5","wires":[["69ab51be.f77ab"]]},{"id":"4585d7c1.f39d38","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":1274.5265579223633,"y":805.2641544342041,"z":"cf03aec.9922b5","wires":[["6661afbb.fb47d"]]},{"id":"77db12a6.c13bdc","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":590.23779296875,"y":973.148886680603,"z":"cf03aec.9922b5","wires":[["64c62b7b.a65014"]]},{"id":"64c62b7b.a65014","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request-action is not found'/>","comments":"","x":778.6143264770508,"y":972.8133153915405,"z":"cf03aec.9922b5","wires":[]},{"id":"aabe8f81.43c7f","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$network-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":1064.2219123840332,"y":619.3849020004272,"z":"cf03aec.9922b5","wires":[["8c7a9569.d57008","6e355467.bd533c","fe0a67ff.83d1e8","535fa224.5d6a7c"]]},{"id":"6e355467.bd533c","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":1275.9996490478516,"y":660.6071405410767,"z":"cf03aec.9922b5","wires":[["134ac69f.15aa29"]]},{"id":"134ac69f.15aa29","type":"call","name":"call network-topology-assign","xml":"<call module=\"VNF-API\" rpc=\"network-topology-assign\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1480.4442710876465,"y":660.2737684249878,"z":"cf03aec.9922b5","wires":[[]]},{"id":"588586d4.12fbc8","type":"call","name":"call network-topology-changeassign","xml":"<call module=\"VNF-API\" rpc=\"network-topology-changeassign\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1543.7774620056152,"y":703.2738027572632,"z":"cf03aec.9922b5","wires":[[]]},{"id":"6661afbb.fb47d","type":"call","name":"call network-topology-delete","xml":"<call module=\"VNF-API\" rpc=\"network-topology-delete\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1488.4402618408203,"y":805.0198135375977,"z":"cf03aec.9922b5","wires":[[]]},{"id":"ae5d1f41.9b158","type":"call","name":"call network-topology-rollback","xml":"<call module=\"VNF-API\" rpc=\"network-topology-rollback\" mode=\"sync\" >\n","comments":"","outputs":1,"x":1495.1069526672363,"y":764.2698259353638,"z":"cf03aec.9922b5","wires":[[]]},{"id":"69ab51be.f77ab","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action is not found'/>","comments":"","x":1441.6623344421387,"y":846.2261772155762,"z":"cf03aec.9922b5","wires":[]},{"id":"657de4c7.50482c","type":"switchNode","name":"switch: INPUT tenant","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.tenant`\">","comments":"","outputs":1,"x":1074.3537902832031,"y":531.2381191253662,"z":"cf03aec.9922b5","wires":[["ccce555e.a5d1e8"]]},{"id":"8453258.a70d4d8","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1105.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[["4b54d3a.984b22c"]]},{"id":"4b54d3a.984b22c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1325.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[["57afe76d.be0978"]]},{"id":"57afe76d.be0978","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='aic-cloud-region is required.'/>","comments":"","x":1483.0916442871094,"y":488.1388759613037,"z":"cf03aec.9922b5","wires":[]},{"id":"7528b8c6.f78868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='tenant is required.'/>","comments":"","x":1422.0916442871094,"y":531.1388759613037,"z":"cf03aec.9922b5","wires":[]},{"id":"ccce555e.a5d1e8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1263.0916442871094,"y":531.1388759613037,"z":"cf03aec.9922b5","wires":[["7528b8c6.f78868"]]},{"id":"52e3c7a2.607c48","type":"switchNode","name":"switch: INPUT service-id","xml":"<switch test=\"`$network-topology-operation-input.service-information.service-id`\">","comments":"","outputs":1,"x":1084.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[["bc9b4f8e.0fd5f"]]},{"id":"bc9b4f8e.0fd5f","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1281.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[["dcd4ec18.41266"]]},{"id":"dcd4ec18.41266","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='service-id is required.'/>","comments":"","x":1439.4687805175781,"y":575.250020980835,"z":"cf03aec.9922b5","wires":[]},{"id":"3959ce4f.944012","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":851.6071510314941,"y":207.21612358093262,"z":"cf03aec.9922b5","wires":[["8453258.a70d4d8","657de4c7.50482c","52e3c7a2.607c48","aabe8f81.43c7f","c6819f24.6143f","8b92cff3.8fb5c","d58471ed.067e"]]},{"id":"c6819f24.6143f","type":"switchNode","name":"switch test: INPUT network-name","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-name`\">","comments":"","outputs":1,"x":1108.9029693603516,"y":208.10726642608643,"z":"cf03aec.9922b5","wires":[["e79fabb5.3c1d58","68bd0f13.5871b"]]},{"id":"e79fabb5.3c1d58","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1334.3473663330078,"y":208.10725212097168,"z":"cf03aec.9922b5","wires":[["e298897.825df78"]]},{"id":"68bd0f13.5871b","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1334.1410446166992,"y":253.7580966949463,"z":"cf03aec.9922b5","wires":[["1123eaed.206925"]]},{"id":"e298897.825df78","type":"switchNode","name":"switch test: PRELOAD network-name","xml":"<switch test=\"`$preload-data.network-topology-information.network-topology-identifier.network-name`\">","comments":"","outputs":1,"x":1571.9707984924316,"y":208.3418140411377,"z":"cf03aec.9922b5","wires":[["75edc30c.2e5d1c","41291a34.1acd64"]]},{"id":"1123eaed.206925","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-name is required from input'/>","comments":"","x":1493.4188232421875,"y":253.6747341156006,"z":"cf03aec.9922b5","wires":[]},{"id":"75edc30c.2e5d1c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1827.7918701171875,"y":207.77392864227295,"z":"cf03aec.9922b5","wires":[["b37eb3cf.6ca5f"]]},{"id":"41291a34.1acd64","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1828.2521896362305,"y":249.3135986328125,"z":"cf03aec.9922b5","wires":[["de0d4c5.4679eb"]]},{"id":"b37eb3cf.6ca5f","type":"switchNode","name":"switch: network-name INPUT == PRELOAD","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-name == $preload-data.network-topology-information.network-topology-identifier.network-name`\">","comments":"","outputs":1,"x":2091.0494232177734,"y":208.468768119812,"z":"cf03aec.9922b5","wires":[["144a5081.bac47f"]]},{"id":"de0d4c5.4679eb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-name not found from preload-data'/>","comments":"","x":1989.7521286010742,"y":249.34133529663086,"z":"cf03aec.9922b5","wires":[]},{"id":"144a5081.bac47f","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2357.4586448669434,"y":207.77416324615479,"z":"cf03aec.9922b5","wires":[["86a746fe.7491e8"]]},{"id":"86a746fe.7491e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'No preload-data found to match input network-name = ' + $network-topology-operation-input.network-request-information.network-name`\"/>","comments":"","x":2525.014190673828,"y":207.10725212097168,"z":"cf03aec.9922b5","wires":[]},{"id":"8b92cff3.8fb5c","type":"switchNode","name":"switch test: INPUT network-type","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-type`\">","comments":"","outputs":1,"x":1110.0000610351562,"y":328.6327838897705,"z":"cf03aec.9922b5","wires":[["eb995458.ad64c8","eb85171a.141aa8"]]},{"id":"eb995458.ad64c8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1335.4444580078125,"y":328.63276958465576,"z":"cf03aec.9922b5","wires":[["d4b33de8.c3994"]]},{"id":"eb85171a.141aa8","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1335.238136291504,"y":374.28361415863037,"z":"cf03aec.9922b5","wires":[["510d46b5.7c8cc8"]]},{"id":"d4b33de8.c3994","type":"switchNode","name":"switch test: PRELOAD network-type","xml":"<switch test=\"`$preload-data.network-topology-information.network-topology-identifier.network-type`\">","comments":"","outputs":1,"x":1573.0678901672363,"y":328.8673315048218,"z":"cf03aec.9922b5","wires":[["79e007d7.cb0018","357acb99.e99cb4"]]},{"id":"510d46b5.7c8cc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-type is required from input'/>","comments":"","x":1494.5159149169922,"y":374.20025157928467,"z":"cf03aec.9922b5","wires":[]},{"id":"79e007d7.cb0018","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1828.8889617919922,"y":328.29944610595703,"z":"cf03aec.9922b5","wires":[["be09f603.e76d88"]]},{"id":"357acb99.e99cb4","type":"other","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1829.3492813110352,"y":369.8391160964966,"z":"cf03aec.9922b5","wires":[["4d8c7f82.8fff1"]]},{"id":"be09f603.e76d88","type":"switchNode","name":"switch: network-type INPUT == PRELOAD","xml":"<switch test=\"`$network-topology-operation-input.network-request-information.network-type == $preload-data.network-topology-information.network-topology-identifier.network-type`\">","comments":"","outputs":1,"x":2092.146514892578,"y":328.9942855834961,"z":"cf03aec.9922b5","wires":[["299c8dd.b652c72"]]},{"id":"4d8c7f82.8fff1","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='network-type not found from preload-data'/>","comments":"","x":1990.849220275879,"y":369.86685276031494,"z":"cf03aec.9922b5","wires":[]},{"id":"299c8dd.b652c72","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2358.555736541748,"y":328.29968070983887,"z":"cf03aec.9922b5","wires":[["da9775b6.375548"]]},{"id":"da9775b6.375548","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'No preload-data found to match input network-type = ' + $network-topology-operation-input.network-request-information.network-type`\"/>","comments":"","x":2526.111282348633,"y":327.63276958465576,"z":"cf03aec.9922b5","wires":[]},{"id":"d58471ed.067e","type":"switchNode","name":"switch: INPUT service-instance-id","xml":"<switch test=\"`$network-topology-operation-input.service-information.service-instance-id`\">","comments":"","outputs":1,"x":1112.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[["26657535.6feeaa"]]},{"id":"26657535.6feeaa","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1332.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[["3eb7a225.48f2be"]]},{"id":"3eb7a225.48f2be","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='service-instance-id is required.'/>","comments":"","x":1490.8571472167969,"y":437.1428699493408,"z":"cf03aec.9922b5","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json
index 19259515..60c4b0fe 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json
@@ -115,7 +115,7 @@
"id": "d63de22c.d6ac3",
"type": "save",
"name": "update AnAI: l3-network.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
"comments": "",
"outputs": 1,
"x": 1029.535385131836,
@@ -313,7 +313,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 308.79766845703125,
"y": 48.480201721191406,
@@ -342,7 +342,7 @@
"id": "34867ac.18cfc86",
"type": "get-resource",
"name": "get AnAI - l3-network by network-id",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 453.4643249511719,
@@ -386,7 +386,7 @@
"id": "262c9783.799c48",
"type": "save",
"name": "update AnAI - subnet.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$i].subnet-id\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />\n\t\t",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$i].subnet-id\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />\n\t\t",
"comments": "",
"outputs": 1,
"x": 1862.6230087280273,
@@ -402,7 +402,7 @@
"id": "d89faa07.866668",
"type": "delete",
"name": "delete AnAI - l3-network",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >",
"comments": "",
"outputs": 1,
"x": 968.1071929931641,
@@ -445,7 +445,7 @@
"id": "4b483612.3e69e8",
"type": "delete",
"name": "delete l3-network.subnet",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$i].subnet-id\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"subnet\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id \n\t\t\tAND subnet.subnet-id = $tmp.AnAI.l3network.subnets.subnet[$i].subnet-id\" >",
"comments": "",
"outputs": 1,
"x": 1808.6865310668945,
@@ -461,7 +461,7 @@
"id": "b17a76ed.0f85b8",
"type": "save",
"name": "update AnAI - l3-network.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $network-topology-operation-input.network-request-information.network-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
"comments": "",
"outputs": 1,
"x": 1219.020034790039,
@@ -572,4 +572,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json
index 8693a18f..06794234 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json
@@ -1 +1 @@
-[{"id":"f52d4cf4.25d3f","type":"dgstart","name":"DGSTART","outputs":1,"x":182.85714721679688,"y":88.57142639160156,"z":"7cd51ac5.0ee414","wires":[["e4785cdc.f593f"]]},{"id":"e4785cdc.f593f","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":215.85716247558594,"y":139.68252563476562,"z":"7cd51ac5.0ee414","wires":[["29605b3a.00ad24"]]},{"id":"29605b3a.00ad24","type":"method","name":"preload-network-topology-operation","xml":"<method rpc=\"preload-network-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":296.52381896972656,"y":217.0158519744873,"z":"7cd51ac5.0ee414","wires":[["2f66e3d0.99841c"]]},{"id":"2f66e3d0.99841c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":231.079345703125,"y":338.2380828857422,"z":"7cd51ac5.0ee414","wires":[["52294c1e.1dd794"]]},{"id":"5dc20ae6.6f9ae4","type":"comment","name":"preload-network-topology-operation","info":"","comments":"","x":764.5693168640137,"y":95.33911037445068,"z":"7cd51ac5.0ee414","wires":[]},{"id":"790af37e.78cc8c","type":"comment","name":"request-action = PreloadNetworkRequest, svc-action = reserve","info":"","comments":"","x":773.3571434020996,"y":133.01587295532227,"z":"7cd51ac5.0ee414","wires":[]},{"id":"52294c1e.1dd794","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-network-topology-operation-input.request-information.request-action`\">\n","comments":"","outputs":1,"x":497.8571472167969,"y":358.339111328125,"z":"7cd51ac5.0ee414","wires":[["db22adff.36335","6ec5a1af.35451","ff3b1c67.7a25e"]]},{"id":"db22adff.36335","type":"other","name":"PreloadNetworkRequest","xml":"<outcome value='PreloadNetworkRequest'>","comments":"","outputs":1,"x":725.8571472167969,"y":359.339111328125,"z":"7cd51ac5.0ee414","wires":[["d64506b6.031b58"]]},{"id":"6ec5a1af.35451","type":"other","name":"DeletePreloadNetworkRequest","xml":"<outcome value='DeletePreloadNetworkRequest'>","comments":"","outputs":1,"x":738.8571472167969,"y":628.339111328125,"z":"7cd51ac5.0ee414","wires":[["87952e61.63dc8"]]},{"id":"787d89f8.d6f8c8","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1205.9683151245117,"y":629.0058326721191,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"4a24898e.fdd898","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1189.8572082519531,"y":710.3391132354736,"z":"7cd51ac5.0ee414","wires":[]},{"id":"ff3b1c67.7a25e","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":706.8571472167969,"y":748.339111328125,"z":"7cd51ac5.0ee414","wires":[["77675a88.cd35b4"]]},{"id":"77675a88.cd35b4","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-network-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":948.9392623901367,"y":749.0246486663818,"z":"7cd51ac5.0ee414","wires":[]},{"id":"d64506b6.031b58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":965.8571472167969,"y":358.339111328125,"z":"7cd51ac5.0ee414","wires":[["a398e9e4.8d7a38","e4652a21.9cd618","e616ae08.47d6b","4247b32b.85a4cc","9719f83c.615828"]]},{"id":"4247b32b.85a4cc","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1200.6786499023438,"y":529.7240610122681,"z":"7cd51ac5.0ee414","wires":[]},{"id":"e616ae08.47d6b","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1274.3533210754395,"y":442.7321243286133,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"a398e9e4.8d7a38","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1222.5874786376953,"y":487.5257034301758,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"e4652a21.9cd618","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-network-topology-operation-input.\" />\n","comments":"","x":1232.158863067627,"y":398.94419956207275,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"87952e61.63dc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":977.8571472167969,"y":629.339111328125,"z":"7cd51ac5.0ee414","wires":[["787d89f8.d6f8c8","4a24898e.fdd898","20ea8ce6.d4b434"]]},{"id":"e53a497e.ccc4a8","type":"comment","name":"request-action = DeletePreloadNetworkRequest, svc-action = delete","info":"","comments":"","x":781.8571472167969,"y":170.339111328125,"z":"7cd51ac5.0ee414","wires":[]},{"id":"9719f83c.615828","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1214.1072463989258,"y":358.0356864929199,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"20ea8ce6.d4b434","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1211.7142868041992,"y":669.2857131958008,"z":"7cd51ac5.0ee414","wires":[[]]}] \ No newline at end of file
+[{"id":"f52d4cf4.25d3f","type":"dgstart","name":"DGSTART","outputs":1,"x":182.85714721679688,"y":88.57142639160156,"z":"7cd51ac5.0ee414","wires":[["e4785cdc.f593f"]]},{"id":"e4785cdc.f593f","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":215.85716247558594,"y":139.68252563476562,"z":"7cd51ac5.0ee414","wires":[["29605b3a.00ad24"]]},{"id":"29605b3a.00ad24","type":"method","name":"preload-network-topology-operation","xml":"<method rpc=\"preload-network-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":296.52381896972656,"y":217.0158519744873,"z":"7cd51ac5.0ee414","wires":[["2f66e3d0.99841c"]]},{"id":"2f66e3d0.99841c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":231.079345703125,"y":338.2380828857422,"z":"7cd51ac5.0ee414","wires":[["52294c1e.1dd794"]]},{"id":"5dc20ae6.6f9ae4","type":"comment","name":"preload-network-topology-operation","info":"","comments":"","x":764.5693168640137,"y":95.33911037445068,"z":"7cd51ac5.0ee414","wires":[]},{"id":"790af37e.78cc8c","type":"comment","name":"request-action = PreloadNetworkRequest, svc-action = reserve","info":"","comments":"","x":773.3571434020996,"y":133.01587295532227,"z":"7cd51ac5.0ee414","wires":[]},{"id":"52294c1e.1dd794","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-network-topology-operation-input.request-information.request-action`\">\n","comments":"","outputs":1,"x":497.8571472167969,"y":358.339111328125,"z":"7cd51ac5.0ee414","wires":[["db22adff.36335","6ec5a1af.35451","ff3b1c67.7a25e"]]},{"id":"db22adff.36335","type":"other","name":"PreloadNetworkRequest","xml":"<outcome value='PreloadNetworkRequest'>","comments":"","outputs":1,"x":725.8571472167969,"y":359.339111328125,"z":"7cd51ac5.0ee414","wires":[["d64506b6.031b58"]]},{"id":"6ec5a1af.35451","type":"other","name":"DeletePreloadNetworkRequest","xml":"<outcome value='DeletePreloadNetworkRequest'>","comments":"","outputs":1,"x":738.8571472167969,"y":628.339111328125,"z":"7cd51ac5.0ee414","wires":[["87952e61.63dc8"]]},{"id":"787d89f8.d6f8c8","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1205.9683151245117,"y":629.0058326721191,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"4a24898e.fdd898","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1189.8572082519531,"y":710.3391132354736,"z":"7cd51ac5.0ee414","wires":[]},{"id":"ff3b1c67.7a25e","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":706.8571472167969,"y":748.339111328125,"z":"7cd51ac5.0ee414","wires":[["77675a88.cd35b4"]]},{"id":"77675a88.cd35b4","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-network-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":948.9392623901367,"y":749.0246486663818,"z":"7cd51ac5.0ee414","wires":[]},{"id":"d64506b6.031b58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":965.8571472167969,"y":358.339111328125,"z":"7cd51ac5.0ee414","wires":[["a398e9e4.8d7a38","e4652a21.9cd618","e616ae08.47d6b","4247b32b.85a4cc","9719f83c.615828"]]},{"id":"4247b32b.85a4cc","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1200.6786499023438,"y":529.7240610122681,"z":"7cd51ac5.0ee414","wires":[]},{"id":"e616ae08.47d6b","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1274.3533210754395,"y":442.7321243286133,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"a398e9e4.8d7a38","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1222.5874786376953,"y":487.5257034301758,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"e4652a21.9cd618","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-network-topology-operation-input.\" />\n","comments":"","x":1232.158863067627,"y":398.94419956207275,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"87952e61.63dc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":977.8571472167969,"y":629.339111328125,"z":"7cd51ac5.0ee414","wires":[["787d89f8.d6f8c8","4a24898e.fdd898","20ea8ce6.d4b434"]]},{"id":"e53a497e.ccc4a8","type":"comment","name":"request-action = DeletePreloadNetworkRequest, svc-action = delete","info":"","comments":"","x":781.8571472167969,"y":170.339111328125,"z":"7cd51ac5.0ee414","wires":[]},{"id":"9719f83c.615828","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1214.1072463989258,"y":358.0356864929199,"z":"7cd51ac5.0ee414","wires":[[]]},{"id":"20ea8ce6.d4b434","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1211.7142868041992,"y":669.2857131958008,"z":"7cd51ac5.0ee414","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json
index 64238a53..c30c92f1 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json
@@ -1 +1 @@
-[{"id":"d2cea9e2.1fdc78","type":"dgstart","name":"DGSTART","outputs":1,"x":135.71429443359375,"y":102.85714721679688,"z":"9b38888e.2edc68","wires":[["a67d94b9.dd3888"]]},{"id":"a67d94b9.dd3888","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":168.7143096923828,"y":153.96824645996094,"z":"9b38888e.2edc68","wires":[["70ca3740.839b38"]]},{"id":"70ca3740.839b38","type":"method","name":"preload-vf-module-topology-operation","xml":"<method rpc=\"preload-vf-module-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":256.0476379394531,"y":199.079345703125,"z":"9b38888e.2edc68","wires":[["f38d7271.b1bad"]]},{"id":"f38d7271.b1bad","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":238.2221908569336,"y":259.66666412353516,"z":"9b38888e.2edc68","wires":[["b003587f.590da8"]]},{"id":"b003587f.590da8","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vf-module-topology-operation-input.request-information.request-action`\">\n\n","comments":"","outputs":1,"x":473.57139587402344,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["c28f1e55.dce72","5b6a1c71.3ecc64","ad9bcdf5.5fbaa"]]},{"id":"c28f1e55.dce72","type":"other","name":"PreloadVfModuleRequest","xml":"<outcome value='PreloadVfModuleRequest'>","comments":"","outputs":1,"x":729.5713958740234,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["7cee46a7.2c1b98"]]},{"id":"5b6a1c71.3ecc64","type":"other","name":"DeletePreloadVfModuleRequest","xml":"<outcome value='DeletePreloadVfModuleRequest'>","comments":"","outputs":1,"x":745.8570098876953,"y":525.6962842941284,"z":"9b38888e.2edc68","wires":[["ada7947d.7e5ed8"]]},{"id":"44ee2d8.e4dbcd4","type":"set","name":"Delete vf-module-preload-data","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"\" />\n","comments":"","x":1261.1070709228516,"y":525.4463138580322,"z":"9b38888e.2edc68","wires":[]},{"id":"ad9bcdf5.5fbaa","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":684.1427307128906,"y":644.6962747573853,"z":"9b38888e.2edc68","wires":[["7e2bfb9e.53fef4"]]},{"id":"7e2bfb9e.53fef4","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value=\"`'Invalid Request, ' + $preload-vf-module-topology-operation-input.request-information.request-action`\"/>\n\n \n","comments":"","x":932.0819244384766,"y":645.0167264938354,"z":"9b38888e.2edc68","wires":[]},{"id":"7cee46a7.2c1b98","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":970.5713958740234,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["14e44ca1.dac4d3","d9d4f8e7.cb22b8","7176e99a.abbfc8","9914570a.6811f8","ce6fc41b.78e588"]]},{"id":"bb6a127d.cef8b","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1350.5714416503906,"y":642.1606178283691,"z":"9b38888e.2edc68","wires":[]},{"id":"7176e99a.abbfc8","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"vf-module-preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1283.5953521728516,"y":439.1051263809204,"z":"9b38888e.2edc68","wires":[]},{"id":"b3b7a80f.2755f8","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1371.4802551269531,"y":599.1687049865723,"z":"9b38888e.2edc68","wires":[]},{"id":"14e44ca1.dac4d3","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"vnf-profile\" key=\"SELECT * from VNF_PROFILE where vnf_type = $preload-vf-module-topology-operation-input.vf-module-topology-information.vf-module-identifiers.vf-module-model-id\">\n","comments":"","outputs":1,"x":1262.0914459228516,"y":304.93456268310547,"z":"9b38888e.2edc68","wires":[["e81e4681.2cd218","47e205dc.4d75fc"]]},{"id":"c6977735.6f78c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"404\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-model-id not found. New vnf-model-id can be added via admin portal\" />","comments":"","x":1752.4246368408203,"y":304.15673065185547,"z":"9b38888e.2edc68","wires":[]},{"id":"e81e4681.2cd218","type":"success","name":"not found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1539.0913848876953,"y":304.71227264404297,"z":"9b38888e.2edc68","wires":[["c6977735.6f78c8"]]},{"id":"d9d4f8e7.cb22b8","type":"set","name":"set: vf-module-preload-data += input","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"preload-vf-module-topology-operation-input.\" />\n","comments":"","x":1276.761978149414,"y":393.40056705474854,"z":"9b38888e.2edc68","wires":[]},{"id":"47e205dc.4d75fc","type":"success","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1531.3690948486328,"y":346.2577438354492,"z":"9b38888e.2edc68","wires":[["c6977735.6f78c8"]]},{"id":"ada7947d.7e5ed8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":997.6070098876953,"y":525.6962833404541,"z":"9b38888e.2edc68","wires":[["44ee2d8.e4dbcd4","ce6fc41b.78e588"]]},{"id":"9914570a.6811f8","type":"set","name":"Delete vf-module-preload-data","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"\" />\n","comments":"","x":1255.785659790039,"y":349.82149505615234,"z":"9b38888e.2edc68","wires":[]},{"id":"ce6fc41b.78e588","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1182.250015258789,"y":599.9286470413208,"z":"9b38888e.2edc68","wires":[["b3b7a80f.2755f8","bb6a127d.cef8b"]]}] \ No newline at end of file
+[{"id":"d2cea9e2.1fdc78","type":"dgstart","name":"DGSTART","outputs":1,"x":135.71429443359375,"y":102.85714721679688,"z":"9b38888e.2edc68","wires":[["a67d94b9.dd3888"]]},{"id":"a67d94b9.dd3888","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":168.7143096923828,"y":153.96824645996094,"z":"9b38888e.2edc68","wires":[["70ca3740.839b38"]]},{"id":"70ca3740.839b38","type":"method","name":"preload-vf-module-topology-operation","xml":"<method rpc=\"preload-vf-module-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":256.0476379394531,"y":199.079345703125,"z":"9b38888e.2edc68","wires":[["f38d7271.b1bad"]]},{"id":"f38d7271.b1bad","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":238.2221908569336,"y":259.66666412353516,"z":"9b38888e.2edc68","wires":[["b003587f.590da8"]]},{"id":"b003587f.590da8","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vf-module-topology-operation-input.request-information.request-action`\">\n\n","comments":"","outputs":1,"x":473.57139587402344,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["c28f1e55.dce72","5b6a1c71.3ecc64","ad9bcdf5.5fbaa"]]},{"id":"c28f1e55.dce72","type":"other","name":"PreloadVfModuleRequest","xml":"<outcome value='PreloadVfModuleRequest'>","comments":"","outputs":1,"x":729.5713958740234,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["7cee46a7.2c1b98"]]},{"id":"5b6a1c71.3ecc64","type":"other","name":"DeletePreloadVfModuleRequest","xml":"<outcome value='DeletePreloadVfModuleRequest'>","comments":"","outputs":1,"x":745.8570098876953,"y":525.6962842941284,"z":"9b38888e.2edc68","wires":[["ada7947d.7e5ed8"]]},{"id":"44ee2d8.e4dbcd4","type":"set","name":"Delete vf-module-preload-data","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"\" />\n","comments":"","x":1261.1070709228516,"y":525.4463138580322,"z":"9b38888e.2edc68","wires":[]},{"id":"ad9bcdf5.5fbaa","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":684.1427307128906,"y":644.6962747573853,"z":"9b38888e.2edc68","wires":[["7e2bfb9e.53fef4"]]},{"id":"7e2bfb9e.53fef4","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value=\"`'Invalid Request, ' + $preload-vf-module-topology-operation-input.request-information.request-action`\"/>\n\n \n","comments":"","x":932.0819244384766,"y":645.0167264938354,"z":"9b38888e.2edc68","wires":[]},{"id":"7cee46a7.2c1b98","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":970.5713958740234,"y":304.48198413848877,"z":"9b38888e.2edc68","wires":[["14e44ca1.dac4d3","d9d4f8e7.cb22b8","7176e99a.abbfc8","9914570a.6811f8","ce6fc41b.78e588"]]},{"id":"bb6a127d.cef8b","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1350.5714416503906,"y":642.1606178283691,"z":"9b38888e.2edc68","wires":[]},{"id":"7176e99a.abbfc8","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"vf-module-preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1283.5953521728516,"y":439.1051263809204,"z":"9b38888e.2edc68","wires":[]},{"id":"b3b7a80f.2755f8","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1371.4802551269531,"y":599.1687049865723,"z":"9b38888e.2edc68","wires":[]},{"id":"14e44ca1.dac4d3","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" \n\tresource=\"vnf-profile\" key=\"SELECT * from VNF_PROFILE where vnf_type = $preload-vf-module-topology-operation-input.vf-module-topology-information.vf-module-identifiers.vf-module-model-id\">\n","comments":"","outputs":1,"x":1262.0914459228516,"y":304.93456268310547,"z":"9b38888e.2edc68","wires":[["e81e4681.2cd218","47e205dc.4d75fc"]]},{"id":"c6977735.6f78c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"404\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-model-id not found. New vnf-model-id can be added via admin portal\" />","comments":"","x":1752.4246368408203,"y":304.15673065185547,"z":"9b38888e.2edc68","wires":[]},{"id":"e81e4681.2cd218","type":"success","name":"not found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1539.0913848876953,"y":304.71227264404297,"z":"9b38888e.2edc68","wires":[["c6977735.6f78c8"]]},{"id":"d9d4f8e7.cb22b8","type":"set","name":"set: vf-module-preload-data += input","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"preload-vf-module-topology-operation-input.\" />\n","comments":"","x":1276.761978149414,"y":393.40056705474854,"z":"9b38888e.2edc68","wires":[]},{"id":"47e205dc.4d75fc","type":"success","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1531.3690948486328,"y":346.2577438354492,"z":"9b38888e.2edc68","wires":[["c6977735.6f78c8"]]},{"id":"ada7947d.7e5ed8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":997.6070098876953,"y":525.6962833404541,"z":"9b38888e.2edc68","wires":[["44ee2d8.e4dbcd4","ce6fc41b.78e588"]]},{"id":"9914570a.6811f8","type":"set","name":"Delete vf-module-preload-data","xml":"<set>\n<parameter name=\"vf-module-preload-data.\" value=\"\" />\n","comments":"","x":1255.785659790039,"y":349.82149505615234,"z":"9b38888e.2edc68","wires":[]},{"id":"ce6fc41b.78e588","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1182.250015258789,"y":599.9286470413208,"z":"9b38888e.2edc68","wires":[["b3b7a80f.2755f8","bb6a127d.cef8b"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json
index a83bf743..5b5d4d92 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json
@@ -1 +1 @@
-[{"id":"acb78607.669d98","type":"dgstart","name":"DGSTART","outputs":1,"x":174.2857208251953,"y":107.14286041259766,"z":"8933f47c.8eca28","wires":[["1d5dd029.fdeb2"]]},{"id":"1d5dd029.fdeb2","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":207.28573608398438,"y":158.25395965576172,"z":"8933f47c.8eca28","wires":[["d17b44c2.cdd0f8"]]},{"id":"d17b44c2.cdd0f8","type":"method","name":"preload-vnf-instance-topology-operation","xml":"<method rpc=\"preload-vnf-instance-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":294.6190643310547,"y":203.36505889892578,"z":"8933f47c.8eca28","wires":[["15e09d37.0dd353"]]},{"id":"15e09d37.0dd353","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":276.79361724853516,"y":263.95237731933594,"z":"8933f47c.8eca28","wires":[["e7a7dbc2.f05948"]]},{"id":"e7a7dbc2.f05948","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-instance-topology-operation-input.request-information.request-action`\">\n\n","comments":"","outputs":1,"x":512.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["10b04798.1315a8","2fb0d9fd.987eb6","5221dded.ffd334"]]},{"id":"10b04798.1315a8","type":"other","name":"PreloadVnfInstanceRequest","xml":"<outcome value='PreloadVnfInstanceRequest'>","comments":"","outputs":1,"x":774.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["c7936654.a5eee8"]]},{"id":"2fb0d9fd.987eb6","type":"other","name":"DeletePreloadVnfInstanceRequest","xml":"<outcome value='DeletePreloadVnfInstanceRequest'>","comments":"","outputs":1,"x":793.4284362792969,"y":529.9819974899292,"z":"8933f47c.8eca28","wires":[["ba7d7b73.a72568"]]},{"id":"804376ed.19eab8","type":"set","name":"Delete vnf-instance-preload-data","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"\" />\n","comments":"","x":1309.6784973144531,"y":529.732027053833,"z":"8933f47c.8eca28","wires":[]},{"id":"5221dded.ffd334","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":722.7141571044922,"y":648.981987953186,"z":"8933f47c.8eca28","wires":[["11a3d982.d1fa06"]]},{"id":"11a3d982.d1fa06","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-instance-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":980.6533508300781,"y":649.3024396896362,"z":"8933f47c.8eca28","wires":[]},{"id":"c7936654.a5eee8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1019.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["7288864f.4ca648","add8c4fe.ffd258","55c30909.4c2f38","729a6f33.9aa24","61b570ed.ef516"]]},{"id":"b9a99e15.45ee4","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1399.1428680419922,"y":646.4463310241699,"z":"8933f47c.8eca28","wires":[]},{"id":"55c30909.4c2f38","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"vnf-instance-preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1332.1667785644531,"y":443.3908395767212,"z":"8933f47c.8eca28","wires":[]},{"id":"eb852ae1.437ce8","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1420.0516815185547,"y":603.454418182373,"z":"8933f47c.8eca28","wires":[]},{"id":"7288864f.4ca648","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"vnf-profile\" key=\"SELECT * from VNF_PROFILE where vnf_type = $preload-vnf-instance-topology-operation-input.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id\">\n","comments":"","outputs":1,"x":1310.6628723144531,"y":309.22027587890625,"z":"8933f47c.8eca28","wires":[["4464022f.8d1b5c","a85fb482.a59958"]]},{"id":"1181ba91.3da815","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"404\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-model-id not found. New vnf-model-id can be added via admin portal\" />","comments":"","x":1800.9960632324219,"y":308.44244384765625,"z":"8933f47c.8eca28","wires":[]},{"id":"4464022f.8d1b5c","type":"success","name":"not found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1587.6628112792969,"y":308.99798583984375,"z":"8933f47c.8eca28","wires":[["1181ba91.3da815"]]},{"id":"add8c4fe.ffd258","type":"set","name":"set: vnf-instance-preload-data += input","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"preload-vnf-instance-topology-operation-input.\" />\n","comments":"","x":1330.3334045410156,"y":397.6862802505493,"z":"8933f47c.8eca28","wires":[]},{"id":"a85fb482.a59958","type":"success","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1579.9405212402344,"y":350.54345703125,"z":"8933f47c.8eca28","wires":[["1181ba91.3da815"]]},{"id":"ba7d7b73.a72568","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1046.1784362792969,"y":529.9819965362549,"z":"8933f47c.8eca28","wires":[["804376ed.19eab8","61b570ed.ef516"]]},{"id":"729a6f33.9aa24","type":"set","name":"Delete vnf-instance-preload-data","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"\" />\n","comments":"","x":1312.3570861816406,"y":354.1072082519531,"z":"8933f47c.8eca28","wires":[]},{"id":"61b570ed.ef516","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1230.8214416503906,"y":604.2143602371216,"z":"8933f47c.8eca28","wires":[["eb852ae1.437ce8","b9a99e15.45ee4"]]}] \ No newline at end of file
+[{"id":"acb78607.669d98","type":"dgstart","name":"DGSTART","outputs":1,"x":174.2857208251953,"y":107.14286041259766,"z":"8933f47c.8eca28","wires":[["1d5dd029.fdeb2"]]},{"id":"1d5dd029.fdeb2","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":207.28573608398438,"y":158.25395965576172,"z":"8933f47c.8eca28","wires":[["d17b44c2.cdd0f8"]]},{"id":"d17b44c2.cdd0f8","type":"method","name":"preload-vnf-instance-topology-operation","xml":"<method rpc=\"preload-vnf-instance-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":294.6190643310547,"y":203.36505889892578,"z":"8933f47c.8eca28","wires":[["15e09d37.0dd353"]]},{"id":"15e09d37.0dd353","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":276.79361724853516,"y":263.95237731933594,"z":"8933f47c.8eca28","wires":[["e7a7dbc2.f05948"]]},{"id":"e7a7dbc2.f05948","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-instance-topology-operation-input.request-information.request-action`\">\n\n","comments":"","outputs":1,"x":512.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["10b04798.1315a8","2fb0d9fd.987eb6","5221dded.ffd334"]]},{"id":"10b04798.1315a8","type":"other","name":"PreloadVnfInstanceRequest","xml":"<outcome value='PreloadVnfInstanceRequest'>","comments":"","outputs":1,"x":774.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["c7936654.a5eee8"]]},{"id":"2fb0d9fd.987eb6","type":"other","name":"DeletePreloadVnfInstanceRequest","xml":"<outcome value='DeletePreloadVnfInstanceRequest'>","comments":"","outputs":1,"x":793.4284362792969,"y":529.9819974899292,"z":"8933f47c.8eca28","wires":[["ba7d7b73.a72568"]]},{"id":"804376ed.19eab8","type":"set","name":"Delete vnf-instance-preload-data","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"\" />\n","comments":"","x":1309.6784973144531,"y":529.732027053833,"z":"8933f47c.8eca28","wires":[]},{"id":"5221dded.ffd334","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":722.7141571044922,"y":648.981987953186,"z":"8933f47c.8eca28","wires":[["11a3d982.d1fa06"]]},{"id":"11a3d982.d1fa06","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-instance-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":980.6533508300781,"y":649.3024396896362,"z":"8933f47c.8eca28","wires":[]},{"id":"c7936654.a5eee8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1019.142822265625,"y":308.76769733428955,"z":"8933f47c.8eca28","wires":[["7288864f.4ca648","add8c4fe.ffd258","55c30909.4c2f38","729a6f33.9aa24","61b570ed.ef516"]]},{"id":"b9a99e15.45ee4","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1399.1428680419922,"y":646.4463310241699,"z":"8933f47c.8eca28","wires":[]},{"id":"55c30909.4c2f38","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"vnf-instance-preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1332.1667785644531,"y":443.3908395767212,"z":"8933f47c.8eca28","wires":[]},{"id":"eb852ae1.437ce8","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1420.0516815185547,"y":603.454418182373,"z":"8933f47c.8eca28","wires":[]},{"id":"7288864f.4ca648","type":"get-resource","name":"get-resource: vnf-profile.vnf-type","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" \n\tresource=\"vnf-profile\" key=\"SELECT * from VNF_PROFILE where vnf_type = $preload-vnf-instance-topology-operation-input.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id\">\n","comments":"","outputs":1,"x":1310.6628723144531,"y":309.22027587890625,"z":"8933f47c.8eca28","wires":[["4464022f.8d1b5c","a85fb482.a59958"]]},{"id":"1181ba91.3da815","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name=\"error-code\" value=\"404\" />\n\t<parameter name=\"error-message\" value=\"preload vnf-model-id not found. New vnf-model-id can be added via admin portal\" />","comments":"","x":1800.9960632324219,"y":308.44244384765625,"z":"8933f47c.8eca28","wires":[]},{"id":"4464022f.8d1b5c","type":"success","name":"not found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1587.6628112792969,"y":308.99798583984375,"z":"8933f47c.8eca28","wires":[["1181ba91.3da815"]]},{"id":"add8c4fe.ffd258","type":"set","name":"set: vnf-instance-preload-data += input","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"preload-vnf-instance-topology-operation-input.\" />\n","comments":"","x":1330.3334045410156,"y":397.6862802505493,"z":"8933f47c.8eca28","wires":[]},{"id":"a85fb482.a59958","type":"success","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1579.9405212402344,"y":350.54345703125,"z":"8933f47c.8eca28","wires":[["1181ba91.3da815"]]},{"id":"ba7d7b73.a72568","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1046.1784362792969,"y":529.9819965362549,"z":"8933f47c.8eca28","wires":[["804376ed.19eab8","61b570ed.ef516"]]},{"id":"729a6f33.9aa24","type":"set","name":"Delete vnf-instance-preload-data","xml":"<set>\n<parameter name=\"vnf-instance-preload-data.\" value=\"\" />\n","comments":"","x":1312.3570861816406,"y":354.1072082519531,"z":"8933f47c.8eca28","wires":[]},{"id":"61b570ed.ef516","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1230.8214416503906,"y":604.2143602371216,"z":"8933f47c.8eca28","wires":[["eb852ae1.437ce8","b9a99e15.45ee4"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
index 9b3ea39d..8f10b185 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
@@ -1 +1 @@
-[{"id":"d3e2dd72.f3eb28","type":"dgstart","name":"DGSTART","outputs":1,"x":153,"y":80,"z":"ec010968.e7b3c8","wires":[["89fa3693.857fc"]]},{"id":"89fa3693.857fc","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":186.00001525878906,"y":131.11109924316406,"z":"ec010968.e7b3c8","wires":[["f67f175f.4ffd08"]]},{"id":"f67f175f.4ffd08","type":"method","name":"preload-vnf-topology-operation","xml":"<method rpc=\"preload-vnf-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":273.3333435058594,"y":176.22219848632812,"z":"ec010968.e7b3c8","wires":[["84f2afd6.541b48"]]},{"id":"84f2afd6.541b48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":201.22219848632812,"y":329.6666564941406,"z":"ec010968.e7b3c8","wires":[["8428aef3.294fb"]]},{"id":"433e4bbb.0041a4","type":"comment","name":"preload-vnf-topology-operation","info":"","comments":"","x":734.7121696472168,"y":86.76768398284912,"z":"ec010968.e7b3c8","wires":[]},{"id":"c245f742.938de8","type":"comment","name":"request-action = PreloadVNFRequest, svc-action = reserve","info":"","comments":"","x":743.4999961853027,"y":124.4444465637207,"z":"ec010968.e7b3c8","wires":[]},{"id":"8428aef3.294fb","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-topology-operation-input.request-information.request-action`\">\n<!--\nleaf request-action { \n\t\t\t\ttype enumeration { \n\t\t\t\t\tenum \"VNFActivateRequest\";\n\t\t\t\t\tenum \"ChangeVNFActivateRequest\";\n\t\t\t\t\tenum \"DisconnectVNFRequest\";\n\t\t\t\t\tenum \"PreloadVNFRequest\";\n\t\t\t\t\tenum \"DeletePreloadVNFRequest\";\n\t\t\t\t} \n}\n-->\n\n","comments":"","outputs":1,"x":468,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["224db7b9.99c05","25c7df15.e2ee68","d922a69b.5847a"]]},{"id":"224db7b9.99c05","type":"other","name":"PreloadVNFRequest","xml":"<outcome value='PreloadVNFRequest'>","comments":"","outputs":1,"x":696,"y":350.76768493652344,"z":"ec010968.e7b3c8","wires":[["168570d4.1b2c0f"]]},{"id":"25c7df15.e2ee68","type":"other","name":"DeletePreloadVNFRequest","xml":"<outcome value='DeletePreloadVNFRequest'>","comments":"","outputs":1,"x":697.5713119506836,"y":724.6248331069946,"z":"ec010968.e7b3c8","wires":[["7234c5f6.8e775c"]]},{"id":"c8fc1b0d.1f04b","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1167.5713119506836,"y":766.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"293e913d.2d205e","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1150.5713119506836,"y":806.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"d922a69b.5847a","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":665.5713119506836,"y":844.6248331069946,"z":"ec010968.e7b3c8","wires":[["3f1f5721.c4719"]]},{"id":"3f1f5721.c4719","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":907.6534042358398,"y":843.0881509780884,"z":"ec010968.e7b3c8","wires":[]},{"id":"168570d4.1b2c0f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["2dfc339a.33eb4c","1be7681f.50003","256a1875.9f523","88afcd6b.4398f","cb33cf00.3b6b58","84940a76.3bc3a"]]},{"id":"cb33cf00.3b6b58","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1194.0000457763672,"y":586.1962547302246,"z":"ec010968.e7b3c8","wires":[]},{"id":"88afcd6b.4398f","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1269.0239715576172,"y":546.2836875915527,"z":"ec010968.e7b3c8","wires":[]},{"id":"2dfc339a.33eb4c","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1214.9088668823242,"y":348.91858863830566,"z":"ec010968.e7b3c8","wires":[]},{"id":"1be7681f.50003","type":"set","name":"set : sql-resource-plugin","xml":"<set only-if-unset=\"true\">\n<parameter name=\"sql-resource-plugin\" value=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\"/>","comments":"","x":1235.7321090698242,"y":387.79737281799316,"z":"ec010968.e7b3c8","wires":[]},{"id":"256a1875.9f523","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-vnf-topology-operation-input.\" />\n","comments":"","x":1226.940658569336,"y":506.82912826538086,"z":"ec010968.e7b3c8","wires":[]},{"id":"7234c5f6.8e775c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936.5713119506836,"y":725.6248331069946,"z":"ec010968.e7b3c8","wires":[["c8fc1b0d.1f04b","293e913d.2d205e"]]},{"id":"8fe855d2.3e6538","type":"comment","name":"request-action = DeletePreloadVNFRequest, svc-action = delete","info":"","comments":"","x":752,"y":161.76768493652344,"z":"ec010968.e7b3c8","wires":[]},{"id":"84940a76.3bc3a","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1209.7143020629883,"y":467.0000305175781,"z":"ec010968.e7b3c8","wires":[]}] \ No newline at end of file
+[{"id":"d3e2dd72.f3eb28","type":"dgstart","name":"DGSTART","outputs":1,"x":153,"y":80,"z":"ec010968.e7b3c8","wires":[["89fa3693.857fc"]]},{"id":"89fa3693.857fc","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":186.00001525878906,"y":131.11109924316406,"z":"ec010968.e7b3c8","wires":[["f67f175f.4ffd08"]]},{"id":"f67f175f.4ffd08","type":"method","name":"preload-vnf-topology-operation","xml":"<method rpc=\"preload-vnf-topology-operation\" mode=\"sync\">","comments":"","outputs":1,"x":273.3333435058594,"y":176.22219848632812,"z":"ec010968.e7b3c8","wires":[["84f2afd6.541b48"]]},{"id":"84f2afd6.541b48","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":201.22219848632812,"y":329.6666564941406,"z":"ec010968.e7b3c8","wires":[["8428aef3.294fb"]]},{"id":"433e4bbb.0041a4","type":"comment","name":"preload-vnf-topology-operation","info":"","comments":"","x":734.7121696472168,"y":86.76768398284912,"z":"ec010968.e7b3c8","wires":[]},{"id":"c245f742.938de8","type":"comment","name":"request-action = PreloadVNFRequest, svc-action = reserve","info":"","comments":"","x":743.4999961853027,"y":124.4444465637207,"z":"ec010968.e7b3c8","wires":[]},{"id":"8428aef3.294fb","type":"switchNode","name":"switch: request-action","xml":"<switch test=\"`$preload-vnf-topology-operation-input.request-information.request-action`\">\n<!--\nleaf request-action { \n\t\t\t\ttype enumeration { \n\t\t\t\t\tenum \"VNFActivateRequest\";\n\t\t\t\t\tenum \"ChangeVNFActivateRequest\";\n\t\t\t\t\tenum \"DisconnectVNFRequest\";\n\t\t\t\t\tenum \"PreloadVNFRequest\";\n\t\t\t\t\tenum \"DeletePreloadVNFRequest\";\n\t\t\t\t} \n}\n-->\n\n","comments":"","outputs":1,"x":468,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["224db7b9.99c05","25c7df15.e2ee68","d922a69b.5847a"]]},{"id":"224db7b9.99c05","type":"other","name":"PreloadVNFRequest","xml":"<outcome value='PreloadVNFRequest'>","comments":"","outputs":1,"x":696,"y":350.76768493652344,"z":"ec010968.e7b3c8","wires":[["168570d4.1b2c0f"]]},{"id":"25c7df15.e2ee68","type":"other","name":"DeletePreloadVNFRequest","xml":"<outcome value='DeletePreloadVNFRequest'>","comments":"","outputs":1,"x":697.5713119506836,"y":724.6248331069946,"z":"ec010968.e7b3c8","wires":[["7234c5f6.8e775c"]]},{"id":"c8fc1b0d.1f04b","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1167.5713119506836,"y":766.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"293e913d.2d205e","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1150.5713119506836,"y":806.6248331069946,"z":"ec010968.e7b3c8","wires":[]},{"id":"d922a69b.5847a","type":"other","name":"outcome: Other","xml":"<outcome value=\"Other\">\n\n","outputs":1,"x":665.5713119506836,"y":844.6248331069946,"z":"ec010968.e7b3c8","wires":[["3f1f5721.c4719"]]},{"id":"3f1f5721.c4719","type":"returnFailure","name":"return failure","xml":" <return status=\"failure\">\n\t<parameter name='error-code' value='2000'/>\n\t<parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\n\n \n","comments":"","x":907.6534042358398,"y":843.0881509780884,"z":"ec010968.e7b3c8","wires":[]},{"id":"168570d4.1b2c0f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936,"y":349.76768493652344,"z":"ec010968.e7b3c8","wires":[["2dfc339a.33eb4c","1be7681f.50003","256a1875.9f523","88afcd6b.4398f","cb33cf00.3b6b58","84940a76.3bc3a"]]},{"id":"cb33cf00.3b6b58","type":"returnSuccess","name":"return success","xml":"<return status=\"success\">\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":1194.0000457763672,"y":586.1962547302246,"z":"ec010968.e7b3c8","wires":[]},{"id":"88afcd6b.4398f","type":"set","name":"set: order-status = PendingAssignment","xml":"<set>\n\t<parameter name=\"preload-data.oper-status.order-status\" value=\"PendingAssignment\"/>","comments":"","x":1269.0239715576172,"y":546.2836875915527,"z":"ec010968.e7b3c8","wires":[]},{"id":"2dfc339a.33eb4c","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":1214.9088668823242,"y":348.91858863830566,"z":"ec010968.e7b3c8","wires":[]},{"id":"1be7681f.50003","type":"set","name":"set : sql-resource-plugin","xml":"<set only-if-unset=\"true\">\n<parameter name=\"sql-resource-plugin\" value=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\"/>","comments":"","x":1235.7321090698242,"y":387.79737281799316,"z":"ec010968.e7b3c8","wires":[]},{"id":"256a1875.9f523","type":"set","name":"set: preload-data += input","xml":"<set>\n<parameter name=\"preload-data.\" value=\"preload-vnf-topology-operation-input.\" />\n","comments":"","x":1226.940658569336,"y":506.82912826538086,"z":"ec010968.e7b3c8","wires":[]},{"id":"7234c5f6.8e775c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":936.5713119506836,"y":725.6248331069946,"z":"ec010968.e7b3c8","wires":[["c8fc1b0d.1f04b","293e913d.2d205e"]]},{"id":"8fe855d2.3e6538","type":"comment","name":"request-action = DeletePreloadVNFRequest, svc-action = delete","info":"","comments":"","x":752,"y":161.76768493652344,"z":"ec010968.e7b3c8","wires":[]},{"id":"84940a76.3bc3a","type":"set","name":"Delete Preload Data","xml":"<set>\n<parameter name=\"preload-data.\" value=\"\" />\n","comments":"","x":1209.7143020629883,"y":467.0000305175781,"z":"ec010968.e7b3c8","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_rollback-eipam-ip-assignment.json b/platform-logic/vnfapi/src/main/json/VNF-API_rollback-eipam-ip-assignment.json
index c8174347..36d1e827 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_rollback-eipam-ip-assignment.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_rollback-eipam-ip-assignment.json
@@ -1 +1 @@
-[{"id":"ca13d39d.4a481","type":"dgstart","name":"DGSTART","outputs":1,"x":191.66665649414062,"y":130,"z":"81d77771.435188","wires":[["850132f2.97faa"]]},{"id":"d53fa926.bc8038","type":"method","name":"method rollback-eipam-ip-assignment","xml":"<method rpc='rollback-eipam-ip-assignment' mode='sync'>\n","comments":"","outputs":1,"x":359.16664123535156,"y":290.93651580810547,"z":"81d77771.435188","wires":[["d55d452f.723fa8"]]},{"id":"850132f2.97faa","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":293.56346130371094,"y":203.634934425354,"z":"81d77771.435188","wires":[["d53fa926.bc8038"]]},{"id":"bacdf2b.d9c0f1","type":"update","name":"update EIPAM_IP_ASSIGNMENTS to PENDING_DELETE...","xml":"<update plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status \n\t\tWHERE info = $vnf-topology-operation-input.vnf-request-information.vnf-id\" >","comments":"","outputs":1,"x":969.8571624755859,"y":288.5714282989502,"z":"81d77771.435188","wires":[["e93433cf.3976"]]},{"id":"204a22bc.04bd2e","type":"set","name":"set status variable","xml":"<set>\n<parameter name='tmp.status' \n\tvalue=\"`'PENDING_DELETE_' + $vnf-topology-operation-input.vnf-request-information.vnf-id`\" />\n<parameter name='service-data.service-information.service-type' \n\tvalue='NOT_APPLICABLE' />\n\t\n","comments":"","x":839.8571243286133,"y":241.90480041503906,"z":"81d77771.435188","wires":[]},{"id":"e93433cf.3976","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1275.8570709228516,"y":287.904727935791,"z":"81d77771.435188","wires":[["c6588808.afd928"]]},{"id":"c6588808.afd928","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 on rollback.\" />\n","comments":"","x":1434.8570976257324,"y":287.71446323394775,"z":"81d77771.435188","wires":[]},{"id":"9f945c90.bbdc5","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":904.8571319580078,"y":333.57147216796875,"z":"81d77771.435188","wires":[["94d18ac.d008f78"]]},{"id":"94d18ac.d008f78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1141.5237579345703,"y":333.57141494750977,"z":"81d77771.435188","wires":[["c3033b34.c5b888"]]},{"id":"c3033b34.c5b888","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 EIPAM unassign IP address on rollback.\" />\n","comments":"","x":1331.5237846374512,"y":333.3811502456665,"z":"81d77771.435188","wires":[]},{"id":"eecace93.5e461","type":"comment","name":"rollback-eipam-ip-assignment","info":"","comments":"","x":715.7143402099609,"y":140.71476936340332,"z":"81d77771.435188","wires":[]},{"id":"d55d452f.723fa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":611.5237884521484,"y":290.9049243927002,"z":"81d77771.435188","wires":[["204a22bc.04bd2e","bacdf2b.d9c0f1","9f945c90.bbdc5"]]}] \ No newline at end of file
+[{"id":"ca13d39d.4a481","type":"dgstart","name":"DGSTART","outputs":1,"x":191.66665649414062,"y":130,"z":"81d77771.435188","wires":[["850132f2.97faa"]]},{"id":"d53fa926.bc8038","type":"method","name":"method rollback-eipam-ip-assignment","xml":"<method rpc='rollback-eipam-ip-assignment' mode='sync'>\n","comments":"","outputs":1,"x":359.16664123535156,"y":290.93651580810547,"z":"81d77771.435188","wires":[["d55d452f.723fa8"]]},{"id":"850132f2.97faa","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":293.56346130371094,"y":203.634934425354,"z":"81d77771.435188","wires":[["d53fa926.bc8038"]]},{"id":"bacdf2b.d9c0f1","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 info = $vnf-topology-operation-input.vnf-request-information.vnf-id\" >","comments":"","outputs":1,"x":969.8571624755859,"y":288.5714282989502,"z":"81d77771.435188","wires":[["e93433cf.3976"]]},{"id":"204a22bc.04bd2e","type":"set","name":"set status variable","xml":"<set>\n<parameter name='tmp.status' \n\tvalue=\"`'PENDING_DELETE_' + $vnf-topology-operation-input.vnf-request-information.vnf-id`\" />\n<parameter name='service-data.service-information.service-type' \n\tvalue='NOT_APPLICABLE' />\n\t\n","comments":"","x":839.8571243286133,"y":241.90480041503906,"z":"81d77771.435188","wires":[]},{"id":"e93433cf.3976","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1275.8570709228516,"y":287.904727935791,"z":"81d77771.435188","wires":[["c6588808.afd928"]]},{"id":"c6588808.afd928","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 on rollback.\" />\n","comments":"","x":1434.8570976257324,"y":287.71446323394775,"z":"81d77771.435188","wires":[]},{"id":"9f945c90.bbdc5","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":904.8571319580078,"y":333.57147216796875,"z":"81d77771.435188","wires":[["94d18ac.d008f78"]]},{"id":"94d18ac.d008f78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1141.5237579345703,"y":333.57141494750977,"z":"81d77771.435188","wires":[["c3033b34.c5b888"]]},{"id":"c3033b34.c5b888","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 EIPAM unassign IP address on rollback.\" />\n","comments":"","x":1331.5237846374512,"y":333.3811502456665,"z":"81d77771.435188","wires":[]},{"id":"eecace93.5e461","type":"comment","name":"rollback-eipam-ip-assignment","info":"","comments":"","x":715.7143402099609,"y":140.71476936340332,"z":"81d77771.435188","wires":[]},{"id":"d55d452f.723fa8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":611.5237884521484,"y":290.9049243927002,"z":"81d77771.435188","wires":[["204a22bc.04bd2e","bacdf2b.d9c0f1","9f945c90.bbdc5"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json
index 5b3c8fe7..725798d0 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json
@@ -61,7 +61,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 314.52379608154297,
"y": 57.523834228515625,
@@ -313,7 +313,7 @@
"id": "3041a9ae.a8b0d6",
"type": "save",
"name": "update AnAI - vf-module.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />",
"comments": "",
"outputs": 1,
"x": 493.74600982666016,
@@ -401,4 +401,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json
index ebb4f497..be559688 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 272.4880905151367,
"y": 47.488101959228516,
@@ -155,7 +155,7 @@
"id": "3c76d450.1a1c5c",
"type": "save",
"name": "get AnAI - l3-network by id",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-networks[$i].network-id\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-networks[$i].network-id\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1241.1195945739746,
@@ -204,7 +204,7 @@
"id": "4e004f85.49efa",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vf-module-topology-operation-input.vf-module-request-information.vnf-networks[$i].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vf-module-topology-operation-input.vf-module-request-information.vnf-networks[$i].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n\n",
"comments": "",
"outputs": 1,
"x": 1726.3532485961914,
@@ -1289,7 +1289,7 @@
"id": "5d489590.345c3c",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vf-module-preload-data.vf-module-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vf-module-preload-data.vf-module-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1116.531536102295,
@@ -1859,4 +1859,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json
index 9e7a014b..99157446 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 288.0238037109375,
"y": 48.738101959228516,
@@ -138,7 +138,7 @@
"id": "a9a15235.6b621",
"type": "save",
"name": "save relationship: l3-network",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vf-module-service-data.vf-module-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vf-module-service-data.vf-module-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
"comments": "",
"outputs": 1,
"x": 802.031810760498,
@@ -215,7 +215,7 @@
"id": "2266e1a7.71fbbe",
"type": "save",
"name": "delete vf-module: l3-network relationship",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 1266.8691291809082,
@@ -229,7 +229,7 @@
"id": "70b11385.26396c",
"type": "save",
"name": "update AnAI - vf-module.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 535.202465057373,
@@ -336,7 +336,7 @@
"id": "70c2e0fb.98281",
"type": "save",
"name": "GET AnAI - vf-module",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >",
"comments": "",
"outputs": 1,
"x": 465.5357322692871,
@@ -403,4 +403,4 @@
"z": "350dd502.49698a",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json
index 1c51955f..f211547e 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 288.0238037109375,
"y": 60.16667175292969,
@@ -187,7 +187,7 @@
"id": "490cb041.34c72",
"type": "save",
"name": "delete l3-network relationship",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 478.7778015136719,
@@ -214,7 +214,7 @@
"id": "64e590aa.7bcaa",
"type": "save",
"name": "get AnAI - vf-module",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" \n\t\tpfx=\"tmp.AnAI.vfmodule\">",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tand generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" \n\t\tpfx=\"tmp.AnAI.vfmodule\">",
"comments": "",
"outputs": 1,
"x": 452.63490295410156,
@@ -231,7 +231,7 @@
"id": "795ec745.e145d8",
"type": "save",
"name": "save l3-network relationship",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vf-module-service-data.vf-module-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vf-module-service-data.vf-module-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
"comments": "",
"outputs": 1,
"x": 799.5909881591797,
@@ -311,7 +311,7 @@
"id": "434af9d5.0675a8",
"type": "save",
"name": "delete relationship: vf-module",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 1421.2140502929688,
@@ -430,7 +430,7 @@
"id": "75b5e472.e4c3ac",
"type": "save",
"name": "save l3-network relationship",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = vf-module-topology-operation-input.vf-module-request-information.vf-module-id \n\t\t\tAND generic-vnf.vnf-id = $vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />",
"comments": "",
"outputs": 1,
"x": 2241.7498321533203,
@@ -691,4 +691,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json
index 10113e77..c0248e96 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json
@@ -70,7 +70,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 269.77770233154297,
"y": 39.05558776855469,
@@ -237,4 +237,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json
index 04121dbf..df0a074a 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json
@@ -1 +1 @@
-[{"id":"e0ff2801.a03df8","type":"dgstart","name":"DGSTART","outputs":1,"x":195.71429443359375,"y":81.42857360839844,"z":"68297705.7f4dc8","wires":[["78140404.aeb19c"]]},{"id":"78140404.aeb19c","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":362.99205780029297,"y":81.09524250030518,"z":"68297705.7f4dc8","wires":[["78b1b039.ff13b"]]},{"id":"78b1b039.ff13b","type":"method","name":"vf-module-topology-operation","xml":"<method rpc='vf-module-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":286.21429443359375,"y":131.65079498291016,"z":"68297705.7f4dc8","wires":[["673f06bc.66a948"]]},{"id":"b7519e64.1a17d","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":714.3254470825195,"y":981.7618408203125,"z":"68297705.7f4dc8","wires":[["27978610.8d377a"]]},{"id":"27978610.8d377a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":939.3254470825195,"y":981.7618408203125,"z":"68297705.7f4dc8","wires":[]},{"id":"3e3dbb9f.24df84","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":714.5754470825195,"y":938.0118427276611,"z":"68297705.7f4dc8","wires":[["ea75b949.ebd298"]]},{"id":"ea75b949.ebd298","type":"call","name":"call: vf-module-topology-delete","xml":"<call module='VNF-API' rpc='vf-module-topology-delete' mode='sync' >","comments":"","outputs":1,"x":994.3255157470703,"y":938.0118436813354,"z":"68297705.7f4dc8","wires":[[]]},{"id":"74dacbed.650b84","type":"comment","name":"vf-module-topology-operation","info":"","comments":"","x":686.6031723022461,"y":122.87301826477051,"z":"68297705.7f4dc8","wires":[]},{"id":"673f06bc.66a948","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":280.7143020629883,"y":188.42857933044434,"z":"68297705.7f4dc8","wires":[["fa0f3bd8.c39298","dbdbdf9f.cc2d6","b9acb3f5.7c184","c1212ec.b8775d","5526645.e90c39c","aa3d3826.cb6ba8","deec160a.22b3a8","4f3a433c.cd903c"]]},{"id":"fa0f3bd8.c39298","type":"switchNode","name":"switch: INPUT vf-module-name","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-name`\">","comments":"","outputs":1,"x":542.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["82f0521.21003b","640e052e.b656ec"]]},{"id":"82f0521.21003b","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":756.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["5b22340b.32f12c"]]},{"id":"640e052e.b656ec","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":755.380973815918,"y":279.0952215194702,"z":"68297705.7f4dc8","wires":[["bb3c05e8.388e28"]]},{"id":"5b22340b.32f12c","type":"switchNode","name":"switch: PRELOAD vf-module-name","xml":"<switch test=\"`$vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-name`\">","comments":"","outputs":1,"x":986.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["54e614b9.3b37bc","ee5a11dd.17f2d"]]},{"id":"54e614b9.3b37bc","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1221.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["7f77d834.7fd738"]]},{"id":"ee5a11dd.17f2d","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1222.380973815918,"y":278.0952215194702,"z":"68297705.7f4dc8","wires":[["924b77be.5bf338"]]},{"id":"7f77d834.7fd738","type":"switchNode","name":"switch: vf-module-name INPUT == PRELOAD","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-name == $vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-name`\">","comments":"","outputs":1,"x":1479.380958557129,"y":235.09521961212158,"z":"68297705.7f4dc8","wires":[["5165cc73.2191d4"]]},{"id":"5165cc73.2191d4","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1734.7143249511719,"y":235.76212215423584,"z":"68297705.7f4dc8","wires":[["c51991e0.17e19"]]},{"id":"c51991e0.17e19","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vf-module-name not found in vf-module-preload-data'/>","comments":"","x":1893.3809509277344,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[]},{"id":"924b77be.5bf338","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vf-module-name'/>","comments":"","x":1389.380973815918,"y":278.0952215194702,"z":"68297705.7f4dc8","wires":[]},{"id":"bb3c05e8.388e28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-name is required'/>","comments":"","x":916.880973815918,"y":279.3452215194702,"z":"68297705.7f4dc8","wires":[]},{"id":"dbdbdf9f.cc2d6","type":"switchNode","name":"switch: INPUT vf-module-model-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-model-id`\">","comments":"","outputs":1,"x":548.6032104492188,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["738dfde0.130494","9e499c38.3810c"]]},{"id":"738dfde0.130494","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":771.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["4068ad6f.23d994"]]},{"id":"9e499c38.3810c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":770.6032028198242,"y":381.7618923187256,"z":"68297705.7f4dc8","wires":[["8d635944.f692b8"]]},{"id":"4068ad6f.23d994","type":"switchNode","name":"switch: PRELOAD vf-module-model-id","xml":"<switch test=\"`$vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-model-id`\">","comments":"","outputs":1,"x":1010.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["5914ef95.68c0c","84aff1dd.c5e9a"]]},{"id":"5914ef95.68c0c","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1250.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["b6797064.75d77"]]},{"id":"84aff1dd.c5e9a","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1250.6032028198242,"y":380.7618923187256,"z":"68297705.7f4dc8","wires":[["5bac39ac.c75ae8"]]},{"id":"8d635944.f692b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-model-id is required'/>","comments":"","x":932.1032028198242,"y":382.0118923187256,"z":"68297705.7f4dc8","wires":[]},{"id":"b6797064.75d77","type":"switchNode","name":"switch: vf-module-model-id INPUT == PRELOAD","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-model-id == $vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-model-id`\">","comments":"","outputs":1,"x":1521.6031799316406,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["a95f9de7.96ae5"]]},{"id":"5bac39ac.c75ae8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vf-module-model-id from input'/>","comments":"","x":1410.6031799316406,"y":380.7618923187256,"z":"68297705.7f4dc8","wires":[]},{"id":"a95f9de7.96ae5","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1791.6031799316406,"y":340.0953884124756,"z":"68297705.7f4dc8","wires":[["519c0a31.767ca4"]]},{"id":"519c0a31.767ca4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vf-module-model-id not found in vf-module-preload-data'/>","comments":"","x":1950.2698059082031,"y":339.42848777770996,"z":"68297705.7f4dc8","wires":[]},{"id":"b9acb3f5.7c184","type":"switchNode","name":"switch: INPUT vf-module-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-id`\">","comments":"","outputs":1,"x":526.781867980957,"y":431.72621726989746,"z":"68297705.7f4dc8","wires":[["d1ebf8c0.c6a178","319b8367.1d946c"]]},{"id":"319b8367.1d946c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":748.7818374633789,"y":471.8690547943115,"z":"68297705.7f4dc8","wires":[["71f257ae.ebcf08"]]},{"id":"d1ebf8c0.c6a178","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":748.9247665405273,"y":431.2976531982422,"z":"68297705.7f4dc8","wires":[["71f257ae.ebcf08"]]},{"id":"71f257ae.ebcf08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-id cannot be NULL or 0'/>","comments":"","x":923.639045715332,"y":472.15477561950684,"z":"68297705.7f4dc8","wires":[]},{"id":"c1212ec.b8775d","type":"switchNode","name":"switch: INPUT vnf-instance-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id`\">","comments":"","outputs":1,"x":532.6865997314453,"y":525.3730382919312,"z":"68297705.7f4dc8","wires":[["42518bf.4367274","af1b381e.b67c38"]]},{"id":"af1b381e.b67c38","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":765.6865692138672,"y":563.5158758163452,"z":"68297705.7f4dc8","wires":[["e777cce9.c995a"]]},{"id":"42518bf.4367274","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":764.8294982910156,"y":525.9444742202759,"z":"68297705.7f4dc8","wires":[["e777cce9.c995a"]]},{"id":"e777cce9.c995a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-id cannot be NULL or 0'/>","comments":"","x":919.5437774658203,"y":563.8015966415405,"z":"68297705.7f4dc8","wires":[]},{"id":"5526645.e90c39c","type":"switchNode","name":"switch: INPUT vnf-instance-name","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-instance-name`\">","comments":"","outputs":1,"x":545.9365882873535,"y":606.3730392456055,"z":"68297705.7f4dc8","wires":[["bf0856af.62fb18"]]},{"id":"bf0856af.62fb18","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":795.9365577697754,"y":606.5158767700195,"z":"68297705.7f4dc8","wires":[["d2d0c1d2.6d45"]]},{"id":"d2d0c1d2.6d45","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-name cannot be NULL'/>","comments":"","x":949.7937660217285,"y":606.8015975952148,"z":"68297705.7f4dc8","wires":[]},{"id":"aa3d3826.cb6ba8","type":"switchNode","name":"switch: INPUT vnf-model-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-model-id`\">","comments":"","outputs":1,"x":527.6866226196289,"y":653.6230411529541,"z":"68297705.7f4dc8","wires":[["8f8cbdfc.4846a"]]},{"id":"8f8cbdfc.4846a","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":777.6865921020508,"y":653.7658786773682,"z":"68297705.7f4dc8","wires":[["6f5b3f20.92185"]]},{"id":"6f5b3f20.92185","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-model-id cannot be NULL'/>","comments":"","x":931.5438003540039,"y":654.0515995025635,"z":"68297705.7f4dc8","wires":[]},{"id":"deec160a.22b3a8","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":537.9643020629883,"y":697.9285831451416,"z":"68297705.7f4dc8","wires":[["a1e5052d.4510a8"]]},{"id":"a1e5052d.4510a8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":755.9642715454102,"y":698.0714206695557,"z":"68297705.7f4dc8","wires":[["8cc2ab6a.205d98"]]},{"id":"8cc2ab6a.205d98","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":909.8214797973633,"y":698.357141494751,"z":"68297705.7f4dc8","wires":[]},{"id":"4f3a433c.cd903c","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":496.2698440551758,"y":763.7618370056152,"z":"68297705.7f4dc8","wires":[["b7519e64.1a17d","ca8e3631.a35768","6b6e6366.f5966c","64432f78.b4e26","3e3dbb9f.24df84","d425cfc4.5c5b6"]]},{"id":"ca8e3631.a35768","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":713.8254013061523,"y":763.7618427276611,"z":"68297705.7f4dc8","wires":[["b7efe2a6.85804"]]},{"id":"6b6e6366.f5966c","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":716.8254165649414,"y":853.0118312835693,"z":"68297705.7f4dc8","wires":[["ba7e49a5.adf968"]]},{"id":"64432f78.b4e26","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":716.5754165649414,"y":895.2618322372437,"z":"68297705.7f4dc8","wires":[["7fbdb178.da1f3"]]},{"id":"d425cfc4.5c5b6","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":735.3254165649414,"y":809.261833190918,"z":"68297705.7f4dc8","wires":[["f52637d5.69b248"]]},{"id":"b7efe2a6.85804","type":"call","name":"call: vf-module-topology-assign","xml":"<call module='VNF-API' rpc='vf-module-topology-assign' mode='sync' >","comments":"","outputs":1,"x":994.0754013061523,"y":763.7618408203125,"z":"68297705.7f4dc8","wires":[[]]},{"id":"f52637d5.69b248","type":"call","name":"call: vf-module-topology-changeassign","xml":"<call module='VNF-API' rpc='vf-module-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":1017.3255233764648,"y":808.7618408203125,"z":"68297705.7f4dc8","wires":[[]]},{"id":"7fbdb178.da1f3","type":"call","name":"call: vf-module-topology-rollback","xml":"<call module='VNF-API' rpc='vf-module-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":999.0755233764648,"y":895.2618427276611,"z":"68297705.7f4dc8","wires":[[]]},{"id":"ba7e49a5.adf968","type":"call","name":"call: vf-module-topology-activate","xml":"<call module='VNF-API' rpc='vf-module-topology-activate' mode='sync' >","comments":"","outputs":1,"x":998.5755157470703,"y":853.2618365287781,"z":"68297705.7f4dc8","wires":[[]]}] \ No newline at end of file
+[{"id":"e0ff2801.a03df8","type":"dgstart","name":"DGSTART","outputs":1,"x":195.71429443359375,"y":81.42857360839844,"z":"68297705.7f4dc8","wires":[["78140404.aeb19c"]]},{"id":"78140404.aeb19c","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":362.99205780029297,"y":81.09524250030518,"z":"68297705.7f4dc8","wires":[["78b1b039.ff13b"]]},{"id":"78b1b039.ff13b","type":"method","name":"vf-module-topology-operation","xml":"<method rpc='vf-module-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":286.21429443359375,"y":131.65079498291016,"z":"68297705.7f4dc8","wires":[["673f06bc.66a948"]]},{"id":"b7519e64.1a17d","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":714.3254470825195,"y":981.7618408203125,"z":"68297705.7f4dc8","wires":[["27978610.8d377a"]]},{"id":"27978610.8d377a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":939.3254470825195,"y":981.7618408203125,"z":"68297705.7f4dc8","wires":[]},{"id":"3e3dbb9f.24df84","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":714.5754470825195,"y":938.0118427276611,"z":"68297705.7f4dc8","wires":[["ea75b949.ebd298"]]},{"id":"ea75b949.ebd298","type":"call","name":"call: vf-module-topology-delete","xml":"<call module='VNF-API' rpc='vf-module-topology-delete' mode='sync' >","comments":"","outputs":1,"x":994.3255157470703,"y":938.0118436813354,"z":"68297705.7f4dc8","wires":[[]]},{"id":"74dacbed.650b84","type":"comment","name":"vf-module-topology-operation","info":"","comments":"","x":686.6031723022461,"y":122.87301826477051,"z":"68297705.7f4dc8","wires":[]},{"id":"673f06bc.66a948","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":280.7143020629883,"y":188.42857933044434,"z":"68297705.7f4dc8","wires":[["fa0f3bd8.c39298","dbdbdf9f.cc2d6","b9acb3f5.7c184","c1212ec.b8775d","5526645.e90c39c","aa3d3826.cb6ba8","deec160a.22b3a8","4f3a433c.cd903c"]]},{"id":"fa0f3bd8.c39298","type":"switchNode","name":"switch: INPUT vf-module-name","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-name`\">","comments":"","outputs":1,"x":542.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["82f0521.21003b","640e052e.b656ec"]]},{"id":"82f0521.21003b","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":756.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["5b22340b.32f12c"]]},{"id":"640e052e.b656ec","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":755.380973815918,"y":279.0952215194702,"z":"68297705.7f4dc8","wires":[["bb3c05e8.388e28"]]},{"id":"5b22340b.32f12c","type":"switchNode","name":"switch: PRELOAD vf-module-name","xml":"<switch test=\"`$vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-name`\">","comments":"","outputs":1,"x":986.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["54e614b9.3b37bc","ee5a11dd.17f2d"]]},{"id":"54e614b9.3b37bc","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1221.380973815918,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[["7f77d834.7fd738"]]},{"id":"ee5a11dd.17f2d","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1222.380973815918,"y":278.0952215194702,"z":"68297705.7f4dc8","wires":[["924b77be.5bf338"]]},{"id":"7f77d834.7fd738","type":"switchNode","name":"switch: vf-module-name INPUT == PRELOAD","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-name == $vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-name`\">","comments":"","outputs":1,"x":1479.380958557129,"y":235.09521961212158,"z":"68297705.7f4dc8","wires":[["5165cc73.2191d4"]]},{"id":"5165cc73.2191d4","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1734.7143249511719,"y":235.76212215423584,"z":"68297705.7f4dc8","wires":[["c51991e0.17e19"]]},{"id":"c51991e0.17e19","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vf-module-name not found in vf-module-preload-data'/>","comments":"","x":1893.3809509277344,"y":235.09522151947021,"z":"68297705.7f4dc8","wires":[]},{"id":"924b77be.5bf338","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vf-module-name'/>","comments":"","x":1389.380973815918,"y":278.0952215194702,"z":"68297705.7f4dc8","wires":[]},{"id":"bb3c05e8.388e28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-name is required'/>","comments":"","x":916.880973815918,"y":279.3452215194702,"z":"68297705.7f4dc8","wires":[]},{"id":"dbdbdf9f.cc2d6","type":"switchNode","name":"switch: INPUT vf-module-model-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-model-id`\">","comments":"","outputs":1,"x":548.6032104492188,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["738dfde0.130494","9e499c38.3810c"]]},{"id":"738dfde0.130494","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":771.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["4068ad6f.23d994"]]},{"id":"9e499c38.3810c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":770.6032028198242,"y":381.7618923187256,"z":"68297705.7f4dc8","wires":[["8d635944.f692b8"]]},{"id":"4068ad6f.23d994","type":"switchNode","name":"switch: PRELOAD vf-module-model-id","xml":"<switch test=\"`$vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-model-id`\">","comments":"","outputs":1,"x":1010.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["5914ef95.68c0c","84aff1dd.c5e9a"]]},{"id":"5914ef95.68c0c","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1250.6032028198242,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["b6797064.75d77"]]},{"id":"84aff1dd.c5e9a","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1250.6032028198242,"y":380.7618923187256,"z":"68297705.7f4dc8","wires":[["5bac39ac.c75ae8"]]},{"id":"8d635944.f692b8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-model-id is required'/>","comments":"","x":932.1032028198242,"y":382.0118923187256,"z":"68297705.7f4dc8","wires":[]},{"id":"b6797064.75d77","type":"switchNode","name":"switch: vf-module-model-id INPUT == PRELOAD","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-model-id == $vf-module-preload-data.vf-module-topology-information.vf-module-identifiers.vf-module-model-id`\">","comments":"","outputs":1,"x":1521.6031799316406,"y":339.7618923187256,"z":"68297705.7f4dc8","wires":[["a95f9de7.96ae5"]]},{"id":"5bac39ac.c75ae8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vf-module-model-id from input'/>","comments":"","x":1410.6031799316406,"y":380.7618923187256,"z":"68297705.7f4dc8","wires":[]},{"id":"a95f9de7.96ae5","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1791.6031799316406,"y":340.0953884124756,"z":"68297705.7f4dc8","wires":[["519c0a31.767ca4"]]},{"id":"519c0a31.767ca4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vf-module-model-id not found in vf-module-preload-data'/>","comments":"","x":1950.2698059082031,"y":339.42848777770996,"z":"68297705.7f4dc8","wires":[]},{"id":"b9acb3f5.7c184","type":"switchNode","name":"switch: INPUT vf-module-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vf-module-id`\">","comments":"","outputs":1,"x":526.781867980957,"y":431.72621726989746,"z":"68297705.7f4dc8","wires":[["d1ebf8c0.c6a178","319b8367.1d946c"]]},{"id":"319b8367.1d946c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":748.7818374633789,"y":471.8690547943115,"z":"68297705.7f4dc8","wires":[["71f257ae.ebcf08"]]},{"id":"d1ebf8c0.c6a178","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":748.9247665405273,"y":431.2976531982422,"z":"68297705.7f4dc8","wires":[["71f257ae.ebcf08"]]},{"id":"71f257ae.ebcf08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-module-id cannot be NULL or 0'/>","comments":"","x":923.639045715332,"y":472.15477561950684,"z":"68297705.7f4dc8","wires":[]},{"id":"c1212ec.b8775d","type":"switchNode","name":"switch: INPUT vnf-instance-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-instance-id`\">","comments":"","outputs":1,"x":532.6865997314453,"y":525.3730382919312,"z":"68297705.7f4dc8","wires":[["42518bf.4367274","af1b381e.b67c38"]]},{"id":"af1b381e.b67c38","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":765.6865692138672,"y":563.5158758163452,"z":"68297705.7f4dc8","wires":[["e777cce9.c995a"]]},{"id":"42518bf.4367274","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":764.8294982910156,"y":525.9444742202759,"z":"68297705.7f4dc8","wires":[["e777cce9.c995a"]]},{"id":"e777cce9.c995a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-id cannot be NULL or 0'/>","comments":"","x":919.5437774658203,"y":563.8015966415405,"z":"68297705.7f4dc8","wires":[]},{"id":"5526645.e90c39c","type":"switchNode","name":"switch: INPUT vnf-instance-name","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-instance-name`\">","comments":"","outputs":1,"x":545.9365882873535,"y":606.3730392456055,"z":"68297705.7f4dc8","wires":[["bf0856af.62fb18"]]},{"id":"bf0856af.62fb18","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":795.9365577697754,"y":606.5158767700195,"z":"68297705.7f4dc8","wires":[["d2d0c1d2.6d45"]]},{"id":"d2d0c1d2.6d45","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-name cannot be NULL'/>","comments":"","x":949.7937660217285,"y":606.8015975952148,"z":"68297705.7f4dc8","wires":[]},{"id":"aa3d3826.cb6ba8","type":"switchNode","name":"switch: INPUT vnf-model-id","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.vnf-model-id`\">","comments":"","outputs":1,"x":527.6866226196289,"y":653.6230411529541,"z":"68297705.7f4dc8","wires":[["8f8cbdfc.4846a"]]},{"id":"8f8cbdfc.4846a","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":777.6865921020508,"y":653.7658786773682,"z":"68297705.7f4dc8","wires":[["6f5b3f20.92185"]]},{"id":"6f5b3f20.92185","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-model-id cannot be NULL'/>","comments":"","x":931.5438003540039,"y":654.0515995025635,"z":"68297705.7f4dc8","wires":[]},{"id":"deec160a.22b3a8","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":537.9643020629883,"y":697.9285831451416,"z":"68297705.7f4dc8","wires":[["a1e5052d.4510a8"]]},{"id":"a1e5052d.4510a8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":755.9642715454102,"y":698.0714206695557,"z":"68297705.7f4dc8","wires":[["8cc2ab6a.205d98"]]},{"id":"8cc2ab6a.205d98","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":909.8214797973633,"y":698.357141494751,"z":"68297705.7f4dc8","wires":[]},{"id":"4f3a433c.cd903c","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":496.2698440551758,"y":763.7618370056152,"z":"68297705.7f4dc8","wires":[["b7519e64.1a17d","ca8e3631.a35768","6b6e6366.f5966c","64432f78.b4e26","3e3dbb9f.24df84","d425cfc4.5c5b6"]]},{"id":"ca8e3631.a35768","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":713.8254013061523,"y":763.7618427276611,"z":"68297705.7f4dc8","wires":[["b7efe2a6.85804"]]},{"id":"6b6e6366.f5966c","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":716.8254165649414,"y":853.0118312835693,"z":"68297705.7f4dc8","wires":[["ba7e49a5.adf968"]]},{"id":"64432f78.b4e26","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":716.5754165649414,"y":895.2618322372437,"z":"68297705.7f4dc8","wires":[["7fbdb178.da1f3"]]},{"id":"d425cfc4.5c5b6","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":735.3254165649414,"y":809.261833190918,"z":"68297705.7f4dc8","wires":[["f52637d5.69b248"]]},{"id":"b7efe2a6.85804","type":"call","name":"call: vf-module-topology-assign","xml":"<call module='VNF-API' rpc='vf-module-topology-assign' mode='sync' >","comments":"","outputs":1,"x":994.0754013061523,"y":763.7618408203125,"z":"68297705.7f4dc8","wires":[[]]},{"id":"f52637d5.69b248","type":"call","name":"call: vf-module-topology-changeassign","xml":"<call module='VNF-API' rpc='vf-module-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":1017.3255233764648,"y":808.7618408203125,"z":"68297705.7f4dc8","wires":[[]]},{"id":"7fbdb178.da1f3","type":"call","name":"call: vf-module-topology-rollback","xml":"<call module='VNF-API' rpc='vf-module-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":999.0755233764648,"y":895.2618427276611,"z":"68297705.7f4dc8","wires":[[]]},{"id":"ba7e49a5.adf968","type":"call","name":"call: vf-module-topology-activate","xml":"<call module='VNF-API' rpc='vf-module-topology-activate' mode='sync' >","comments":"","outputs":1,"x":998.5755157470703,"y":853.2618365287781,"z":"68297705.7f4dc8","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json
index 3dde1925..60bebe7f 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json
@@ -38,7 +38,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 262.3333435058594,
"y": 44.055559158325195,
@@ -296,4 +296,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json
index f26343e0..9e76fa63 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json
@@ -59,7 +59,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 304.99996185302734,
"y": 39.05554962158203,
@@ -322,7 +322,7 @@
"id": "716ea0ca.5337a",
"type": "save",
"name": "update AnAI - vnf-instance.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n<parameter name=\"orchestration-status\" value=\"active\" />",
"comments": "",
"outputs": 1,
"x": 491.22217559814453,
@@ -351,4 +351,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json
index af09ac81..91e1d155 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 308.0238037109375,
"y": 43.0238151550293,
@@ -155,7 +155,7 @@
"id": "6dd56a34.8d5b54",
"type": "save",
"name": "get AnAI - l3-network by id",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-networks[$i].network-id\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-networks[$i].network-id\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1294.6553077697754,
@@ -204,7 +204,7 @@
"id": "7b1b2acb.ddf7c4",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-networks[$i].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-networks[$i].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n\n",
"comments": "",
"outputs": 1,
"x": 1779.8889617919922,
@@ -609,7 +609,7 @@
"id": "ab894ac3.a9bab8",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-instance-preload-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-instance-preload-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1200.0714225769043,
@@ -1870,4 +1870,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json
index 42c18047..a971cf6b 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 339.73802947998047,
"y": 71.59526062011719,
@@ -138,7 +138,7 @@
"id": "67bf7768.b620d8",
"type": "save",
"name": "save relationship: l3-network",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
"comments": "",
"outputs": 1,
"x": 822.3174667358398,
@@ -215,7 +215,7 @@
"id": "98086e0f.3b64d",
"type": "save",
"name": "delete vnf-instance: l3-network relationship",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 1287.15478515625,
@@ -229,7 +229,7 @@
"id": "41693571.36e60c",
"type": "save",
"name": "update AnAI - vnf-instance.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 544.4881210327148,
@@ -336,7 +336,7 @@
"id": "88fc01a3.bf7a3",
"type": "save",
"name": "GET AnAI - vnf-instance",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" \n\tpfx=\"tmp.AnAI.vnf-instance\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" \n\tpfx=\"tmp.AnAI.vnf-instance\" >",
"comments": "",
"outputs": 1,
"x": 465.8213882446289,
@@ -403,4 +403,4 @@
"z": "cee53bf1.d63798",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json
index 7691cf34..55877de7 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 276.59523010253906,
"y": 60.166672229766846,
@@ -187,7 +187,7 @@
"id": "579e919a.69eb7",
"type": "save",
"name": "delete l3-network relationship",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 461.793701171875,
@@ -214,7 +214,7 @@
"id": "ed72da5e.728ab8",
"type": "save",
"name": "get AnAI - vnf-instance",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" \n\tpfx=\"tmp.AnAI.vnf-instance\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" \n\tpfx=\"tmp.AnAI.vnf-instance\" >",
"comments": "",
"outputs": 1,
"x": 440.0952453613281,
@@ -231,7 +231,7 @@
"id": "f6b122b7.d730f",
"type": "save",
"name": "save l3-network relationship",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-instance-service-data.vnf-instance-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
"comments": "",
"outputs": 1,
"x": 780.8290863037109,
@@ -311,7 +311,7 @@
"id": "625f1fb8.1f18e",
"type": "save",
"name": "delete relationship: vf-module",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id \n\t\t\tAND related-to = l3-network\" >",
"comments": "",
"outputs": 1,
"x": 1392.4521484375,
@@ -430,7 +430,7 @@
"id": "867a21f.18c04e",
"type": "save",
"name": "save l3-network relationship",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vnf-instance.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf:relationship-list\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id\" >\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vnf-instance.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />",
"comments": "",
"outputs": 1,
"x": 2224.2378692626953,
@@ -691,4 +691,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json
index 849ed058..9ebbf15e 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json
@@ -70,7 +70,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 273.1110305786133,
"y": 44.611114501953125,
@@ -237,4 +237,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json
index 2b01b5a9..9b9fa443 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json
@@ -1 +1 @@
-[{"id":"fd297644.e7c598","type":"dgstart","name":"DGSTART","outputs":1,"x":122.85714721679688,"y":74.28571319580078,"z":"fd58158c.ce6608","wires":[["c46e7454.e9c9b8"]]},{"id":"c46e7454.e9c9b8","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":290.1349105834961,"y":73.95238208770752,"z":"fd58158c.ce6608","wires":[["8e79a786.9a27d8"]]},{"id":"8e79a786.9a27d8","type":"method","name":"vnf-instance-topology-operation","xml":"<method rpc='vnf-instance-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":217.35714721679688,"y":128.50793075561523,"z":"fd58158c.ce6608","wires":[["c9295ef5.984bc"]]},{"id":"bcf03a22.4acff8","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-instance-topology-operation-input.sdnc-request-header.svc-action`\">\n","comments":"","outputs":1,"x":435.9126968383789,"y":594.3689575195312,"z":"fd58158c.ce6608","wires":[["8fca1abe.fbd228","ab124c9a.57743","c514096c.65a738","bfc509a.8c94bf8","ee98fdb6.3bc2b","33f9f05f.770f5"]]},{"id":"8fca1abe.fbd228","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":653.7182998657227,"y":811.1189594268799,"z":"fd58158c.ce6608","wires":[["8b2d7ea.7a8088"]]},{"id":"ab124c9a.57743","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":653.4682540893555,"y":594.3689632415771,"z":"fd58158c.ce6608","wires":[["cc0dbb0.31d6348"]]},{"id":"8b2d7ea.7a8088","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":867.7182998657227,"y":811.1189594268799,"z":"fd58158c.ce6608","wires":[]},{"id":"c514096c.65a738","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":656.4682693481445,"y":683.6189517974854,"z":"fd58158c.ce6608","wires":[["6753428c.6d54dc"]]},{"id":"bfc509a.8c94bf8","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":656.2182693481445,"y":725.8689527511597,"z":"fd58158c.ce6608","wires":[["cff4c731.8d74f8"]]},{"id":"33f9f05f.770f5","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":674.9682693481445,"y":639.868953704834,"z":"fd58158c.ce6608","wires":[["84079b33.ceeeb8"]]},{"id":"ee98fdb6.3bc2b","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":653.9682998657227,"y":767.3689603805542,"z":"fd58158c.ce6608","wires":[["820d7e4e.7102c"]]},{"id":"cc0dbb0.31d6348","type":"call","name":"call: vnf-instance-topology-assign","xml":"<call module='VNF-API' rpc='vnf-instance-topology-assign' mode='sync' >","comments":"","outputs":1,"x":927.7182540893555,"y":594.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"84079b33.ceeeb8","type":"call","name":"call: vnf-instance-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-instance-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":950.968376159668,"y":639.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"cff4c731.8d74f8","type":"call","name":"call: vnf-instance-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-instance-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":932.718376159668,"y":725.8689632415771,"z":"fd58158c.ce6608","wires":[[]]},{"id":"820d7e4e.7102c","type":"call","name":"call: vnf-instance-topology-delete","xml":"<call module='VNF-API' rpc='vnf-instance-topology-delete' mode='sync' >","comments":"","outputs":1,"x":928.7183685302734,"y":767.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"6753428c.6d54dc","type":"call","name":"call: vnf-instance-topology-activate","xml":"<call module='VNF-API' rpc='vnf-instance-topology-activate' mode='sync' >","comments":"","outputs":1,"x":932.2183685302734,"y":683.8689570426941,"z":"fd58158c.ce6608","wires":[[]]},{"id":"5559eeb0.3a344","type":"comment","name":"vnf-instance-topology-operation","info":"","comments":"","x":649.7460250854492,"y":119.73015689849854,"z":"fd58158c.ce6608","wires":[]},{"id":"c9295ef5.984bc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":225.85714721679688,"y":178.28572463989258,"z":"fd58158c.ce6608","wires":[["5e104a56.a77f04","4b089ba9.cc5224","bcf03a22.4acff8","f93caaf5.9786d8","738dcb6b.5f37c4"]]},{"id":"5e104a56.a77f04","type":"switchNode","name":"switch: INPUT vnf-instance-name","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-name`\">","comments":"","outputs":1,"x":491.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["4888dd7b.ca0734","be681e5f.25477"]]},{"id":"4888dd7b.ca0734","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":725.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["2bd3a996.402226"]]},{"id":"be681e5f.25477","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":725.0793762207031,"y":266.73014545440674,"z":"fd58158c.ce6608","wires":[["201420c1.169e5"]]},{"id":"2bd3a996.402226","type":"switchNode","name":"switch: PRELOAD vnf-instance-name","xml":"<switch test=\"`$vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-instance-name`\">","comments":"","outputs":1,"x":963.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["41f12dd4.ed9824","9d58cea8.cde5d"]]},{"id":"41f12dd4.ed9824","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1196.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["dc375cfa.881af"]]},{"id":"9d58cea8.cde5d","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1194.0793762207031,"y":265.73014545440674,"z":"fd58158c.ce6608","wires":[["85123cbc.181bb"]]},{"id":"dc375cfa.881af","type":"switchNode","name":"switch: vnf-instance-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-name == $vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-instance-name`\">","comments":"","outputs":1,"x":1470.079360961914,"y":224.7301435470581,"z":"fd58158c.ce6608","wires":[["1ecb91bb.6831de"]]},{"id":"1ecb91bb.6831de","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1745.412727355957,"y":224.39704608917236,"z":"fd58158c.ce6608","wires":[["154ef7f.4af5608"]]},{"id":"154ef7f.4af5608","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vnf-instance-name from input not found in vnf-instance-preload-data'/>","comments":"","x":1904.0793533325195,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"85123cbc.181bb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-instance-name from input'/>","comments":"","x":1361.0793762207031,"y":265.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"201420c1.169e5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-name is required'/>","comments":"","x":886.5793762207031,"y":266.98014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"4b089ba9.cc5224","type":"switchNode","name":"switch: INPUT vnf-model-id","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-model-id`\">","comments":"","outputs":1,"x":471.07940673828125,"y":312.73014545440674,"z":"fd58158c.ce6608","wires":[["1c8fb5e0.30549a","8375a795.3229a8"]]},{"id":"1c8fb5e0.30549a","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":688.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["4de2da3a.8608c4"]]},{"id":"8375a795.3229a8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":689.0793991088867,"y":356.73014545440674,"z":"fd58158c.ce6608","wires":[["73308a13.e64bb4"]]},{"id":"4de2da3a.8608c4","type":"switchNode","name":"switch: PRELOAD vnf-model-id","xml":"<switch test=\"`$vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id`\">","comments":"","outputs":1,"x":899.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["bdac221b.8b4d2","1346493e.864997"]]},{"id":"bdac221b.8b4d2","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1110.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["530c77e7.241608"]]},{"id":"1346493e.864997","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1111.0793991088867,"y":355.73014545440674,"z":"fd58158c.ce6608","wires":[["9daf4382.f092a"]]},{"id":"73308a13.e64bb4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-model-id is required'/>","comments":"","x":842.5793991088867,"y":356.98014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"530c77e7.241608","type":"switchNode","name":"switch: vnf-model-id INPUT == PRELOAD","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-model-id == $vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id`\">","comments":"","outputs":1,"x":1358.0793762207031,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["ad4966b9.8c18d8"]]},{"id":"9daf4382.f092a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-model-id from input'/>","comments":"","x":1270.0793762207031,"y":355.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"ad4966b9.8c18d8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1607.0793762207031,"y":313.06364154815674,"z":"fd58158c.ce6608","wires":[["29ab6ac5.37ac76"]]},{"id":"29ab6ac5.37ac76","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='request.vnf-model-id not found in vnf-instance-preload-data'/>","comments":"","x":1765.7460021972656,"y":312.3967409133911,"z":"fd58158c.ce6608","wires":[]},{"id":"f93caaf5.9786d8","type":"switchNode","name":"switch: INPUT vnf-instance-id","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id`\">","comments":"","outputs":1,"x":476.75804901123047,"y":407.19447231292725,"z":"fd58158c.ce6608","wires":[["8a575356.8ffc1","3b617d0c.95eb72"]]},{"id":"3b617d0c.95eb72","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":695.7580184936523,"y":448.3373098373413,"z":"fd58158c.ce6608","wires":[["c5bccaf4.2f4438"]]},{"id":"8a575356.8ffc1","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":694.9009475708008,"y":406.765908241272,"z":"fd58158c.ce6608","wires":[["c5bccaf4.2f4438"]]},{"id":"c5bccaf4.2f4438","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-instance-id cannot be NULL or 0'/>","comments":"","x":870.6152267456055,"y":448.6230306625366,"z":"fd58158c.ce6608","wires":[]},{"id":"738dcb6b.5f37c4","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":478.60716247558594,"y":529.7857036590576,"z":"fd58158c.ce6608","wires":[["db22259e.8012b8"]]},{"id":"db22259e.8012b8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":696.6071319580078,"y":529.9285411834717,"z":"fd58158c.ce6608","wires":[["a48a127d.62bfa"]]},{"id":"a48a127d.62bfa","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":850.4643402099609,"y":530.214262008667,"z":"fd58158c.ce6608","wires":[]}] \ No newline at end of file
+[{"id":"fd297644.e7c598","type":"dgstart","name":"DGSTART","outputs":1,"x":122.85714721679688,"y":74.28571319580078,"z":"fd58158c.ce6608","wires":[["c46e7454.e9c9b8"]]},{"id":"c46e7454.e9c9b8","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":290.1349105834961,"y":73.95238208770752,"z":"fd58158c.ce6608","wires":[["8e79a786.9a27d8"]]},{"id":"8e79a786.9a27d8","type":"method","name":"vnf-instance-topology-operation","xml":"<method rpc='vnf-instance-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":217.35714721679688,"y":128.50793075561523,"z":"fd58158c.ce6608","wires":[["c9295ef5.984bc"]]},{"id":"bcf03a22.4acff8","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-instance-topology-operation-input.sdnc-request-header.svc-action`\">\n","comments":"","outputs":1,"x":435.9126968383789,"y":594.3689575195312,"z":"fd58158c.ce6608","wires":[["8fca1abe.fbd228","ab124c9a.57743","c514096c.65a738","bfc509a.8c94bf8","ee98fdb6.3bc2b","33f9f05f.770f5"]]},{"id":"8fca1abe.fbd228","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":653.7182998657227,"y":811.1189594268799,"z":"fd58158c.ce6608","wires":[["8b2d7ea.7a8088"]]},{"id":"ab124c9a.57743","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":653.4682540893555,"y":594.3689632415771,"z":"fd58158c.ce6608","wires":[["cc0dbb0.31d6348"]]},{"id":"8b2d7ea.7a8088","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":867.7182998657227,"y":811.1189594268799,"z":"fd58158c.ce6608","wires":[]},{"id":"c514096c.65a738","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":656.4682693481445,"y":683.6189517974854,"z":"fd58158c.ce6608","wires":[["6753428c.6d54dc"]]},{"id":"bfc509a.8c94bf8","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":656.2182693481445,"y":725.8689527511597,"z":"fd58158c.ce6608","wires":[["cff4c731.8d74f8"]]},{"id":"33f9f05f.770f5","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":674.9682693481445,"y":639.868953704834,"z":"fd58158c.ce6608","wires":[["84079b33.ceeeb8"]]},{"id":"ee98fdb6.3bc2b","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":653.9682998657227,"y":767.3689603805542,"z":"fd58158c.ce6608","wires":[["820d7e4e.7102c"]]},{"id":"cc0dbb0.31d6348","type":"call","name":"call: vnf-instance-topology-assign","xml":"<call module='VNF-API' rpc='vnf-instance-topology-assign' mode='sync' >","comments":"","outputs":1,"x":927.7182540893555,"y":594.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"84079b33.ceeeb8","type":"call","name":"call: vnf-instance-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-instance-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":950.968376159668,"y":639.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"cff4c731.8d74f8","type":"call","name":"call: vnf-instance-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-instance-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":932.718376159668,"y":725.8689632415771,"z":"fd58158c.ce6608","wires":[[]]},{"id":"820d7e4e.7102c","type":"call","name":"call: vnf-instance-topology-delete","xml":"<call module='VNF-API' rpc='vnf-instance-topology-delete' mode='sync' >","comments":"","outputs":1,"x":928.7183685302734,"y":767.3689613342285,"z":"fd58158c.ce6608","wires":[[]]},{"id":"6753428c.6d54dc","type":"call","name":"call: vnf-instance-topology-activate","xml":"<call module='VNF-API' rpc='vnf-instance-topology-activate' mode='sync' >","comments":"","outputs":1,"x":932.2183685302734,"y":683.8689570426941,"z":"fd58158c.ce6608","wires":[[]]},{"id":"5559eeb0.3a344","type":"comment","name":"vnf-instance-topology-operation","info":"","comments":"","x":649.7460250854492,"y":119.73015689849854,"z":"fd58158c.ce6608","wires":[]},{"id":"c9295ef5.984bc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":225.85714721679688,"y":178.28572463989258,"z":"fd58158c.ce6608","wires":[["5e104a56.a77f04","4b089ba9.cc5224","bcf03a22.4acff8","f93caaf5.9786d8","738dcb6b.5f37c4"]]},{"id":"5e104a56.a77f04","type":"switchNode","name":"switch: INPUT vnf-instance-name","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-name`\">","comments":"","outputs":1,"x":491.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["4888dd7b.ca0734","be681e5f.25477"]]},{"id":"4888dd7b.ca0734","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":725.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["2bd3a996.402226"]]},{"id":"be681e5f.25477","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":725.0793762207031,"y":266.73014545440674,"z":"fd58158c.ce6608","wires":[["201420c1.169e5"]]},{"id":"2bd3a996.402226","type":"switchNode","name":"switch: PRELOAD vnf-instance-name","xml":"<switch test=\"`$vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-instance-name`\">","comments":"","outputs":1,"x":963.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["41f12dd4.ed9824","9d58cea8.cde5d"]]},{"id":"41f12dd4.ed9824","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1196.0793762207031,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[["dc375cfa.881af"]]},{"id":"9d58cea8.cde5d","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1194.0793762207031,"y":265.73014545440674,"z":"fd58158c.ce6608","wires":[["85123cbc.181bb"]]},{"id":"dc375cfa.881af","type":"switchNode","name":"switch: vnf-instance-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-name == $vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-instance-name`\">","comments":"","outputs":1,"x":1470.079360961914,"y":224.7301435470581,"z":"fd58158c.ce6608","wires":[["1ecb91bb.6831de"]]},{"id":"1ecb91bb.6831de","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1745.412727355957,"y":224.39704608917236,"z":"fd58158c.ce6608","wires":[["154ef7f.4af5608"]]},{"id":"154ef7f.4af5608","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vnf-instance-name from input not found in vnf-instance-preload-data'/>","comments":"","x":1904.0793533325195,"y":224.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"85123cbc.181bb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-instance-name from input'/>","comments":"","x":1361.0793762207031,"y":265.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"201420c1.169e5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-instance-name is required'/>","comments":"","x":886.5793762207031,"y":266.98014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"4b089ba9.cc5224","type":"switchNode","name":"switch: INPUT vnf-model-id","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-model-id`\">","comments":"","outputs":1,"x":471.07940673828125,"y":312.73014545440674,"z":"fd58158c.ce6608","wires":[["1c8fb5e0.30549a","8375a795.3229a8"]]},{"id":"1c8fb5e0.30549a","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":688.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["4de2da3a.8608c4"]]},{"id":"8375a795.3229a8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":689.0793991088867,"y":356.73014545440674,"z":"fd58158c.ce6608","wires":[["73308a13.e64bb4"]]},{"id":"4de2da3a.8608c4","type":"switchNode","name":"switch: PRELOAD vnf-model-id","xml":"<switch test=\"`$vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id`\">","comments":"","outputs":1,"x":899.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["bdac221b.8b4d2","1346493e.864997"]]},{"id":"bdac221b.8b4d2","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1110.0793991088867,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["530c77e7.241608"]]},{"id":"1346493e.864997","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1111.0793991088867,"y":355.73014545440674,"z":"fd58158c.ce6608","wires":[["9daf4382.f092a"]]},{"id":"73308a13.e64bb4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-model-id is required'/>","comments":"","x":842.5793991088867,"y":356.98014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"530c77e7.241608","type":"switchNode","name":"switch: vnf-model-id INPUT == PRELOAD","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-model-id == $vnf-instance-preload-data.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id`\">","comments":"","outputs":1,"x":1358.0793762207031,"y":313.73014545440674,"z":"fd58158c.ce6608","wires":[["ad4966b9.8c18d8"]]},{"id":"9daf4382.f092a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-model-id from input'/>","comments":"","x":1270.0793762207031,"y":355.73014545440674,"z":"fd58158c.ce6608","wires":[]},{"id":"ad4966b9.8c18d8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1607.0793762207031,"y":313.06364154815674,"z":"fd58158c.ce6608","wires":[["29ab6ac5.37ac76"]]},{"id":"29ab6ac5.37ac76","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='request.vnf-model-id not found in vnf-instance-preload-data'/>","comments":"","x":1765.7460021972656,"y":312.3967409133911,"z":"fd58158c.ce6608","wires":[]},{"id":"f93caaf5.9786d8","type":"switchNode","name":"switch: INPUT vnf-instance-id","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.vnf-instance-id`\">","comments":"","outputs":1,"x":476.75804901123047,"y":407.19447231292725,"z":"fd58158c.ce6608","wires":[["8a575356.8ffc1","3b617d0c.95eb72"]]},{"id":"3b617d0c.95eb72","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":695.7580184936523,"y":448.3373098373413,"z":"fd58158c.ce6608","wires":[["c5bccaf4.2f4438"]]},{"id":"8a575356.8ffc1","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":694.9009475708008,"y":406.765908241272,"z":"fd58158c.ce6608","wires":[["c5bccaf4.2f4438"]]},{"id":"c5bccaf4.2f4438","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-instance-id cannot be NULL or 0'/>","comments":"","x":870.6152267456055,"y":448.6230306625366,"z":"fd58158c.ce6608","wires":[]},{"id":"738dcb6b.5f37c4","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-instance-topology-operation-input.vnf-instance-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":478.60716247558594,"y":529.7857036590576,"z":"fd58158c.ce6608","wires":[["db22259e.8012b8"]]},{"id":"db22259e.8012b8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":696.6071319580078,"y":529.9285411834717,"z":"fd58158c.ce6608","wires":[["a48a127d.62bfa"]]},{"id":"a48a127d.62bfa","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":850.4643402099609,"y":530.214262008667,"z":"fd58158c.ce6608","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json
index 042a5302..e86df7ba 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json
@@ -38,7 +38,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 289.9721908569336,
"y": 49.05556106567383,
@@ -296,4 +296,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json
index e2cbc212..2c87a0a0 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json
@@ -70,7 +70,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 297.7777862548828,
"y": 56.86111831665039,
@@ -333,7 +333,7 @@
"id": "be925673.a43ed8",
"type": "save",
"name": "update AnAI - vf-module.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />",
"comments": "",
"outputs": 1,
"x": 477,
@@ -345,4 +345,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json
index 171925fc..cb53e896 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 305.1666564941406,
"y": 61.595245361328125,
@@ -155,7 +155,7 @@
"id": "c6e8f114.6edb3",
"type": "save",
"name": "get AnAI - l3-network by id",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vnf-topology-operation-input.vnf-request-information.vnf-networks[$i].network-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-id = $vnf-topology-operation-input.vnf-request-information.vnf-networks[$i].network-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1160.548168182373,
@@ -204,7 +204,7 @@
"id": "459aea4a.7ec284",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-topology-operation-input.vnf-request-information.vnf-networks[$i].network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $vnf-topology-operation-input.vnf-request-information.vnf-networks[$i].network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n\n",
"comments": "",
"outputs": 1,
"x": 1645.7818222045898,
@@ -609,7 +609,7 @@
"id": "a3d35540.191cd8",
"type": "save",
"name": "get AnAI - l3-network by name",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $preload-data.vnf-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $preload-data.vnf-topology-information.vnf-assignments.vnf-networks[$j].network-name\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.l3network\">\n",
"comments": "",
"outputs": 1,
"x": 1153.964256286621,
@@ -1870,4 +1870,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json
index b4021379..4f9513c6 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json
@@ -20,7 +20,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 252,
"y": 160,
@@ -136,7 +136,7 @@
"id": "e68cdc52.c407d",
"type": "save",
"name": "save relationship: l3-network",
- "xml": "<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />",
"comments": "",
"outputs": 1,
"x": 918,
@@ -213,7 +213,7 @@
"id": "a2a13f6d.2a0c8",
"type": "save",
"name": "delete vf-module: l3-network relationship",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">",
"comments": "",
"outputs": 1,
"x": 1355.5,
@@ -227,7 +227,7 @@
"id": "6511ce13.6b3e7",
"type": "save",
"name": "update AnAI - vf-module.orchestration-status",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />",
"comments": "",
"outputs": 1,
"x": 628.5,
@@ -328,7 +328,7 @@
"id": "ec4234b5.37aa58",
"type": "save",
"name": "GET AnAI - vf-module",
- "xml": "<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >",
"comments": "",
"outputs": 1,
"x": 557.5,
@@ -438,4 +438,4 @@
]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign-vfmodule.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign-vfmodule.json
index e9312f0b..6ead74c6 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign-vfmodule.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign-vfmodule.json
@@ -1 +1 @@
-[{"id":"a3f3d39b.f78d9","type":"dgstart","name":"DGSTART","outputs":1,"x":221.66665649414062,"y":78.59521961212158,"z":"c6a6763c.4a8938","wires":[["7618c6cb.6da728"]]},{"id":"7618c6cb.6da728","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":427.4523696899414,"y":78.33333206176758,"z":"c6a6763c.4a8938","wires":[["745c4044.c7543"]]},{"id":"745c4044.c7543","type":"method","name":"method vnf-topology-automated-assign-vfmodule","xml":"<method rpc='vnf-topology-automated-assign-vfmodule' mode='sync'>\n","comments":"","outputs":1,"x":343.95240020751953,"y":137.34521961212158,"z":"c6a6763c.4a8938","wires":[["d060a59c.64f7d8"]]},{"id":"658e22f0.e8f0ac","type":"comment","name":"vf-module-topology-operation-assign","info":"","comments":"","x":941.9877777099609,"y":114.07091808319092,"z":"c6a6763c.4a8938","wires":[]},{"id":"89188f30.f0547","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":705.1904525756836,"y":196.02378845214844,"z":"c6a6763c.4a8938","wires":[["d088b2f2.8739a","f45b77de.439698"]]},{"id":"d088b2f2.8739a","type":"outcome","name":"VNFActivateRequest","xml":"<outcome value='VNFActivateRequest'>\n","comments":"","outputs":1,"x":967.2380676269531,"y":173.16667461395264,"z":"c6a6763c.4a8938","wires":[["b8e0d10d.97964"]]},{"id":"f45b77de.439698","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":923.904712677002,"y":218.54766368865967,"z":"c6a6763c.4a8938","wires":[["5cacb441.fde0cc"]]},{"id":"b8e0d10d.97964","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1157.0952320098877,"y":173.16670608520508,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"5cacb441.fde0cc","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=\"If svc-action is 'assign' then request-action must be 'VNFActivateRequest'\" />\n","comments":"","x":1175.9047203063965,"y":218.88097620010376,"z":"c6a6763c.4a8938","wires":[]},{"id":"8f60b4ac.2c4328","type":"get-resource","name":"get-resource VF_MODULE_MODEL","xml":"<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\n pfx='db.vf-module-model'>\n\n","comments":"","outputs":1,"x":752.5237197875977,"y":287.16673851013184,"z":"c6a6763c.4a8938","wires":[["13d1cb9d.f21ef4","890a29b.28c78d8"]]},{"id":"d9dd7137.f2e6f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"`'No model found for VF module customization UUID ' + $vnf-topology-operation-input.vnf-request-information.model-customization-uuid`\" />\n","comments":"","x":1193.9521408081055,"y":311.59521102905273,"z":"c6a6763c.4a8938","wires":[]},{"id":"13d1cb9d.f21ef4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1018.3094100952148,"y":267.54756927490234,"z":"c6a6763c.4a8938","wires":[["88d4d30f.afb0f"]]},{"id":"890a29b.28c78d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1026.8808403015137,"y":311.8332824707031,"z":"c6a6763c.4a8938","wires":[["d9dd7137.f2e6f"]]},{"id":"88d4d30f.afb0f","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 reading VF_MODULE_MODEL table\" />\n","comments":"","x":1193.309341430664,"y":266.6904697418213,"z":"c6a6763c.4a8938","wires":[]},{"id":"d060a59c.64f7d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":281.66663360595703,"y":2689.5951585769653,"z":"c6a6763c.4a8938","wires":[["89188f30.f0547","8f60b4ac.2c4328","311746e4.0a155a","60df562d.be7488","bc2c72de.8ea2e","af03ef4d.70e9e","b00f7262.1c094","74a8a4cc.6a37bc","50a525a1.ba695c","1c0d1734.2252b9","d4c6f015.e3386","b1e903e3.a9656","f95ebeb7.10204","946d1e34.4231","bf9d4319.1481e"]]},{"id":"92ef08a2.2df308","type":"set","name":"set aic-clli","xml":"<set>\n<parameter name='tmp.aic-clli' value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n","comments":"","x":1596.0950164794922,"y":572.0712900161743,"z":"c6a6763c.4a8938","wires":[]},{"id":"311746e4.0a155a","type":"get-resource","name":"get-resource cloud region","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = 'Rackspace' AND \n\t\t cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-information.aic-cloud-region\"\n pfx='aai.cloud-region' local-only='false' >\n\n","comments":"","outputs":1,"x":719.6428527832031,"y":389.52400493621826,"z":"c6a6763c.4a8938","wires":[["c986ee76.ee16","d962828a.b478c"]]},{"id":"d962828a.b478c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":933.889045715332,"y":407.67486095428467,"z":"c6a6763c.4a8938","wires":[["e920bb81.b40cb8"]]},{"id":"e920bb81.b40cb8","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 retrieving cloud region from AAI\" />\n","comments":"","x":1108.8890190124512,"y":407.6748971939087,"z":"c6a6763c.4a8938","wires":[]},{"id":"c986ee76.ee16","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":942.8176422119141,"y":365.9605941772461,"z":"c6a6763c.4a8938","wires":[["3f933d3b.567172"]]},{"id":"3f933d3b.567172","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"`'aic-cloud-region,'+ $vnf-topology-operation-input.vnf-request-information.aic-cloud-region + ' not found in AAI'`\" />\n","comments":"","x":1109.166919708252,"y":365.2661714553833,"z":"c6a6763c.4a8938","wires":[]},{"id":"60df562d.be7488","type":"get-resource","name":"get-resource VF_MODULE_TO_VFC_MAPPING","xml":"<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\n pfx='db.vf-module-to-vfc-mapping[]'>\n\n","comments":"","outputs":1,"x":799.4524383544922,"y":844.142825126648,"z":"c6a6763c.4a8938","wires":[["d338b11f.a37bd","2618c557.dded6a"]]},{"id":"d338b11f.a37bd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1083.8095703125,"y":826.2379236221313,"z":"c6a6763c.4a8938","wires":[["2f952fcf.2a5da"]]},{"id":"2618c557.dded6a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1092.3810005187988,"y":870.5236368179321,"z":"c6a6763c.4a8938","wires":[["7b10c7c8.b3c7e8"]]},{"id":"2f952fcf.2a5da","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 reading VF_MODULE_TO_VFC_MAPPING table\" />\n","comments":"","x":1258.8095016479492,"y":825.3808240890503,"z":"c6a6763c.4a8938","wires":[]},{"id":"bc2c72de.8ea2e","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >\n","comments":"","outputs":1,"x":668.571418762207,"y":1739.1430168151855,"z":"c6a6763c.4a8938","wires":[["ccbb8f9.a6c077"]]},{"id":"ccbb8f9.a6c077","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":747.6190719604492,"y":1804.428677558899,"z":"c6a6763c.4a8938","wires":[["33dc2f21.83919","52d8daec.769304","fbab1088.c3bf6","d8725c39.89566","76c54fa9.38022","8c428202.a4584","96d35d.16f99ca","7f727408.3c054c","3112f18c.d7febe","317a074d.bd4138"]]},{"id":"af03ef4d.70e9e","type":"set","name":"set vnf-vms_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'\n value='`$db.vf-module-to-vfc-mapping_length`' />\n","comments":"","x":705.9999618530273,"y":910.0477952957153,"z":"c6a6763c.4a8938","wires":[]},{"id":"33dc2f21.83919","type":"for","name":"for each network-role","xml":"<for index='network-role-index' start='0' end='`$db.vfc-to-network-role-mapping_length`' >\n","comments":"","outputs":1,"x":1058.0478515625,"y":1587.4918432235718,"z":"c6a6763c.4a8938","wires":[["57fcf630.bf5d88"]]},{"id":"b00f7262.1c094","type":"for","name":"for each cloud-region relationship","xml":"<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":746.1823654174805,"y":571.6021165847778,"z":"c6a6763c.4a8938","wires":[["17ad304.585b5d"]]},{"id":"17ad304.585b5d","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n","comments":"","outputs":1,"x":1012.8609085083008,"y":571.3520460128784,"z":"c6a6763c.4a8938","wires":[["aa25cb53.f74cc8"]]},{"id":"aa25cb53.f74cc8","type":"outcome","name":"complex","xml":"<outcome value='complex'>\n","comments":"","outputs":1,"x":1209.3252296447754,"y":571.7448682785034,"z":"c6a6763c.4a8938","wires":[["744bf544.60ac9c"]]},{"id":"3fb04830.758938","type":"execute","name":"split related-link","xml":"<execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='aai-uid-split' />\n <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\n <parameter name='regex' value='/' />\n","comments":"","outputs":1,"x":1613.4917297363281,"y":524.244912147522,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"744bf544.60ac9c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1400.0870895385742,"y":571.8402318954468,"z":"c6a6763c.4a8938","wires":[["3fb04830.758938","b8173b08.432cc8","92ef08a2.2df308"]]},{"id":"b8173b08.432cc8","type":"break","name":"break","xml":"<break>\n","comments":"","x":1590.0154724121094,"y":621.9592657089233,"z":"c6a6763c.4a8938","wires":[]},{"id":"52d8daec.769304","type":"set","name":"set vm-networks_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length' \n value='`$db.vfc-to-network-role-mapping_length`' />\n","comments":"","x":1068.1903991699219,"y":1417.9677104949951,"z":"c6a6763c.4a8938","wires":[]},{"id":"74a8a4cc.6a37bc","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":637.6190872192383,"y":2421.6335849761963,"z":"c6a6763c.4a8938","wires":[["1a33d1f3.8f6e4e"]]},{"id":"1a33d1f3.8f6e4e","type":"for","name":"for each network-role in vm-networks","xml":"<for index='network-role-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length`' >\n","comments":"","outputs":1,"x":911.1903839111328,"y":2421.6572647094727,"z":"c6a6763c.4a8938","wires":[["ba72b14b.2156"]]},{"id":"ba72b14b.2156","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1171.059455871582,"y":2421.466869354248,"z":"c6a6763c.4a8938","wires":[["d09a49ef.7c1908","98a1c0da.3df17","3b82b435.6743cc","e76ba29b.dbd2f","bca0b7c7.7693f8"]]},{"id":"50a525a1.ba695c","type":"set","name":"copy vnf-topology data","xml":"<set>\n<parameter name='service-data.vnf-topology-information.' value='tmp.vnf-topology.' />\n","comments":"","x":636.6309814453125,"y":3725.919508934021,"z":"c6a6763c.4a8938","wires":[]},{"id":"1c0d1734.2252b9","type":"execute","name":"printContext","xml":"<execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfapi-vfmodule.log' />\n","comments":"","outputs":1,"x":603.2619247436523,"y":3789.8836212158203,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"d4c6f015.e3386","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":618.4761657714844,"y":3657.035722732544,"z":"c6a6763c.4a8938","wires":[["27442cf3.32c4a4"]]},{"id":"27442cf3.32c4a4","type":"for","name":"for each vm","xml":"<for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >\n","comments":"","outputs":1,"x":814.4761962890625,"y":3657.368730545044,"z":"c6a6763c.4a8938","wires":[["78a03f6e.8c578"]]},{"id":"537a79f4.c23ef8","type":"save","name":"save VIPR_CONFIGURATION","xml":"<save plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"INSERT INTO VIPR_CONFIGURATION (vnf_id, \n\t\tvnf_name, \n\t\tecomp_service_instance_id, \n\t\tvm_name, \n\t\tcloud_region_id, \n\t\tcloud_owner) \n\tVALUES ( $service-data.vnf-id , \n\t\t$vnf-topology-operation-input.vnf-request-information.vnf-name , \n\t\t$vnf-topology-operation-input.service-information.service-instance-id , \n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name , \n\t\t$vnf-topology-operation.vnf-request-information.aic-cloud-region , \n\t\t'Rackspace')\" >","comments":"","outputs":1,"x":1222.1428985595703,"y":3680.0363807678223,"z":"c6a6763c.4a8938","wires":[["8ceacfdf.89fec"]]},{"id":"f06def73.72458","type":"comment","name":"Not a failure","info":"","comments":"","x":1742.1427993774414,"y":3680.036385536194,"z":"c6a6763c.4a8938","wires":[]},{"id":"8ceacfdf.89fec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1432.1428833007812,"y":3680.03653049469,"z":"c6a6763c.4a8938","wires":[["b7da4a1c.00f698"]]},{"id":"b7da4a1c.00f698","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"VNF-API.vnf-topology-automated-assign-vfmodule:REQID\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n","comments":"","outputs":1,"x":1575.4763259887695,"y":3680.036368370056,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"2d06b410.7028dc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1605.476448059082,"y":3631.368082046509,"z":"c6a6763c.4a8938","wires":[["db145896.d33078"]]},{"id":"3036cc89.607c34","type":"comment","name":"Not a failure","info":"","comments":"","x":2032.8095016479492,"y":3629.701904296875,"z":"c6a6763c.4a8938","wires":[]},{"id":"db145896.d33078","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"VNF-API.vnf-topology-automated-assign-vfmodule:REQID\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n","comments":"","outputs":1,"x":1855.4763832092285,"y":3631.368715286255,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"78a03f6e.8c578","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":982.8095893859863,"y":3656.3685750961304,"z":"c6a6763c.4a8938","wires":[["1bd6f906.202927","537a79f4.c23ef8"]]},{"id":"1bd6f906.202927","type":"delete","name":"delete any pre-existing records in VIPR_CONFIGURATION","xml":"<delete plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\n key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id\n AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id\n AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' >","comments":"","outputs":1,"x":1312.1429138183594,"y":3631.702714920044,"z":"c6a6763c.4a8938","wires":[["2d06b410.7028dc"]]},{"id":"7b10c7c8.b3c7e8","type":"set","name":"set vf-module-to-vfc-mapping length to 0","xml":"<set>\n<parameter name='db.vf-module-to-vfc-mapping_length' value='0' />\n","comments":"","x":1345.5952911376953,"y":870.1422996520996,"z":"c6a6763c.4a8938","wires":[]},{"id":"f95ebeb7.10204","type":"set","name":"set: service-data.vnf-id","xml":"<set>\n\t<parameter name=\"service-data.vnf-id\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\"/>\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.service-type`\"/>\n","comments":"","x":711.4881820678711,"y":453.2098321914673,"z":"c6a6763c.4a8938","wires":[]},{"id":"57fcf630.bf5d88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1266.1906051635742,"y":1586.7732563018799,"z":"c6a6763c.4a8938","wires":[["bc92bded.ca455","fe584b6c.0233d8","3f0ffec2.1a9d32","d46dd161.dffe2","3a46ead4.8020a6","6e76e719.77b5f8"]]},{"id":"3f0ffec2.1a9d32","type":"get-resource","name":"get-resource l3-network","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\t\tresource=\"l3-networks\" \n\t\tkey=\"l3-network.network-role = $db.vfc-to-network-role-mapping[$network-role-index].network-role\"\n pfx='aai.l3-network' local-only='false'\n>\n<!--\n\tAND l3-network.orchestration-status = 'active'\n\tAND cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region\n\tAND depth = 'ALL'\"\n-->\n","comments":"","outputs":1,"x":1517.7618255615234,"y":1505.2498626708984,"z":"c6a6763c.4a8938","wires":[["c1d211cb.4fae5","8d13a3a8.b532e"]]},{"id":"8d13a3a8.b532e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1723.8095397949219,"y":1527.3927021026611,"z":"c6a6763c.4a8938","wires":[["47da81c8.ba4d8"]]},{"id":"47da81c8.ba4d8","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 retrieving l3-network from AAI\" />\n","comments":"","x":1898.809513092041,"y":1527.3927383422852,"z":"c6a6763c.4a8938","wires":[]},{"id":"c1d211cb.4fae5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1732.738136291504,"y":1485.6784353256226,"z":"c6a6763c.4a8938","wires":[["8e067fe5.5fcdd"]]},{"id":"8e067fe5.5fcdd","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=\"`'No active l3-network found in AAI with cloud_region_id '\n + $vnf-topology-operation-input.vnf-request-information.aic-cloud-region + ' and network_role '\n + $db.vf-network-role-mapping[$network-role-index].network-role`\" />\n","comments":"","x":1899.0874137878418,"y":1484.9840126037598,"z":"c6a6763c.4a8938","wires":[]},{"id":"bc92bded.ca455","type":"set","name":"set tmp vnf-networks data","xml":"<set>\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-name\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].network-name`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-id\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].network-id`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].neutron-id\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].neutron-network-id`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].contrail-network-fqdn\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].contrail-network-fqdn`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-role\" \n\tvalue=\"`$db.vfc-to-network-role-mapping[$network-role-index].network-role`\" />\n","comments":"","x":1515.4761657714844,"y":1934.3929119110107,"z":"c6a6763c.4a8938","wires":[]},{"id":"fe584b6c.0233d8","type":"set","name":"network-index++","xml":"<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n","comments":"","x":1487.9166984558105,"y":1982.785807609558,"z":"c6a6763c.4a8938","wires":[]},{"id":"82c167e.cb8f898","type":"for","name":"for each l3-network","xml":"<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n","comments":"","outputs":1,"x":1666.500144958496,"y":1664.9640560150146,"z":"c6a6763c.4a8938","wires":[["52452f43.5046b"]]},{"id":"52452f43.5046b","type":"switchNode","name":"switch orchestration-status","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n","comments":"","outputs":1,"x":1895.071346282959,"y":1664.5354833602905,"z":"c6a6763c.4a8938","wires":[["948e53a0.a1a4e","bb5bb136.9a8cb","67f6e44a.8c755c"]]},{"id":"948e53a0.a1a4e","type":"outcome","name":"Pending Delete","xml":"<outcome value='Pending Delete'>\n","comments":"","outputs":1,"x":2129.238311767578,"y":1663.952260017395,"z":"c6a6763c.4a8938","wires":[["6e1e86e4.fc0878"]]},{"id":"bb5bb136.9a8cb","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2102.9287872314453,"y":1706.868727684021,"z":"c6a6763c.4a8938","wires":[["3d98f5bc.ae345a"]]},{"id":"1b5cfc0a.780784","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n","comments":"","outputs":1,"x":2468.643138885498,"y":1706.440068244934,"z":"c6a6763c.4a8938","wires":[["18608e13.047c82"]]},{"id":"3d98f5bc.ae345a","type":"for","name":"for each relationship","xml":"<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":2272.928699493408,"y":1706.440104484558,"z":"c6a6763c.4a8938","wires":[["1b5cfc0a.780784"]]},{"id":"18608e13.047c82","type":"outcome","name":"cloud-region","xml":"<outcome value='cloud-region'>\n","comments":"","outputs":1,"x":2642.928779602051,"y":1706.0115146636963,"z":"c6a6763c.4a8938","wires":[["1a0b207b.b43a1"]]},{"id":"1a0b207b.b43a1","type":"for","name":"for each relationship data","xml":"<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n","comments":"","outputs":1,"x":2840.0714797973633,"y":1706.4399824142456,"z":"c6a6763c.4a8938","wires":[["ad33c2ce.a476"]]},{"id":"ad33c2ce.a476","type":"switchNode","name":"switch relationship-key","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n","comments":"","outputs":1,"x":3071.5000801086426,"y":1706.011357307434,"z":"c6a6763c.4a8938","wires":[["99e02cfa.c00ff"]]},{"id":"99e02cfa.c00ff","type":"outcome","name":"cloud-region.cloud-region-id","xml":"<outcome value='cloud-region.cloud-region-id'>\n","comments":"","outputs":1,"x":3312.928611755371,"y":1706.011462211609,"z":"c6a6763c.4a8938","wires":[["72f776c7.f8acb8"]]},{"id":"72f776c7.f8acb8","type":"switchNode","name":"switch relationship-value == cloud-region-id","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-information.aic-cloud-region`'>\n","comments":"","outputs":1,"x":3617.214530944824,"y":1705.8685178756714,"z":"c6a6763c.4a8938","wires":[["fb503bba.563f58"]]},{"id":"fb503bba.563f58","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3857.2145614624023,"y":1706.0114631652832,"z":"c6a6763c.4a8938","wires":[["f34debda.3059a8"]]},{"id":"d46dd161.dffe2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1464.7142944335938,"y":1733.8212022781372,"z":"c6a6763c.4a8938","wires":[["82c167e.cb8f898","7dc3e952.f9aa48"]]},{"id":"7dc3e952.f9aa48","type":"returnSuccess","name":"CATCH BREAK","xml":"<return status='success'>\n\n","comments":"","x":1656.047737121582,"y":1807.15438747406,"z":"c6a6763c.4a8938","wires":[]},{"id":"563020a1.8c4ca","type":"returnFailure","name":"BREAK","xml":"<return status='failure'>\n","comments":"","x":4166.0475425720215,"y":1723.8208665847778,"z":"c6a6763c.4a8938","wires":[]},{"id":"3a46ead4.8020a6","type":"set","name":"set l3-network-id = -1","xml":"<set>\n<parameter name='l3-network-id' value='-1' />\n","comments":"","x":1509.047592163086,"y":1567.1545162200928,"z":"c6a6763c.4a8938","wires":[]},{"id":"f34debda.3059a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4003.047538757324,"y":1705.4875717163086,"z":"c6a6763c.4a8938","wires":[["d88a343b.538ab8","563020a1.8c4ca"]]},{"id":"d88a343b.538ab8","type":"set","name":"set l3-network-id","xml":"<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />","comments":"","x":4192.714241027832,"y":1682.1541051864624,"z":"c6a6763c.4a8938","wires":[]},{"id":"6e76e719.77b5f8","type":"switchNode","name":"switch l3-network-id","xml":"<switch test='`$l3-network-id`'>\n","comments":"","outputs":1,"x":1497.7142486572266,"y":1886.8216562271118,"z":"c6a6763c.4a8938","wires":[["cc4e6c44.94099"]]},{"id":"cc4e6c44.94099","type":"outcome","name":"-1","xml":"<outcome value='-1'>\n","comments":"","outputs":1,"x":1667.714199066162,"y":1886.8214120864868,"z":"c6a6763c.4a8938","wires":[["aaf27a6f.92dd38"]]},{"id":"aaf27a6f.92dd38","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=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n","comments":"","x":1816.0475616455078,"y":1886.8215494155884,"z":"c6a6763c.4a8938","wires":[]},{"id":"6e1e86e4.fc0878","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2282.452423095703,"y":1663.729115486145,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"67f6e44a.8c755c","type":"outcome","name":"Pending Create","xml":"<outcome value='Pending Create'>\n","comments":"","outputs":1,"x":2131.6189918518066,"y":1622.645486831665,"z":"c6a6763c.4a8938","wires":[["1d748942.552097"]]},{"id":"1d748942.552097","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2284.8330841064453,"y":1622.4223642349243,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"fbab1088.c3bf6","type":"set","name":"set network-index = 0","xml":"<set>\n<parameter name='network-index' value='0' />\n","comments":"","x":1060.7978820800781,"y":1473.381046295166,"z":"c6a6763c.4a8938","wires":[]},{"id":"47540555.ce149c","type":"comment","name":"NO SUPPORT for network-macs","info":"","comments":"","x":248.52376556396484,"y":1477.5233364105225,"z":"c6a6763c.4a8938","wires":[]},{"id":"dc87a0e1.830c7","type":"comment","name":"NO SUPPORT for floating-ip[] and floating-ip-v6[]","info":"","comments":"","x":298.5237045288086,"y":1507.523419380188,"z":"c6a6763c.4a8938","wires":[]},{"id":"866effdc.31e09","type":"comment","name":"NO SUPPORT for interface-route-prefixes[]","info":"","comments":"","x":280.52376556396484,"y":1538.1900882720947,"z":"c6a6763c.4a8938","wires":[]},{"id":"77294c8e.f5ef34","type":"comment","name":"VNF-ASSIGNMENTS.VNF-NETWORKS[ ]","info":"","comments":"","x":1153.5714416503906,"y":1685.2971000671387,"z":"c6a6763c.4a8938","wires":[]},{"id":"a717d2eb.33e0d","type":"comment","name":"No support of vnf-networks[].subnet-id and subnet-name in 1707","info":"","comments":"","x":1624.5241203308105,"y":2031.9880800247192,"z":"c6a6763c.4a8938","wires":[]},{"id":"6bc6c778.aeb9b8","type":"comment","name":"Find l3-network with matching aic-cloud-region","info":"","comments":"","x":2675.833526611328,"y":1665.0827531814575,"z":"c6a6763c.4a8938","wires":[]},{"id":"d09a49ef.7c1908","type":"switchNode","name":"switch ipv4-ip-version","xml":"<switch test='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-ip-version`'>\n","comments":"","outputs":1,"x":1421.7381134033203,"y":2356.749324798584,"z":"c6a6763c.4a8938","wires":[["672a7280.55091c","31643f78.a77a6"]]},{"id":"78ac8019.a7f14","type":"set","name":"set vm-networks-index to -1","xml":"<set>\n<parameter name='vm-networks-index' value='-1' />\n\n","comments":"","x":1831.2617378234863,"y":2314.749429702759,"z":"c6a6763c.4a8938","wires":[]},{"id":"672a7280.55091c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1598.4046325683594,"y":2314.7494649887085,"z":"c6a6763c.4a8938","wires":[["78ac8019.a7f14"]]},{"id":"31643f78.a77a6","type":"other","name":"ipv4","xml":"<outcome value='ipv4'>\n","comments":"","outputs":1,"x":1603.1665840148926,"y":2409.7016077041626,"z":"c6a6763c.4a8938","wires":[["5853f915.b367d8"]]},{"id":"2cc28b35.b1b3d4","type":"set","name":"set vm-networks-index to 0","xml":"<set>\n<parameter name='vm-networks-index' value='0' />\n","comments":"","x":2001.7378463745117,"y":2362.225468635559,"z":"c6a6763c.4a8938","wires":[]},{"id":"5853f915.b367d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1764.3570594787598,"y":2409.0350732803345,"z":"c6a6763c.4a8938","wires":[["2cc28b35.b1b3d4","a3fe56e9.bbd588","f65ee3e0.f68a8"]]},{"id":"a3fe56e9.bbd588","type":"set","name":"set vm-networkls[].use-dhcp, ip-count","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-use-dhcp`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-count`' />","comments":"","x":2034.2142486572266,"y":2409.1304264068604,"z":"c6a6763c.4a8938","wires":[]},{"id":"98a1c0da.3df17","type":"switchNode","name":"switch ipv6-ip-version","xml":"<switch test='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-ip-version`'>\n","comments":"","outputs":1,"x":1418.880973815918,"y":2556.9874448776245,"z":"c6a6763c.4a8938","wires":[["3c446888.3e39b8","eb49d457.dd4f28"]]},{"id":"3c446888.3e39b8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1597.6904678344727,"y":2527.225256919861,"z":"c6a6763c.4a8938","wires":[["e181069f.a9af18"]]},{"id":"eb49d457.dd4f28","type":"other","name":"ipv6","xml":"<outcome value='ipv6'>\n","comments":"","outputs":1,"x":1599.1190223693848,"y":2591.5108137130737,"z":"c6a6763c.4a8938","wires":[["5fb2c0ca.155f3"]]},{"id":"ea162272.2b02b","type":"set","name":"increment vm-networks-index","xml":"<set>\n<parameter name='vm-networks-index' value='`$network-information-index + 1`' />\n","comments":"","x":2004.8331146240234,"y":2543.034843444824,"z":"c6a6763c.4a8938","wires":[]},{"id":"5fb2c0ca.155f3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1754.3571815490723,"y":2590.5585527420044,"z":"c6a6763c.4a8938","wires":[["ea162272.2b02b","aaf6159f.3f4398","e09776e2.09fce8"]]},{"id":"e181069f.a9af18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1740.3570976257324,"y":2526.5588750839233,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"db2dfaa0.2e4a18","type":"outcome","name":"-1","xml":"<outcome value='-1'>","comments":"","outputs":1,"x":1641.0713024139404,"y":2779.3679761886597,"z":"c6a6763c.4a8938","wires":[["a57ad8d4.649d58"]]},{"id":"9a4fb538.0f0488","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1640.8332653045654,"y":2825.3202905654907,"z":"c6a6763c.4a8938","wires":[["fc11d026.29d27"]]},{"id":"a57ad8d4.649d58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1777.7380180358887,"y":2779.701636314392,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"fc11d026.29d27","type":"set","name":"increment vm-networks-index","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length'\n value='`$vm-networks-index + 1`' />\n","comments":"","x":1848.4046325683594,"y":2825.701428413391,"z":"c6a6763c.4a8938","wires":[]},{"id":"aaf6159f.3f4398","type":"set","name":"set vm-networks[].use-dhcp, ip-count","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-use-dhcp`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-count`' />","comments":"","x":2029.8809967041016,"y":2590.233787536621,"z":"c6a6763c.4a8938","wires":[]},{"id":"4fd57938.fd6288","type":"switchNode","name":"switch use-dhcp","xml":"<switch test='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp`'>\n","comments":"","outputs":1,"x":1145.7619895935059,"y":2980.401258468628,"z":"c6a6763c.4a8938","wires":[["f5b2b31d.2316a"]]},{"id":"f5b2b31d.2316a","type":"outcome","name":"N","xml":"<outcome value='N'>\n","comments":"","outputs":1,"x":1327.7619018554688,"y":2979.972861289978,"z":"c6a6763c.4a8938","wires":[["d199b2c.f491e5"]]},{"id":"e57a3f7a.8c001","type":"execute","name":"call EIPAM assignIPAddress","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin\" method=\"assignIPAddress\">","comments":"","outputs":1,"x":2089.4402961730957,"y":3168.976450443268,"z":"c6a6763c.4a8938","wires":[["55962543.83bbfc"]]},{"id":"55962543.83bbfc","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":2304.8213539123535,"y":3168.7030835151672,"z":"c6a6763c.4a8938","wires":[["ce019ac0.7cad08"]]},{"id":"d05f74bb.e28858","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 new address blocks from EIPAM.\" />\n","comments":"","x":2639.9998893737793,"y":3213.3460116386414,"z":"c6a6763c.4a8938","wires":[]},{"id":"19d92b6.c89dcd5","type":"comment","name":"Need VF_MODULE_MODEL availability_zone_count and ecomp_generated_vm_assignments","info":"","comments":"","x":525.5951919555664,"y":237.46378231048584,"z":"c6a6763c.4a8938","wires":[]},{"id":"31be1c0b.e4a514","type":"for","name":"for each cloud-region availability zone","xml":"<for index='az-index' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n","comments":"","outputs":1,"x":911.3571243286133,"y":736.2734155654907,"z":"c6a6763c.4a8938","wires":[["644e35b7.02498c"]]},{"id":"7d5d3a7e.13dfa4","type":"set","name":"set availability-zone","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'\n value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />\n","comments":"","x":1369.0238571166992,"y":737.0353193283081,"z":"c6a6763c.4a8938","wires":[]},{"id":"644e35b7.02498c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1165.023567199707,"y":736.3689994812012,"z":"c6a6763c.4a8938","wires":[["7d5d3a7e.13dfa4"]]},{"id":"811225ec.4649e8","type":"switchNode","name":"switch AAI availability-zone_length","xml":"<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n","comments":"","outputs":1,"x":901.4521408081055,"y":690.1785621643066,"z":"c6a6763c.4a8938","wires":[["fbe8d942.a860d8"]]},{"id":"fbe8d942.a860d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1120.0235595703125,"y":689.7499713897705,"z":"c6a6763c.4a8938","wires":[["c01d6a9b.970a38"]]},{"id":"c01d6a9b.970a38","type":"set","name":"set availability-zone_length to 0","xml":"<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n","comments":"","x":1357.1665267944336,"y":689.1784152984619,"z":"c6a6763c.4a8938","wires":[]},{"id":"68aa1809.492868","type":"comment","name":"VNF-ASSIGNMENTS.AVAILABILITY-ZONES[ ]","info":"","comments":"","x":315.59522247314453,"y":593.1780614852905,"z":"c6a6763c.4a8938","wires":[]},{"id":"8300a18c.5a56","type":"comment","name":"VNF-ASSIGNMENTS.VNF-NETWORKS[ ]","info":"","comments":"","x":291.3095474243164,"y":761.3210287094116,"z":"c6a6763c.4a8938","wires":[]},{"id":"3a48a7be.8af1b8","type":"comment","name":"VNF-ASSIGNMENTS.VNF-VMS[ ].VM-NETWORKS[ ]","info":"","comments":"","x":1026.881004333496,"y":2339.368064880371,"z":"c6a6763c.4a8938","wires":[]},{"id":"3b82b435.6743cc","type":"set","name":"set vm-networks-index to -1","xml":"<set>\n<parameter name='vm-networks-index' value='-1' />\n\n","comments":"","x":1440.2141647338867,"y":2265.082242012024,"z":"c6a6763c.4a8938","wires":[]},{"id":"e76ba29b.dbd2f","type":"switchNode","name":"switch vm-networks-index","xml":"<switch test='`$vm-networks-index`'>\n","comments":"","outputs":1,"x":1422.7379455566406,"y":2802.7012300491333,"z":"c6a6763c.4a8938","wires":[["db2dfaa0.2e4a18","9a4fb538.0f0488"]]},{"id":"39f5f08d.dbc63","type":"switchNode","name":"switch plans[].address-family","xml":"<switch test='`$eipam-ip-block.plans[$plans-index].address-family`'>\n","comments":"","outputs":1,"x":2818.7937927246094,"y":3474.15486907959,"z":"c6a6763c.4a8938","wires":[["51a03202.e47d3c","70d3e88f.a07718"]]},{"id":"51a03202.e47d3c","type":"other","name":"ipv4","xml":"<outcome value='ipv4'>\n","comments":"","outputs":1,"x":3029.924644470215,"y":3448.4643754959106,"z":"c6a6763c.4a8938","wires":[["34d01025.7d17"]]},{"id":"70d3e88f.a07718","type":"other","name":"ipv6","xml":"<outcome value='ipv6'>\n","comments":"","outputs":1,"x":3030.459800720215,"y":3499.2737035751343,"z":"c6a6763c.4a8938","wires":[["c5666e02.07c39"]]},{"id":"34d01025.7d17","type":"set","name":"set vm-networks[].network-ips[].ip-address","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips[$ip-count-index].ip-address'\n value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' />","comments":"","x":3286.6750144958496,"y":3447.964214324951,"z":"c6a6763c.4a8938","wires":[]},{"id":"c5666e02.07c39","type":"set","name":"set vm-networks[].network-ips-v6[].ip-address-ipv6","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips-v6[$ip-count-index].ip-address-ipv6'\n value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' />","comments":"","x":3311.2576599121094,"y":3498.964376449585,"z":"c6a6763c.4a8938","wires":[]},{"id":"840dab74.e88378","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1811.4284591674805,"y":2979.1546588540077,"z":"c6a6763c.4a8938","wires":[["8a748fef.e9c92","464cbd36.e681d4","ec3340b.4bdcfc","e57a3f7a.8c001","1bbc0c5c.b5a494","817518c2.6f35c8","a8d8485a.c01bd8"]]},{"id":"8a748fef.e9c92","type":"set","name":"set eipam aic-cloud-region, client-key, subnetpool-id","xml":"<set>\n<parameter name='tmp.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`' />\n<parameter name='tmp.client-key'\n value='`$generate-unique-name-output.generated-name`' />\n<parameter name='tmp.subnetpool-id'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].extcp-subnetpool-id`' />\n<parameter name='network-topology-operation-input.network-information.network-id' \n\tvalue = 'NOT_APPLICABLE' />\n<parameter name='service-data.service-information.service-type' \n\tvalue = 'NOT_APPLICABLE' />\n","comments":"","x":2163.190719604492,"y":3073.869504928589,"z":"c6a6763c.4a8938","wires":[]},{"id":"ec3340b.4bdcfc","type":"call","name":"call GENERIC-RESOURCE-API:generate-unique-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n","comments":"","outputs":1,"x":2174.404983520508,"y":3026.591185569763,"z":"c6a6763c.4a8938","wires":[["503f07b6.8177c8"]]},{"id":"503f07b6.8177c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2465.357437133789,"y":3026.4487466812134,"z":"c6a6763c.4a8938","wires":[["a1d0b29.32de85"]]},{"id":"464cbd36.e681d4","type":"set","name":"set variables for generating unique name","xml":"<set>\n<parameter name='generate-unique-name-input.index-table-name' value='EIPAM_CLIENT_KEY_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vnf_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNFAPI_CLIENT_KEY' />\n<parameter name='generate-unique-name-input.prefix'\n\tvalue=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name + ':' +\n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-type + ':' +\n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-role + ':'`\" />\n<parameter name='generate-unique-name-input.index-length' value='2' />\n\n<!-- zrdm3mmex57_vlc:vlc:sctp_a:01 -->","comments":"","x":2130.023910522461,"y":2979.019688606262,"z":"c6a6763c.4a8938","wires":[]},{"id":"a1d0b29.32de85","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=\"`$generate-unique-name-output.error-message`\" />\n","comments":"","x":2621.7858657836914,"y":3026.305785179138,"z":"c6a6763c.4a8938","wires":[]},{"id":"d8725c39.89566","type":"get-resource","name":"get-resource VFC_MODEL","xml":"<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\n pfx='db.vfc-model'>\n\n","comments":"","outputs":1,"x":1079.9999771118164,"y":1000.7376537322998,"z":"c6a6763c.4a8938","wires":[["783971a3.9819a","282c150e.65d37a"]]},{"id":"b3b0020d.74ce7","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=\"`'No entries found in VFC_MODEL table for customization UUID ' + $db.vf-module-to-vfc-mapping[$db-vm-index].vfc-customization-uuid`\" />\n","comments":"","x":1476.4283256530762,"y":1025.1660461425781,"z":"c6a6763c.4a8938","wires":[]},{"id":"783971a3.9819a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1302.7855949401855,"y":980.1184043884277,"z":"c6a6763c.4a8938","wires":[["b7066615.e7f238"]]},{"id":"282c150e.65d37a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1310.3570251464844,"y":1025.4041175842285,"z":"c6a6763c.4a8938","wires":[["b3b0020d.74ce7"]]},{"id":"b7066615.e7f238","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 reading VFC_MODEL table\" />\n","comments":"","x":1476.7855262756348,"y":980.2613048553467,"z":"c6a6763c.4a8938","wires":[]},{"id":"8c428202.a4584","type":"set","name":"set vnf-vms[] data","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-type'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-type`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />\n\n","comments":"","x":1049.2976531982422,"y":1148.356819152832,"z":"c6a6763c.4a8938","wires":[]},{"id":"96d35d.16f99ca","type":"for","name":"for each vm-count","xml":"<for index='vm-index' start='0' end='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' >\n","comments":"","outputs":1,"x":1051.6307220458984,"y":1212.6098346710205,"z":"c6a6763c.4a8938","wires":[["ce61047d.6b6798"]]},{"id":"9b33cb2.cd1cb38","type":"call","name":"call GENERIC-RESOURCE-API:generate-unique-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n","comments":"","outputs":1,"x":1584.0593452453613,"y":1240.2289810180664,"z":"c6a6763c.4a8938","wires":[["e1a23a4b.e7ad28","645ecf24.2a316"]]},{"id":"e1a23a4b.e7ad28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1879.7736333211265,"y":1213.0862436294556,"z":"c6a6763c.4a8938","wires":[["64093666.6d3df8"]]},{"id":"645ecf24.2a316","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1883.1069831848145,"y":1264.7528867721558,"z":"c6a6763c.4a8938","wires":[["d1a2193e.7c37a8"]]},{"id":"9a519830.138b58","type":"set","name":"set variables for generating unique name","xml":"<set>\n<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vm_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNFAPI_VM_INSTANCE' />\n<parameter name='x' value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\" />\n<parameter name='y' value=\"`$db.vfc-model.nfc-naming-code`\" />\n<parameter name='generate-unique-name-input.prefix' value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name + $db.vfc-model.nfc-naming-code`\" />\n<parameter name='generate-unique-name-input.index-length' value='3' />\n","comments":"","x":1540.726058959961,"y":1188.562307357788,"z":"c6a6763c.4a8938","wires":[]},{"id":"d1a2193e.7c37a8","type":"set","name":"set generated name","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' value='`$generate-unique-name-output.generated-name`' />\n","comments":"","x":2067.630699157715,"y":1264.228904724121,"z":"c6a6763c.4a8938","wires":[]},{"id":"64093666.6d3df8","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=\"`$generate-unique-name-output.error-message`\" />\n","comments":"","x":2047.630746205648,"y":1212.5147552490234,"z":"c6a6763c.4a8938","wires":[]},{"id":"ce61047d.6b6798","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1258.0356636047363,"y":1212.2527389526367,"z":"c6a6763c.4a8938","wires":[["9a519830.138b58","9b33cb2.cd1cb38"]]},{"id":"76c54fa9.38022","type":"switchNode","name":"switch ecomp-generated-naming == 'Y'","xml":"<switch test=\"$db.vfc-model.ecomp-generated-naming == 'Y'\">\n","comments":"","outputs":1,"x":1115.9403839111328,"y":1080.4993133544922,"z":"c6a6763c.4a8938","wires":[["53ce2381.2090fc"]]},{"id":"53ce2381.2090fc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1347.6069946289062,"y":1080.4989442825317,"z":"c6a6763c.4a8938","wires":[["63254101.50f2a"]]},{"id":"63254101.50f2a","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=\"`'ECOMP generated naming is not Y for VFC customization UUID ' + $db.vf-module-to-vfc-mapping[$db-vm-index].vfc-customization-uuid`\" />\n","comments":"","x":1494.2737350463867,"y":1079.8323993682861,"z":"c6a6763c.4a8938","wires":[]},{"id":"46a48b56.e456d4","type":"comment","name":"1707 assumes same ipv4-ip-count and ipv6-ip-count the same","info":"","comments":"","x":1197.7381286621094,"y":2927.035418510437,"z":"c6a6763c.4a8938","wires":[]},{"id":"9226d6f7.945608","type":"for","name":"for each network-role in vm-networks","xml":"<for index='network-role-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length`' >\n","comments":"","outputs":1,"x":884.8809127807617,"y":2980.5825901031494,"z":"c6a6763c.4a8938","wires":[["4fd57938.fd6288"]]},{"id":"ec67f8aa.5a4cc8","type":"comment","name":"Set vnf-vms[]","info":"","comments":"","x":842.0832824707031,"y":1064.487636566162,"z":"c6a6763c.4a8938","wires":[]},{"id":"3112f18c.d7febe","type":"set","name":"set vm-names_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />\n","comments":"","x":1062.547519683838,"y":1289.1103086471558,"z":"c6a6763c.4a8938","wires":[]},{"id":"b1e903e3.a9656","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":620.3094863891602,"y":2980.130418777466,"z":"c6a6763c.4a8938","wires":[["9226d6f7.945608"]]},{"id":"a8d8485a.c01bd8","type":"for","name":"for plans in eipam-ip-block.plans","xml":"<for index='plans-index' start='0' end='`$eipam-ip-block.plans_length`' >\n","comments":"","outputs":1,"x":2100.142868041992,"y":3394.5238189697266,"z":"c6a6763c.4a8938","wires":[["d21eb1a7.a1a34"]]},{"id":"1bbc0c5c.b5a494","type":"switchNode","name":"switch eipam-ip-block.plans_length","xml":"<switch test='`$eipam-ip-block.plans_length`'>\n","comments":"","outputs":1,"x":2109.190517425537,"y":3305.904595851898,"z":"c6a6763c.4a8938","wires":[["c1c303a7.b62b9","69212587.efd27c"]]},{"id":"c1c303a7.b62b9","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2376.404853820801,"y":3281.725981235504,"z":"c6a6763c.4a8938","wires":[["66ca4c22.7c8a04"]]},{"id":"e1bf439.0dee4c","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.plans[] is null.\" />\n","comments":"","x":2781.1190605163574,"y":3303.2259278297424,"z":"c6a6763c.4a8938","wires":[]},{"id":"76c321b0.d733e","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.plans['+ $plans-index +'].requests[] is null.'`\" />\n","comments":"","x":3081.06339263916,"y":3397.162829399109,"z":"c6a6763c.4a8938","wires":[]},{"id":"304e678e.946e88","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2739.7777404785156,"y":3375.2341175079346,"z":"c6a6763c.4a8938","wires":[["71155dea.d5c054"]]},{"id":"1c8f57b8.7e9de8","type":"switchNode","name":"switch requests_length","xml":"<switch test='`$eipam-ip-block.plans[$plans-index].requests_length`'>\n","comments":"","outputs":1,"x":2559.2063217163086,"y":3394.912588119507,"z":"c6a6763c.4a8938","wires":[["304e678e.946e88","ad0e3173.986be"]]},{"id":"ce019ac0.7cad08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2466.5833473205566,"y":3168.6545939445496,"z":"c6a6763c.4a8938","wires":[["d05f74bb.e28858","2e3396bb.a9dc1a"]]},{"id":"69212587.efd27c","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":2377.476261138916,"y":3328.154568195343,"z":"c6a6763c.4a8938","wires":[["66ca4c22.7c8a04"]]},{"id":"66ca4c22.7c8a04","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2572.0833702087402,"y":3303.4046387672424,"z":"c6a6763c.4a8938","wires":[["e1bf439.0dee4c","2e3396bb.a9dc1a"]]},{"id":"71155dea.d5c054","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2892.5278244018555,"y":3397.6270179748535,"z":"c6a6763c.4a8938","wires":[["76c321b0.d733e","2e3396bb.a9dc1a"]]},{"id":"ad0e3173.986be","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":2740.277820587158,"y":3419.1270141601562,"z":"c6a6763c.4a8938","wires":[["71155dea.d5c054"]]},{"id":"53449ad4.088df4","type":"for","name":"for each rqst in requests","xml":"<for index='rqst-index' start='0' end='`$eipam-ip-block.plans[$plans-index].requests_length`' >\n","comments":"","outputs":1,"x":2563.722213745117,"y":3473.987840652466,"z":"c6a6763c.4a8938","wires":[["39f5f08d.dbc63"]]},{"id":"d21eb1a7.a1a34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2347.611099243164,"y":3394.87654876709,"z":"c6a6763c.4a8938","wires":[["1c8f57b8.7e9de8","53449ad4.088df4"]]},{"id":"7f727408.3c054c","type":"set","name":"set vnf-networks_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-networks_length'\n value='`$network-index`' />\n","comments":"","x":1062.5597381591797,"y":2092.975839614868,"z":"c6a6763c.4a8938","wires":[]},{"id":"946d1e34.4231","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":672.1666793823242,"y":712.3209276199341,"z":"c6a6763c.4a8938","wires":[["811225ec.4649e8","31be1c0b.e4a514"]]},{"id":"2e3396bb.a9dc1a","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":3079.9761543273926,"y":3168.3689274787903,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"817518c2.6f35c8","type":"call","name":"call: eipam-mobility-ip-assignment","xml":"<call module='VNF-API' rpc='eipam-mobility-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":2107.4361000061035,"y":3120.408854007721,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"bf9d4319.1481e","type":"set","name":"copy input data","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" />","comments":"","x":688.7737045288086,"y":513.5952196121216,"z":"c6a6763c.4a8938","wires":[]},{"id":"317a074d.bd4138","type":"get-resource","name":"get-resource VFC_TO_NETWORK_ROLE_MAPPING","xml":"<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\n pfx='db.vfc-to-network-role-mapping[]'>\n\n","comments":"","outputs":1,"x":1161.6666259765625,"y":1354.999912261963,"z":"c6a6763c.4a8938","wires":[["5622a9a8.299278","400145c8.a5820c"]]},{"id":"5622a9a8.299278","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1448.8808288574219,"y":1335.3807592391968,"z":"c6a6763c.4a8938","wires":[["caac1149.1f034"]]},{"id":"400145c8.a5820c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1457.4522590637207,"y":1379.6664724349976,"z":"c6a6763c.4a8938","wires":[["d6f31097.71144"]]},{"id":"caac1149.1f034","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 reading VFC_TO_NETWORK_ROLE_MAPPING table\" />\n","comments":"","x":1623.880760192871,"y":1334.5236597061157,"z":"c6a6763c.4a8938","wires":[]},{"id":"d6f31097.71144","type":"set","name":"set vfc-to-network-role-mapping length to 0","xml":"<set>\n<parameter name='db.vfc-to-network-role-mapping_length' value='0' />\n","comments":"","x":1720.857078552246,"y":1379.6748628616333,"z":"c6a6763c.4a8938","wires":[]},{"id":"e09776e2.09fce8","type":"set","name":"set local ip-version","xml":"<set>\n<parameter name='tmp.local.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-version'\n value='ipv6' />\n","comments":"","x":1974.5473403930664,"y":2637.082179069519,"z":"c6a6763c.4a8938","wires":[]},{"id":"f65ee3e0.f68a8","type":"set","name":"set local.ip-version","xml":"<set>\n<parameter name='tmp.local.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-version'\n value='ipv4' /> ","comments":"","x":1979.547462463379,"y":2455.749161720276,"z":"c6a6763c.4a8938","wires":[]},{"id":"bca0b7c7.7693f8","type":"set","name":"set vm-networks[].network-role","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-role'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].network-role`' />","comments":"","x":1447.142837524414,"y":2689.9998846054077,"z":"c6a6763c.4a8938","wires":[]},{"id":"d199b2c.f491e5","type":"for","name":"for ip-count-index in ip-count","xml":"<for index='ip-count-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count`'>","comments":"","outputs":1,"x":1555.333152770996,"y":2979.66695022583,"z":"c6a6763c.4a8938","wires":[["840dab74.e88378"]]}]
+[{"id":"a3f3d39b.f78d9","type":"dgstart","name":"DGSTART","outputs":1,"x":221.66665649414062,"y":78.59521961212158,"z":"c6a6763c.4a8938","wires":[["7618c6cb.6da728"]]},{"id":"7618c6cb.6da728","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":427.4523696899414,"y":78.33333206176758,"z":"c6a6763c.4a8938","wires":[["745c4044.c7543"]]},{"id":"745c4044.c7543","type":"method","name":"method vnf-topology-automated-assign-vfmodule","xml":"<method rpc='vnf-topology-automated-assign-vfmodule' mode='sync'>\n","comments":"","outputs":1,"x":343.95240020751953,"y":137.34521961212158,"z":"c6a6763c.4a8938","wires":[["d060a59c.64f7d8"]]},{"id":"658e22f0.e8f0ac","type":"comment","name":"vf-module-topology-operation-assign","info":"","comments":"","x":941.9877777099609,"y":114.07091808319092,"z":"c6a6763c.4a8938","wires":[]},{"id":"89188f30.f0547","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":705.1904525756836,"y":196.02378845214844,"z":"c6a6763c.4a8938","wires":[["d088b2f2.8739a","f45b77de.439698"]]},{"id":"d088b2f2.8739a","type":"outcome","name":"VNFActivateRequest","xml":"<outcome value='VNFActivateRequest'>\n","comments":"","outputs":1,"x":967.2380676269531,"y":173.16667461395264,"z":"c6a6763c.4a8938","wires":[["b8e0d10d.97964"]]},{"id":"f45b77de.439698","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":923.904712677002,"y":218.54766368865967,"z":"c6a6763c.4a8938","wires":[["5cacb441.fde0cc"]]},{"id":"b8e0d10d.97964","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1157.0952320098877,"y":173.16670608520508,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"5cacb441.fde0cc","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=\"If svc-action is 'assign' then request-action must be 'VNFActivateRequest'\" />\n","comments":"","x":1175.9047203063965,"y":218.88097620010376,"z":"c6a6763c.4a8938","wires":[]},{"id":"8f60b4ac.2c4328","type":"get-resource","name":"get-resource VF_MODULE_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\n pfx='db.vf-module-model'>\n\n","comments":"","outputs":1,"x":752.5237197875977,"y":287.16673851013184,"z":"c6a6763c.4a8938","wires":[["13d1cb9d.f21ef4","890a29b.28c78d8"]]},{"id":"d9dd7137.f2e6f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"`'No model found for VF module customization UUID ' + $vnf-topology-operation-input.vnf-request-information.model-customization-uuid`\" />\n","comments":"","x":1193.9521408081055,"y":311.59521102905273,"z":"c6a6763c.4a8938","wires":[]},{"id":"13d1cb9d.f21ef4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1018.3094100952148,"y":267.54756927490234,"z":"c6a6763c.4a8938","wires":[["88d4d30f.afb0f"]]},{"id":"890a29b.28c78d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1026.8808403015137,"y":311.8332824707031,"z":"c6a6763c.4a8938","wires":[["d9dd7137.f2e6f"]]},{"id":"88d4d30f.afb0f","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 reading VF_MODULE_MODEL table\" />\n","comments":"","x":1193.309341430664,"y":266.6904697418213,"z":"c6a6763c.4a8938","wires":[]},{"id":"d060a59c.64f7d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":281.66663360595703,"y":2689.5951585769653,"z":"c6a6763c.4a8938","wires":[["89188f30.f0547","8f60b4ac.2c4328","311746e4.0a155a","60df562d.be7488","bc2c72de.8ea2e","af03ef4d.70e9e","b00f7262.1c094","74a8a4cc.6a37bc","50a525a1.ba695c","1c0d1734.2252b9","d4c6f015.e3386","b1e903e3.a9656","f95ebeb7.10204","946d1e34.4231","bf9d4319.1481e"]]},{"id":"92ef08a2.2df308","type":"set","name":"set aic-clli","xml":"<set>\n<parameter name='tmp.aic-clli' value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n","comments":"","x":1596.0950164794922,"y":572.0712900161743,"z":"c6a6763c.4a8938","wires":[]},{"id":"311746e4.0a155a","type":"get-resource","name":"get-resource cloud region","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = 'Rackspace' AND \n\t\t cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-information.aic-cloud-region\"\n pfx='aai.cloud-region' local-only='false' >\n\n","comments":"","outputs":1,"x":719.6428527832031,"y":389.52400493621826,"z":"c6a6763c.4a8938","wires":[["c986ee76.ee16","d962828a.b478c"]]},{"id":"d962828a.b478c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":933.889045715332,"y":407.67486095428467,"z":"c6a6763c.4a8938","wires":[["e920bb81.b40cb8"]]},{"id":"e920bb81.b40cb8","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 retrieving cloud region from AAI\" />\n","comments":"","x":1108.8890190124512,"y":407.6748971939087,"z":"c6a6763c.4a8938","wires":[]},{"id":"c986ee76.ee16","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":942.8176422119141,"y":365.9605941772461,"z":"c6a6763c.4a8938","wires":[["3f933d3b.567172"]]},{"id":"3f933d3b.567172","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"`'aic-cloud-region,'+ $vnf-topology-operation-input.vnf-request-information.aic-cloud-region + ' not found in AAI'`\" />\n","comments":"","x":1109.166919708252,"y":365.2661714553833,"z":"c6a6763c.4a8938","wires":[]},{"id":"60df562d.be7488","type":"get-resource","name":"get-resource VF_MODULE_TO_VFC_MAPPING","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\n pfx='db.vf-module-to-vfc-mapping[]'>\n\n","comments":"","outputs":1,"x":799.4524383544922,"y":844.142825126648,"z":"c6a6763c.4a8938","wires":[["d338b11f.a37bd","2618c557.dded6a"]]},{"id":"d338b11f.a37bd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1083.8095703125,"y":826.2379236221313,"z":"c6a6763c.4a8938","wires":[["2f952fcf.2a5da"]]},{"id":"2618c557.dded6a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1092.3810005187988,"y":870.5236368179321,"z":"c6a6763c.4a8938","wires":[["7b10c7c8.b3c7e8"]]},{"id":"2f952fcf.2a5da","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 reading VF_MODULE_TO_VFC_MAPPING table\" />\n","comments":"","x":1258.8095016479492,"y":825.3808240890503,"z":"c6a6763c.4a8938","wires":[]},{"id":"bc2c72de.8ea2e","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >\n","comments":"","outputs":1,"x":668.571418762207,"y":1739.1430168151855,"z":"c6a6763c.4a8938","wires":[["ccbb8f9.a6c077"]]},{"id":"ccbb8f9.a6c077","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":747.6190719604492,"y":1804.428677558899,"z":"c6a6763c.4a8938","wires":[["33dc2f21.83919","52d8daec.769304","fbab1088.c3bf6","d8725c39.89566","76c54fa9.38022","8c428202.a4584","96d35d.16f99ca","7f727408.3c054c","3112f18c.d7febe","317a074d.bd4138"]]},{"id":"af03ef4d.70e9e","type":"set","name":"set vnf-vms_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'\n value='`$db.vf-module-to-vfc-mapping_length`' />\n","comments":"","x":705.9999618530273,"y":910.0477952957153,"z":"c6a6763c.4a8938","wires":[]},{"id":"33dc2f21.83919","type":"for","name":"for each network-role","xml":"<for index='network-role-index' start='0' end='`$db.vfc-to-network-role-mapping_length`' >\n","comments":"","outputs":1,"x":1058.0478515625,"y":1587.4918432235718,"z":"c6a6763c.4a8938","wires":[["57fcf630.bf5d88"]]},{"id":"b00f7262.1c094","type":"for","name":"for each cloud-region relationship","xml":"<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":746.1823654174805,"y":571.6021165847778,"z":"c6a6763c.4a8938","wires":[["17ad304.585b5d"]]},{"id":"17ad304.585b5d","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n","comments":"","outputs":1,"x":1012.8609085083008,"y":571.3520460128784,"z":"c6a6763c.4a8938","wires":[["aa25cb53.f74cc8"]]},{"id":"aa25cb53.f74cc8","type":"outcome","name":"complex","xml":"<outcome value='complex'>\n","comments":"","outputs":1,"x":1209.3252296447754,"y":571.7448682785034,"z":"c6a6763c.4a8938","wires":[["744bf544.60ac9c"]]},{"id":"3fb04830.758938","type":"execute","name":"split related-link","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='aai-uid-split' />\n <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\n <parameter name='regex' value='/' />\n","comments":"","outputs":1,"x":1613.4917297363281,"y":524.244912147522,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"744bf544.60ac9c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1400.0870895385742,"y":571.8402318954468,"z":"c6a6763c.4a8938","wires":[["3fb04830.758938","b8173b08.432cc8","92ef08a2.2df308"]]},{"id":"b8173b08.432cc8","type":"break","name":"break","xml":"<break>\n","comments":"","x":1590.0154724121094,"y":621.9592657089233,"z":"c6a6763c.4a8938","wires":[]},{"id":"52d8daec.769304","type":"set","name":"set vm-networks_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length' \n value='`$db.vfc-to-network-role-mapping_length`' />\n","comments":"","x":1068.1903991699219,"y":1417.9677104949951,"z":"c6a6763c.4a8938","wires":[]},{"id":"74a8a4cc.6a37bc","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":637.6190872192383,"y":2421.6335849761963,"z":"c6a6763c.4a8938","wires":[["1a33d1f3.8f6e4e"]]},{"id":"1a33d1f3.8f6e4e","type":"for","name":"for each network-role in vm-networks","xml":"<for index='network-role-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length`' >\n","comments":"","outputs":1,"x":911.1903839111328,"y":2421.6572647094727,"z":"c6a6763c.4a8938","wires":[["ba72b14b.2156"]]},{"id":"ba72b14b.2156","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1171.059455871582,"y":2421.466869354248,"z":"c6a6763c.4a8938","wires":[["d09a49ef.7c1908","98a1c0da.3df17","3b82b435.6743cc","e76ba29b.dbd2f","bca0b7c7.7693f8"]]},{"id":"50a525a1.ba695c","type":"set","name":"copy vnf-topology data","xml":"<set>\n<parameter name='service-data.vnf-topology-information.' value='tmp.vnf-topology.' />\n","comments":"","x":636.6309814453125,"y":3725.919508934021,"z":"c6a6763c.4a8938","wires":[]},{"id":"1c0d1734.2252b9","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfapi-vfmodule.log' />\n","comments":"","outputs":1,"x":603.2619247436523,"y":3789.8836212158203,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"d4c6f015.e3386","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":618.4761657714844,"y":3657.035722732544,"z":"c6a6763c.4a8938","wires":[["27442cf3.32c4a4"]]},{"id":"27442cf3.32c4a4","type":"for","name":"for each vm","xml":"<for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >\n","comments":"","outputs":1,"x":814.4761962890625,"y":3657.368730545044,"z":"c6a6763c.4a8938","wires":[["78a03f6e.8c578"]]},{"id":"537a79f4.c23ef8","type":"save","name":"save VIPR_CONFIGURATION","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"INSERT INTO VIPR_CONFIGURATION (vnf_id, \n\t\tvnf_name, \n\t\tecomp_service_instance_id, \n\t\tvm_name, \n\t\tcloud_region_id, \n\t\tcloud_owner) \n\tVALUES ( $service-data.vnf-id , \n\t\t$vnf-topology-operation-input.vnf-request-information.vnf-name , \n\t\t$vnf-topology-operation-input.service-information.service-instance-id , \n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name , \n\t\t$vnf-topology-operation.vnf-request-information.aic-cloud-region , \n\t\t'Rackspace')\" >","comments":"","outputs":1,"x":1222.1428985595703,"y":3680.0363807678223,"z":"c6a6763c.4a8938","wires":[["8ceacfdf.89fec"]]},{"id":"f06def73.72458","type":"comment","name":"Not a failure","info":"","comments":"","x":1742.1427993774414,"y":3680.036385536194,"z":"c6a6763c.4a8938","wires":[]},{"id":"8ceacfdf.89fec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1432.1428833007812,"y":3680.03653049469,"z":"c6a6763c.4a8938","wires":[["b7da4a1c.00f698"]]},{"id":"b7da4a1c.00f698","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=\"VNF-API.vnf-topology-automated-assign-vfmodule:REQID\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n","comments":"","outputs":1,"x":1575.4763259887695,"y":3680.036368370056,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"2d06b410.7028dc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1605.476448059082,"y":3631.368082046509,"z":"c6a6763c.4a8938","wires":[["db145896.d33078"]]},{"id":"3036cc89.607c34","type":"comment","name":"Not a failure","info":"","comments":"","x":2032.8095016479492,"y":3629.701904296875,"z":"c6a6763c.4a8938","wires":[]},{"id":"db145896.d33078","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=\"VNF-API.vnf-topology-automated-assign-vfmodule:REQID\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n","comments":"","outputs":1,"x":1855.4763832092285,"y":3631.368715286255,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"78a03f6e.8c578","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":982.8095893859863,"y":3656.3685750961304,"z":"c6a6763c.4a8938","wires":[["1bd6f906.202927","537a79f4.c23ef8"]]},{"id":"1bd6f906.202927","type":"delete","name":"delete any pre-existing records in VIPR_CONFIGURATION","xml":"<delete plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id\n AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id\n AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' >","comments":"","outputs":1,"x":1312.1429138183594,"y":3631.702714920044,"z":"c6a6763c.4a8938","wires":[["2d06b410.7028dc"]]},{"id":"7b10c7c8.b3c7e8","type":"set","name":"set vf-module-to-vfc-mapping length to 0","xml":"<set>\n<parameter name='db.vf-module-to-vfc-mapping_length' value='0' />\n","comments":"","x":1345.5952911376953,"y":870.1422996520996,"z":"c6a6763c.4a8938","wires":[]},{"id":"f95ebeb7.10204","type":"set","name":"set: service-data.vnf-id","xml":"<set>\n\t<parameter name=\"service-data.vnf-id\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n\t<parameter name=\"service-data.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\"/>\n\t<parameter name=\"service-data.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.service-type`\"/>\n","comments":"","x":711.4881820678711,"y":453.2098321914673,"z":"c6a6763c.4a8938","wires":[]},{"id":"57fcf630.bf5d88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1266.1906051635742,"y":1586.7732563018799,"z":"c6a6763c.4a8938","wires":[["bc92bded.ca455","fe584b6c.0233d8","3f0ffec2.1a9d32","d46dd161.dffe2","3a46ead4.8020a6","6e76e719.77b5f8"]]},{"id":"3f0ffec2.1a9d32","type":"get-resource","name":"get-resource l3-network","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-networks\" \n\t\tkey=\"l3-network.network-role = $db.vfc-to-network-role-mapping[$network-role-index].network-role\"\n pfx='aai.l3-network' local-only='false'\n>\n<!--\n\tAND l3-network.orchestration-status = 'active'\n\tAND cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region\n\tAND depth = 'ALL'\"\n-->\n","comments":"","outputs":1,"x":1517.7618255615234,"y":1505.2498626708984,"z":"c6a6763c.4a8938","wires":[["c1d211cb.4fae5","8d13a3a8.b532e"]]},{"id":"8d13a3a8.b532e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1723.8095397949219,"y":1527.3927021026611,"z":"c6a6763c.4a8938","wires":[["47da81c8.ba4d8"]]},{"id":"47da81c8.ba4d8","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 retrieving l3-network from AAI\" />\n","comments":"","x":1898.809513092041,"y":1527.3927383422852,"z":"c6a6763c.4a8938","wires":[]},{"id":"c1d211cb.4fae5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1732.738136291504,"y":1485.6784353256226,"z":"c6a6763c.4a8938","wires":[["8e067fe5.5fcdd"]]},{"id":"8e067fe5.5fcdd","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=\"`'No active l3-network found in AAI with cloud_region_id '\n + $vnf-topology-operation-input.vnf-request-information.aic-cloud-region + ' and network_role '\n + $db.vf-network-role-mapping[$network-role-index].network-role`\" />\n","comments":"","x":1899.0874137878418,"y":1484.9840126037598,"z":"c6a6763c.4a8938","wires":[]},{"id":"bc92bded.ca455","type":"set","name":"set tmp vnf-networks data","xml":"<set>\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-name\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].network-name`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-id\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].network-id`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].neutron-id\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].neutron-network-id`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].contrail-network-fqdn\" \n\tvalue=\"`$aai.l3-network.l3-network[$network-role-index].contrail-network-fqdn`\" />\n<parameter name=\"tmp.vnf-topology.vnf-assignments.vnf-networks[$network-index].network-role\" \n\tvalue=\"`$db.vfc-to-network-role-mapping[$network-role-index].network-role`\" />\n","comments":"","x":1515.4761657714844,"y":1934.3929119110107,"z":"c6a6763c.4a8938","wires":[]},{"id":"fe584b6c.0233d8","type":"set","name":"network-index++","xml":"<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n","comments":"","x":1487.9166984558105,"y":1982.785807609558,"z":"c6a6763c.4a8938","wires":[]},{"id":"82c167e.cb8f898","type":"for","name":"for each l3-network","xml":"<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n","comments":"","outputs":1,"x":1666.500144958496,"y":1664.9640560150146,"z":"c6a6763c.4a8938","wires":[["52452f43.5046b"]]},{"id":"52452f43.5046b","type":"switchNode","name":"switch orchestration-status","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n","comments":"","outputs":1,"x":1895.071346282959,"y":1664.5354833602905,"z":"c6a6763c.4a8938","wires":[["948e53a0.a1a4e","bb5bb136.9a8cb","67f6e44a.8c755c"]]},{"id":"948e53a0.a1a4e","type":"outcome","name":"Pending Delete","xml":"<outcome value='Pending Delete'>\n","comments":"","outputs":1,"x":2129.238311767578,"y":1663.952260017395,"z":"c6a6763c.4a8938","wires":[["6e1e86e4.fc0878"]]},{"id":"bb5bb136.9a8cb","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2102.9287872314453,"y":1706.868727684021,"z":"c6a6763c.4a8938","wires":[["3d98f5bc.ae345a"]]},{"id":"1b5cfc0a.780784","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n","comments":"","outputs":1,"x":2468.643138885498,"y":1706.440068244934,"z":"c6a6763c.4a8938","wires":[["18608e13.047c82"]]},{"id":"3d98f5bc.ae345a","type":"for","name":"for each relationship","xml":"<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":2272.928699493408,"y":1706.440104484558,"z":"c6a6763c.4a8938","wires":[["1b5cfc0a.780784"]]},{"id":"18608e13.047c82","type":"outcome","name":"cloud-region","xml":"<outcome value='cloud-region'>\n","comments":"","outputs":1,"x":2642.928779602051,"y":1706.0115146636963,"z":"c6a6763c.4a8938","wires":[["1a0b207b.b43a1"]]},{"id":"1a0b207b.b43a1","type":"for","name":"for each relationship data","xml":"<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n","comments":"","outputs":1,"x":2840.0714797973633,"y":1706.4399824142456,"z":"c6a6763c.4a8938","wires":[["ad33c2ce.a476"]]},{"id":"ad33c2ce.a476","type":"switchNode","name":"switch relationship-key","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n","comments":"","outputs":1,"x":3071.5000801086426,"y":1706.011357307434,"z":"c6a6763c.4a8938","wires":[["99e02cfa.c00ff"]]},{"id":"99e02cfa.c00ff","type":"outcome","name":"cloud-region.cloud-region-id","xml":"<outcome value='cloud-region.cloud-region-id'>\n","comments":"","outputs":1,"x":3312.928611755371,"y":1706.011462211609,"z":"c6a6763c.4a8938","wires":[["72f776c7.f8acb8"]]},{"id":"72f776c7.f8acb8","type":"switchNode","name":"switch relationship-value == cloud-region-id","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-information.aic-cloud-region`'>\n","comments":"","outputs":1,"x":3617.214530944824,"y":1705.8685178756714,"z":"c6a6763c.4a8938","wires":[["fb503bba.563f58"]]},{"id":"fb503bba.563f58","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3857.2145614624023,"y":1706.0114631652832,"z":"c6a6763c.4a8938","wires":[["f34debda.3059a8"]]},{"id":"d46dd161.dffe2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1464.7142944335938,"y":1733.8212022781372,"z":"c6a6763c.4a8938","wires":[["82c167e.cb8f898","7dc3e952.f9aa48"]]},{"id":"7dc3e952.f9aa48","type":"returnSuccess","name":"CATCH BREAK","xml":"<return status='success'>\n\n","comments":"","x":1656.047737121582,"y":1807.15438747406,"z":"c6a6763c.4a8938","wires":[]},{"id":"563020a1.8c4ca","type":"returnFailure","name":"BREAK","xml":"<return status='failure'>\n","comments":"","x":4166.0475425720215,"y":1723.8208665847778,"z":"c6a6763c.4a8938","wires":[]},{"id":"3a46ead4.8020a6","type":"set","name":"set l3-network-id = -1","xml":"<set>\n<parameter name='l3-network-id' value='-1' />\n","comments":"","x":1509.047592163086,"y":1567.1545162200928,"z":"c6a6763c.4a8938","wires":[]},{"id":"f34debda.3059a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4003.047538757324,"y":1705.4875717163086,"z":"c6a6763c.4a8938","wires":[["d88a343b.538ab8","563020a1.8c4ca"]]},{"id":"d88a343b.538ab8","type":"set","name":"set l3-network-id","xml":"<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />","comments":"","x":4192.714241027832,"y":1682.1541051864624,"z":"c6a6763c.4a8938","wires":[]},{"id":"6e76e719.77b5f8","type":"switchNode","name":"switch l3-network-id","xml":"<switch test='`$l3-network-id`'>\n","comments":"","outputs":1,"x":1497.7142486572266,"y":1886.8216562271118,"z":"c6a6763c.4a8938","wires":[["cc4e6c44.94099"]]},{"id":"cc4e6c44.94099","type":"outcome","name":"-1","xml":"<outcome value='-1'>\n","comments":"","outputs":1,"x":1667.714199066162,"y":1886.8214120864868,"z":"c6a6763c.4a8938","wires":[["aaf27a6f.92dd38"]]},{"id":"aaf27a6f.92dd38","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=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n","comments":"","x":1816.0475616455078,"y":1886.8215494155884,"z":"c6a6763c.4a8938","wires":[]},{"id":"6e1e86e4.fc0878","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2282.452423095703,"y":1663.729115486145,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"67f6e44a.8c755c","type":"outcome","name":"Pending Create","xml":"<outcome value='Pending Create'>\n","comments":"","outputs":1,"x":2131.6189918518066,"y":1622.645486831665,"z":"c6a6763c.4a8938","wires":[["1d748942.552097"]]},{"id":"1d748942.552097","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2284.8330841064453,"y":1622.4223642349243,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"fbab1088.c3bf6","type":"set","name":"set network-index = 0","xml":"<set>\n<parameter name='network-index' value='0' />\n","comments":"","x":1060.7978820800781,"y":1473.381046295166,"z":"c6a6763c.4a8938","wires":[]},{"id":"47540555.ce149c","type":"comment","name":"NO SUPPORT for network-macs","info":"","comments":"","x":248.52376556396484,"y":1477.5233364105225,"z":"c6a6763c.4a8938","wires":[]},{"id":"dc87a0e1.830c7","type":"comment","name":"NO SUPPORT for floating-ip[] and floating-ip-v6[]","info":"","comments":"","x":298.5237045288086,"y":1507.523419380188,"z":"c6a6763c.4a8938","wires":[]},{"id":"866effdc.31e09","type":"comment","name":"NO SUPPORT for interface-route-prefixes[]","info":"","comments":"","x":280.52376556396484,"y":1538.1900882720947,"z":"c6a6763c.4a8938","wires":[]},{"id":"77294c8e.f5ef34","type":"comment","name":"VNF-ASSIGNMENTS.VNF-NETWORKS[ ]","info":"","comments":"","x":1153.5714416503906,"y":1685.2971000671387,"z":"c6a6763c.4a8938","wires":[]},{"id":"a717d2eb.33e0d","type":"comment","name":"No support of vnf-networks[].subnet-id and subnet-name in 1707","info":"","comments":"","x":1624.5241203308105,"y":2031.9880800247192,"z":"c6a6763c.4a8938","wires":[]},{"id":"6bc6c778.aeb9b8","type":"comment","name":"Find l3-network with matching aic-cloud-region","info":"","comments":"","x":2675.833526611328,"y":1665.0827531814575,"z":"c6a6763c.4a8938","wires":[]},{"id":"d09a49ef.7c1908","type":"switchNode","name":"switch ipv4-ip-version","xml":"<switch test='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-ip-version`'>\n","comments":"","outputs":1,"x":1421.7381134033203,"y":2356.749324798584,"z":"c6a6763c.4a8938","wires":[["672a7280.55091c","31643f78.a77a6"]]},{"id":"78ac8019.a7f14","type":"set","name":"set vm-networks-index to -1","xml":"<set>\n<parameter name='vm-networks-index' value='-1' />\n\n","comments":"","x":1831.2617378234863,"y":2314.749429702759,"z":"c6a6763c.4a8938","wires":[]},{"id":"672a7280.55091c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1598.4046325683594,"y":2314.7494649887085,"z":"c6a6763c.4a8938","wires":[["78ac8019.a7f14"]]},{"id":"31643f78.a77a6","type":"other","name":"ipv4","xml":"<outcome value='ipv4'>\n","comments":"","outputs":1,"x":1603.1665840148926,"y":2409.7016077041626,"z":"c6a6763c.4a8938","wires":[["5853f915.b367d8"]]},{"id":"2cc28b35.b1b3d4","type":"set","name":"set vm-networks-index to 0","xml":"<set>\n<parameter name='vm-networks-index' value='0' />\n","comments":"","x":2001.7378463745117,"y":2362.225468635559,"z":"c6a6763c.4a8938","wires":[]},{"id":"5853f915.b367d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1764.3570594787598,"y":2409.0350732803345,"z":"c6a6763c.4a8938","wires":[["2cc28b35.b1b3d4","a3fe56e9.bbd588","f65ee3e0.f68a8"]]},{"id":"a3fe56e9.bbd588","type":"set","name":"set vm-networkls[].use-dhcp, ip-count","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-use-dhcp`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv4-count`' />","comments":"","x":2034.2142486572266,"y":2409.1304264068604,"z":"c6a6763c.4a8938","wires":[]},{"id":"98a1c0da.3df17","type":"switchNode","name":"switch ipv6-ip-version","xml":"<switch test='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-ip-version`'>\n","comments":"","outputs":1,"x":1418.880973815918,"y":2556.9874448776245,"z":"c6a6763c.4a8938","wires":[["3c446888.3e39b8","eb49d457.dd4f28"]]},{"id":"3c446888.3e39b8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1597.6904678344727,"y":2527.225256919861,"z":"c6a6763c.4a8938","wires":[["e181069f.a9af18"]]},{"id":"eb49d457.dd4f28","type":"other","name":"ipv6","xml":"<outcome value='ipv6'>\n","comments":"","outputs":1,"x":1599.1190223693848,"y":2591.5108137130737,"z":"c6a6763c.4a8938","wires":[["5fb2c0ca.155f3"]]},{"id":"ea162272.2b02b","type":"set","name":"increment vm-networks-index","xml":"<set>\n<parameter name='vm-networks-index' value='`$network-information-index + 1`' />\n","comments":"","x":2004.8331146240234,"y":2543.034843444824,"z":"c6a6763c.4a8938","wires":[]},{"id":"5fb2c0ca.155f3","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1754.3571815490723,"y":2590.5585527420044,"z":"c6a6763c.4a8938","wires":[["ea162272.2b02b","aaf6159f.3f4398","e09776e2.09fce8"]]},{"id":"e181069f.a9af18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1740.3570976257324,"y":2526.5588750839233,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"db2dfaa0.2e4a18","type":"outcome","name":"-1","xml":"<outcome value='-1'>","comments":"","outputs":1,"x":1641.0713024139404,"y":2779.3679761886597,"z":"c6a6763c.4a8938","wires":[["a57ad8d4.649d58"]]},{"id":"9a4fb538.0f0488","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1640.8332653045654,"y":2825.3202905654907,"z":"c6a6763c.4a8938","wires":[["fc11d026.29d27"]]},{"id":"a57ad8d4.649d58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1777.7380180358887,"y":2779.701636314392,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"fc11d026.29d27","type":"set","name":"increment vm-networks-index","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length'\n value='`$vm-networks-index + 1`' />\n","comments":"","x":1848.4046325683594,"y":2825.701428413391,"z":"c6a6763c.4a8938","wires":[]},{"id":"aaf6159f.3f4398","type":"set","name":"set vm-networks[].use-dhcp, ip-count","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-use-dhcp`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].ipv6-count`' />","comments":"","x":2029.8809967041016,"y":2590.233787536621,"z":"c6a6763c.4a8938","wires":[]},{"id":"4fd57938.fd6288","type":"switchNode","name":"switch use-dhcp","xml":"<switch test='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].use-dhcp`'>\n","comments":"","outputs":1,"x":1145.7619895935059,"y":2980.401258468628,"z":"c6a6763c.4a8938","wires":[["f5b2b31d.2316a"]]},{"id":"f5b2b31d.2316a","type":"outcome","name":"N","xml":"<outcome value='N'>\n","comments":"","outputs":1,"x":1327.7619018554688,"y":2979.972861289978,"z":"c6a6763c.4a8938","wires":[["d199b2c.f491e5"]]},{"id":"e57a3f7a.8c001","type":"execute","name":"call EIPAM assignIPAddress","xml":"<execute plugin=\"com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin\" method=\"assignIPAddress\">","comments":"","outputs":1,"x":2089.4402961730957,"y":3168.976450443268,"z":"c6a6763c.4a8938","wires":[["55962543.83bbfc"]]},{"id":"55962543.83bbfc","type":"failure","name":"failure","xml":"<outcome value='failure'>","outputs":1,"x":2304.8213539123535,"y":3168.7030835151672,"z":"c6a6763c.4a8938","wires":[["ce019ac0.7cad08"]]},{"id":"d05f74bb.e28858","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 new address blocks from EIPAM.\" />\n","comments":"","x":2639.9998893737793,"y":3213.3460116386414,"z":"c6a6763c.4a8938","wires":[]},{"id":"19d92b6.c89dcd5","type":"comment","name":"Need VF_MODULE_MODEL availability_zone_count and ecomp_generated_vm_assignments","info":"","comments":"","x":525.5951919555664,"y":237.46378231048584,"z":"c6a6763c.4a8938","wires":[]},{"id":"31be1c0b.e4a514","type":"for","name":"for each cloud-region availability zone","xml":"<for index='az-index' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n","comments":"","outputs":1,"x":911.3571243286133,"y":736.2734155654907,"z":"c6a6763c.4a8938","wires":[["644e35b7.02498c"]]},{"id":"7d5d3a7e.13dfa4","type":"set","name":"set availability-zone","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'\n value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />\n","comments":"","x":1369.0238571166992,"y":737.0353193283081,"z":"c6a6763c.4a8938","wires":[]},{"id":"644e35b7.02498c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1165.023567199707,"y":736.3689994812012,"z":"c6a6763c.4a8938","wires":[["7d5d3a7e.13dfa4"]]},{"id":"811225ec.4649e8","type":"switchNode","name":"switch AAI availability-zone_length","xml":"<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n","comments":"","outputs":1,"x":901.4521408081055,"y":690.1785621643066,"z":"c6a6763c.4a8938","wires":[["fbe8d942.a860d8"]]},{"id":"fbe8d942.a860d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1120.0235595703125,"y":689.7499713897705,"z":"c6a6763c.4a8938","wires":[["c01d6a9b.970a38"]]},{"id":"c01d6a9b.970a38","type":"set","name":"set availability-zone_length to 0","xml":"<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n","comments":"","x":1357.1665267944336,"y":689.1784152984619,"z":"c6a6763c.4a8938","wires":[]},{"id":"68aa1809.492868","type":"comment","name":"VNF-ASSIGNMENTS.AVAILABILITY-ZONES[ ]","info":"","comments":"","x":315.59522247314453,"y":593.1780614852905,"z":"c6a6763c.4a8938","wires":[]},{"id":"8300a18c.5a56","type":"comment","name":"VNF-ASSIGNMENTS.VNF-NETWORKS[ ]","info":"","comments":"","x":291.3095474243164,"y":761.3210287094116,"z":"c6a6763c.4a8938","wires":[]},{"id":"3a48a7be.8af1b8","type":"comment","name":"VNF-ASSIGNMENTS.VNF-VMS[ ].VM-NETWORKS[ ]","info":"","comments":"","x":1026.881004333496,"y":2339.368064880371,"z":"c6a6763c.4a8938","wires":[]},{"id":"3b82b435.6743cc","type":"set","name":"set vm-networks-index to -1","xml":"<set>\n<parameter name='vm-networks-index' value='-1' />\n\n","comments":"","x":1440.2141647338867,"y":2265.082242012024,"z":"c6a6763c.4a8938","wires":[]},{"id":"e76ba29b.dbd2f","type":"switchNode","name":"switch vm-networks-index","xml":"<switch test='`$vm-networks-index`'>\n","comments":"","outputs":1,"x":1422.7379455566406,"y":2802.7012300491333,"z":"c6a6763c.4a8938","wires":[["db2dfaa0.2e4a18","9a4fb538.0f0488"]]},{"id":"39f5f08d.dbc63","type":"switchNode","name":"switch plans[].address-family","xml":"<switch test='`$eipam-ip-block.plans[$plans-index].address-family`'>\n","comments":"","outputs":1,"x":2818.7937927246094,"y":3474.15486907959,"z":"c6a6763c.4a8938","wires":[["51a03202.e47d3c","70d3e88f.a07718"]]},{"id":"51a03202.e47d3c","type":"other","name":"ipv4","xml":"<outcome value='ipv4'>\n","comments":"","outputs":1,"x":3029.924644470215,"y":3448.4643754959106,"z":"c6a6763c.4a8938","wires":[["34d01025.7d17"]]},{"id":"70d3e88f.a07718","type":"other","name":"ipv6","xml":"<outcome value='ipv6'>\n","comments":"","outputs":1,"x":3030.459800720215,"y":3499.2737035751343,"z":"c6a6763c.4a8938","wires":[["c5666e02.07c39"]]},{"id":"34d01025.7d17","type":"set","name":"set vm-networks[].network-ips[].ip-address","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips[$ip-count-index].ip-address'\n value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' />","comments":"","x":3286.6750144958496,"y":3447.964214324951,"z":"c6a6763c.4a8938","wires":[]},{"id":"c5666e02.07c39","type":"set","name":"set vm-networks[].network-ips-v6[].ip-address-ipv6","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips-v6[$ip-count-index].ip-address-ipv6'\n value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' />","comments":"","x":3311.2576599121094,"y":3498.964376449585,"z":"c6a6763c.4a8938","wires":[]},{"id":"840dab74.e88378","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1811.4284591674805,"y":2979.1546588540077,"z":"c6a6763c.4a8938","wires":[["8a748fef.e9c92","464cbd36.e681d4","ec3340b.4bdcfc","e57a3f7a.8c001","1bbc0c5c.b5a494","817518c2.6f35c8","a8d8485a.c01bd8"]]},{"id":"8a748fef.e9c92","type":"set","name":"set eipam aic-cloud-region, client-key, subnetpool-id","xml":"<set>\n<parameter name='tmp.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`' />\n<parameter name='tmp.client-key'\n value='`$generate-unique-name-output.generated-name`' />\n<parameter name='tmp.subnetpool-id'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].extcp-subnetpool-id`' />\n<parameter name='network-topology-operation-input.network-information.network-id' \n\tvalue = 'NOT_APPLICABLE' />\n<parameter name='service-data.service-information.service-type' \n\tvalue = 'NOT_APPLICABLE' />\n","comments":"","x":2163.190719604492,"y":3073.869504928589,"z":"c6a6763c.4a8938","wires":[]},{"id":"ec3340b.4bdcfc","type":"call","name":"call GENERIC-RESOURCE-API:generate-unique-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n","comments":"","outputs":1,"x":2174.404983520508,"y":3026.591185569763,"z":"c6a6763c.4a8938","wires":[["503f07b6.8177c8"]]},{"id":"503f07b6.8177c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2465.357437133789,"y":3026.4487466812134,"z":"c6a6763c.4a8938","wires":[["a1d0b29.32de85"]]},{"id":"464cbd36.e681d4","type":"set","name":"set variables for generating unique name","xml":"<set>\n<parameter name='generate-unique-name-input.index-table-name' value='EIPAM_CLIENT_KEY_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vnf_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNFAPI_CLIENT_KEY' />\n<parameter name='generate-unique-name-input.prefix'\n\tvalue=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name + ':' +\n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-type + ':' +\n\t\t$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-role + ':'`\" />\n<parameter name='generate-unique-name-input.index-length' value='2' />\n\n<!-- zrdm3mmex57_vlc:vlc:sctp_a:01 -->","comments":"","x":2130.023910522461,"y":2979.019688606262,"z":"c6a6763c.4a8938","wires":[]},{"id":"a1d0b29.32de85","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=\"`$generate-unique-name-output.error-message`\" />\n","comments":"","x":2621.7858657836914,"y":3026.305785179138,"z":"c6a6763c.4a8938","wires":[]},{"id":"d8725c39.89566","type":"get-resource","name":"get-resource VFC_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\n pfx='db.vfc-model'>\n\n","comments":"","outputs":1,"x":1079.9999771118164,"y":1000.7376537322998,"z":"c6a6763c.4a8938","wires":[["783971a3.9819a","282c150e.65d37a"]]},{"id":"b3b0020d.74ce7","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=\"`'No entries found in VFC_MODEL table for customization UUID ' + $db.vf-module-to-vfc-mapping[$db-vm-index].vfc-customization-uuid`\" />\n","comments":"","x":1476.4283256530762,"y":1025.1660461425781,"z":"c6a6763c.4a8938","wires":[]},{"id":"783971a3.9819a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1302.7855949401855,"y":980.1184043884277,"z":"c6a6763c.4a8938","wires":[["b7066615.e7f238"]]},{"id":"282c150e.65d37a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1310.3570251464844,"y":1025.4041175842285,"z":"c6a6763c.4a8938","wires":[["b3b0020d.74ce7"]]},{"id":"b7066615.e7f238","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 reading VFC_MODEL table\" />\n","comments":"","x":1476.7855262756348,"y":980.2613048553467,"z":"c6a6763c.4a8938","wires":[]},{"id":"8c428202.a4584","type":"set","name":"set vnf-vms[] data","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-type'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-type`' />\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />\n\n","comments":"","x":1049.2976531982422,"y":1148.356819152832,"z":"c6a6763c.4a8938","wires":[]},{"id":"96d35d.16f99ca","type":"for","name":"for each vm-count","xml":"<for index='vm-index' start='0' end='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' >\n","comments":"","outputs":1,"x":1051.6307220458984,"y":1212.6098346710205,"z":"c6a6763c.4a8938","wires":[["ce61047d.6b6798"]]},{"id":"9b33cb2.cd1cb38","type":"call","name":"call GENERIC-RESOURCE-API:generate-unique-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n","comments":"","outputs":1,"x":1584.0593452453613,"y":1240.2289810180664,"z":"c6a6763c.4a8938","wires":[["e1a23a4b.e7ad28","645ecf24.2a316"]]},{"id":"e1a23a4b.e7ad28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1879.7736333211265,"y":1213.0862436294556,"z":"c6a6763c.4a8938","wires":[["64093666.6d3df8"]]},{"id":"645ecf24.2a316","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1883.1069831848145,"y":1264.7528867721558,"z":"c6a6763c.4a8938","wires":[["d1a2193e.7c37a8"]]},{"id":"9a519830.138b58","type":"set","name":"set variables for generating unique name","xml":"<set>\n<parameter name='generate-unique-name-input.index-table-name' value='VM_NAME_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vm_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNFAPI_VM_INSTANCE' />\n<parameter name='x' value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\" />\n<parameter name='y' value=\"`$db.vfc-model.nfc-naming-code`\" />\n<parameter name='generate-unique-name-input.prefix' value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name + $db.vfc-model.nfc-naming-code`\" />\n<parameter name='generate-unique-name-input.index-length' value='3' />\n","comments":"","x":1540.726058959961,"y":1188.562307357788,"z":"c6a6763c.4a8938","wires":[]},{"id":"d1a2193e.7c37a8","type":"set","name":"set generated name","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' value='`$generate-unique-name-output.generated-name`' />\n","comments":"","x":2067.630699157715,"y":1264.228904724121,"z":"c6a6763c.4a8938","wires":[]},{"id":"64093666.6d3df8","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=\"`$generate-unique-name-output.error-message`\" />\n","comments":"","x":2047.630746205648,"y":1212.5147552490234,"z":"c6a6763c.4a8938","wires":[]},{"id":"ce61047d.6b6798","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1258.0356636047363,"y":1212.2527389526367,"z":"c6a6763c.4a8938","wires":[["9a519830.138b58","9b33cb2.cd1cb38"]]},{"id":"76c54fa9.38022","type":"switchNode","name":"switch ecomp-generated-naming == 'Y'","xml":"<switch test=\"$db.vfc-model.ecomp-generated-naming == 'Y'\">\n","comments":"","outputs":1,"x":1115.9403839111328,"y":1080.4993133544922,"z":"c6a6763c.4a8938","wires":[["53ce2381.2090fc"]]},{"id":"53ce2381.2090fc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1347.6069946289062,"y":1080.4989442825317,"z":"c6a6763c.4a8938","wires":[["63254101.50f2a"]]},{"id":"63254101.50f2a","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=\"`'ECOMP generated naming is not Y for VFC customization UUID ' + $db.vf-module-to-vfc-mapping[$db-vm-index].vfc-customization-uuid`\" />\n","comments":"","x":1494.2737350463867,"y":1079.8323993682861,"z":"c6a6763c.4a8938","wires":[]},{"id":"46a48b56.e456d4","type":"comment","name":"1707 assumes same ipv4-ip-count and ipv6-ip-count the same","info":"","comments":"","x":1197.7381286621094,"y":2927.035418510437,"z":"c6a6763c.4a8938","wires":[]},{"id":"9226d6f7.945608","type":"for","name":"for each network-role in vm-networks","xml":"<for index='network-role-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks_length`' >\n","comments":"","outputs":1,"x":884.8809127807617,"y":2980.5825901031494,"z":"c6a6763c.4a8938","wires":[["4fd57938.fd6288"]]},{"id":"ec67f8aa.5a4cc8","type":"comment","name":"Set vnf-vms[]","info":"","comments":"","x":842.0832824707031,"y":1064.487636566162,"z":"c6a6763c.4a8938","wires":[]},{"id":"3112f18c.d7febe","type":"set","name":"set vm-names_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'\n value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />\n","comments":"","x":1062.547519683838,"y":1289.1103086471558,"z":"c6a6763c.4a8938","wires":[]},{"id":"b1e903e3.a9656","type":"for","name":"for each vm-type","xml":"<for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\n","comments":"","outputs":1,"x":620.3094863891602,"y":2980.130418777466,"z":"c6a6763c.4a8938","wires":[["9226d6f7.945608"]]},{"id":"a8d8485a.c01bd8","type":"for","name":"for plans in eipam-ip-block.plans","xml":"<for index='plans-index' start='0' end='`$eipam-ip-block.plans_length`' >\n","comments":"","outputs":1,"x":2100.142868041992,"y":3394.5238189697266,"z":"c6a6763c.4a8938","wires":[["d21eb1a7.a1a34"]]},{"id":"1bbc0c5c.b5a494","type":"switchNode","name":"switch eipam-ip-block.plans_length","xml":"<switch test='`$eipam-ip-block.plans_length`'>\n","comments":"","outputs":1,"x":2109.190517425537,"y":3305.904595851898,"z":"c6a6763c.4a8938","wires":[["c1c303a7.b62b9","69212587.efd27c"]]},{"id":"c1c303a7.b62b9","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2376.404853820801,"y":3281.725981235504,"z":"c6a6763c.4a8938","wires":[["66ca4c22.7c8a04"]]},{"id":"e1bf439.0dee4c","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.plans[] is null.\" />\n","comments":"","x":2781.1190605163574,"y":3303.2259278297424,"z":"c6a6763c.4a8938","wires":[]},{"id":"76c321b0.d733e","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.plans['+ $plans-index +'].requests[] is null.'`\" />\n","comments":"","x":3081.06339263916,"y":3397.162829399109,"z":"c6a6763c.4a8938","wires":[]},{"id":"304e678e.946e88","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2739.7777404785156,"y":3375.2341175079346,"z":"c6a6763c.4a8938","wires":[["71155dea.d5c054"]]},{"id":"1c8f57b8.7e9de8","type":"switchNode","name":"switch requests_length","xml":"<switch test='`$eipam-ip-block.plans[$plans-index].requests_length`'>\n","comments":"","outputs":1,"x":2559.2063217163086,"y":3394.912588119507,"z":"c6a6763c.4a8938","wires":[["304e678e.946e88","ad0e3173.986be"]]},{"id":"ce019ac0.7cad08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2466.5833473205566,"y":3168.6545939445496,"z":"c6a6763c.4a8938","wires":[["d05f74bb.e28858","2e3396bb.a9dc1a"]]},{"id":"69212587.efd27c","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":2377.476261138916,"y":3328.154568195343,"z":"c6a6763c.4a8938","wires":[["66ca4c22.7c8a04"]]},{"id":"66ca4c22.7c8a04","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2572.0833702087402,"y":3303.4046387672424,"z":"c6a6763c.4a8938","wires":[["e1bf439.0dee4c","2e3396bb.a9dc1a"]]},{"id":"71155dea.d5c054","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2892.5278244018555,"y":3397.6270179748535,"z":"c6a6763c.4a8938","wires":[["76c321b0.d733e","2e3396bb.a9dc1a"]]},{"id":"ad0e3173.986be","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":2740.277820587158,"y":3419.1270141601562,"z":"c6a6763c.4a8938","wires":[["71155dea.d5c054"]]},{"id":"53449ad4.088df4","type":"for","name":"for each rqst in requests","xml":"<for index='rqst-index' start='0' end='`$eipam-ip-block.plans[$plans-index].requests_length`' >\n","comments":"","outputs":1,"x":2563.722213745117,"y":3473.987840652466,"z":"c6a6763c.4a8938","wires":[["39f5f08d.dbc63"]]},{"id":"d21eb1a7.a1a34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2347.611099243164,"y":3394.87654876709,"z":"c6a6763c.4a8938","wires":[["1c8f57b8.7e9de8","53449ad4.088df4"]]},{"id":"7f727408.3c054c","type":"set","name":"set vnf-networks_length","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-networks_length'\n value='`$network-index`' />\n","comments":"","x":1062.5597381591797,"y":2092.975839614868,"z":"c6a6763c.4a8938","wires":[]},{"id":"946d1e34.4231","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":672.1666793823242,"y":712.3209276199341,"z":"c6a6763c.4a8938","wires":[["811225ec.4649e8","31be1c0b.e4a514"]]},{"id":"2e3396bb.a9dc1a","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":3079.9761543273926,"y":3168.3689274787903,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"817518c2.6f35c8","type":"call","name":"call: eipam-mobility-ip-assignment","xml":"<call module='VNF-API' rpc='eipam-mobility-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":2107.4361000061035,"y":3120.408854007721,"z":"c6a6763c.4a8938","wires":[[]]},{"id":"bf9d4319.1481e","type":"set","name":"copy input data","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" />","comments":"","x":688.7737045288086,"y":513.5952196121216,"z":"c6a6763c.4a8938","wires":[]},{"id":"317a074d.bd4138","type":"get-resource","name":"get-resource VFC_TO_NETWORK_ROLE_MAPPING","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\n pfx='db.vfc-to-network-role-mapping[]'>\n\n","comments":"","outputs":1,"x":1161.6666259765625,"y":1354.999912261963,"z":"c6a6763c.4a8938","wires":[["5622a9a8.299278","400145c8.a5820c"]]},{"id":"5622a9a8.299278","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1448.8808288574219,"y":1335.3807592391968,"z":"c6a6763c.4a8938","wires":[["caac1149.1f034"]]},{"id":"400145c8.a5820c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1457.4522590637207,"y":1379.6664724349976,"z":"c6a6763c.4a8938","wires":[["d6f31097.71144"]]},{"id":"caac1149.1f034","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 reading VFC_TO_NETWORK_ROLE_MAPPING table\" />\n","comments":"","x":1623.880760192871,"y":1334.5236597061157,"z":"c6a6763c.4a8938","wires":[]},{"id":"d6f31097.71144","type":"set","name":"set vfc-to-network-role-mapping length to 0","xml":"<set>\n<parameter name='db.vfc-to-network-role-mapping_length' value='0' />\n","comments":"","x":1720.857078552246,"y":1379.6748628616333,"z":"c6a6763c.4a8938","wires":[]},{"id":"e09776e2.09fce8","type":"set","name":"set local ip-version","xml":"<set>\n<parameter name='tmp.local.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-version'\n value='ipv6' />\n","comments":"","x":1974.5473403930664,"y":2637.082179069519,"z":"c6a6763c.4a8938","wires":[]},{"id":"f65ee3e0.f68a8","type":"set","name":"set local.ip-version","xml":"<set>\n<parameter name='tmp.local.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-version'\n value='ipv4' /> ","comments":"","x":1979.547462463379,"y":2455.749161720276,"z":"c6a6763c.4a8938","wires":[]},{"id":"bca0b7c7.7693f8","type":"set","name":"set vm-networks[].network-role","xml":"<set>\n<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-role'\n value='`$db.vfc-to-network-role-mapping[$network-role-index].network-role`' />","comments":"","x":1447.142837524414,"y":2689.9998846054077,"z":"c6a6763c.4a8938","wires":[]},{"id":"d199b2c.f491e5","type":"for","name":"for ip-count-index in ip-count","xml":"<for index='ip-count-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].ip-count`'>","comments":"","outputs":1,"x":1555.333152770996,"y":2979.66695022583,"z":"c6a6763c.4a8938","wires":[["840dab74.e88378"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign.json
index ecad0166..24c3f081 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-assign.json
@@ -1 +1 @@
-[{"id":"16c70efe.7a8801","type":"dgstart","name":"DGSTART","outputs":1,"x":120,"y":81.25,"z":"1a1ddf2c.df1b41","wires":[["355a50a5.566cd"]]},{"id":"355a50a5.566cd","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":234,"y":141.25,"z":"1a1ddf2c.df1b41","wires":[["3cac45ed.2af29a"]]},{"id":"3cac45ed.2af29a","type":"method","name":"method vnf-topology-automated-assign","xml":"<method rpc='vnf-topology-automated-assign' mode='sync'>\n","comments":"","outputs":1,"x":236.5,"y":201.25,"z":"1a1ddf2c.df1b41","wires":[["7f45592b.5aa228"]]},{"id":"7f45592b.5aa228","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":274,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[["242b6039.a4933","5304daf6.f2f644","7994db7a.864d54","16f2f46d.f9323c","134b41a5.40812e","d578e5a.1ca0318","7e51ab70.dd7844","113a63d2.c73f9c","a83a3395.50d63"]]},{"id":"242b6039.a4933","type":"set","name":"set: order-status = PendingCreate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingCreate\"/>","comments":"","x":579.3571395874023,"y":844.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"82792209.9734a","type":"comment","name":"request-action = VNFActivateRequest","info":"","comments":"","x":204,"y":41.25,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"fb53bdbf.46f42","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":874.8571395874023,"y":785.821439743042,"z":"1a1ddf2c.df1b41","wires":[["58e46612.49adb8"]]},{"id":"ddf10b49.e08dc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"Encountered error while updating vf-module orchestration-status in AnAI\"/>","comments":"","x":1229.071388244629,"y":786.2499771118164,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"3f3242c8.1b61ee","type":"save","name":"save relationship: l3-network","xml":"<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":902.8571395874023,"y":659.821439743042,"z":"1a1ddf2c.df1b41","wires":[["10b1439d.aea9cc"]]},{"id":"10b1439d.aea9cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1121.9999656677246,"y":659.1071357727051,"z":"1a1ddf2c.df1b41","wires":[["520b73a3.1208cc"]]},{"id":"5304daf6.f2f644","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":584.8571395874023,"y":659.821439743042,"z":"1a1ddf2c.df1b41","wires":[["3f3242c8.1b61ee"]]},{"id":"d2e43a22.4b50c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\"/>","comments":"","x":1483.357063293457,"y":657.964316368103,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"520b73a3.1208cc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1283.9999656677246,"y":659.1071357727051,"z":"1a1ddf2c.df1b41","wires":[["d2e43a22.4b50c8","6954002.67688"]]},{"id":"bc71a20.de7366","type":"save","name":"delete vf-module: l3-network relationship","xml":"<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1744.642921447754,"y":523.3928279876709,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"7994db7a.864d54","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />","comments":"","outputs":1,"x":613.3571395874023,"y":785.821439743042,"z":"1a1ddf2c.df1b41","wires":[["fb53bdbf.46f42"]]},{"id":"58e46612.49adb8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1042.928581237793,"y":786.2500095367432,"z":"1a1ddf2c.df1b41","wires":[["ddf10b49.e08dc8","6954002.67688"]]},{"id":"16f2f46d.f9323c","type":"call","name":"call: vnf-topology-automated-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-automated-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":615.3571395874023,"y":531.821439743042,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"134b41a5.40812e","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":543.3571395874023,"y":900.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"d578e5a.1ca0318","type":"switchNode","name":"switch ...SERVICE-DATA vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":597.3571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[["ac55335c.b48bc"]]},{"id":"ac55335c.b48bc","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":834.8571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[["60a230cd.63643"]]},{"id":"60a230cd.63643","type":"set","name":"set SERVICE-DATA vnf-networks[] = 0","xml":"<set>\n<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />\n","comments":"","x":1072.8571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"7e51ab70.dd7844","type":"save","name":"GET AnAI - vf-module","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >","comments":"","outputs":1,"x":546.6428604125977,"y":447.8214340209961,"z":"1a1ddf2c.df1b41","wires":[["d5f4c089.d7081","d330aef1.d0e27"]]},{"id":"d5f4c089.d7081","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":744.8571319580078,"y":419.25001335144043,"z":"1a1ddf2c.df1b41","wires":[["3b52247c.b50a5c"]]},{"id":"d330aef1.d0e27","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":750.4999923706055,"y":470.67858123779297,"z":"1a1ddf2c.df1b41","wires":[["a911107d.bce06"]]},{"id":"3b52247c.b50a5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":943.3571319580078,"y":419.25001335144043,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"a911107d.bce06","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value=\"`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":940.4999923706055,"y":470.67858123779297,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"113a63d2.c73f9c","type":"switchNode","name":"switch:vnf-id | config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":561.8333129882812,"y":261.25001335144043,"z":"1a1ddf2c.df1b41","wires":[["7c6dbcf3.1a3954"]]},{"id":"fec3a55d.1a66c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='vnf-id is already present in config-tree'/>","comments":"","x":970.5,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"7c6dbcf3.1a3954","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":772,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[["fec3a55d.1a66c8"]]},{"id":"a83a3395.50d63","type":"switchNode","name":"switch: INPUT model-customization-uuid","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.model-customization-uuid`\">","comments":"","outputs":1,"x":598.5714111328125,"y":337.14282035827637,"z":"1a1ddf2c.df1b41","wires":[["2b051e5b.50a662","1811e1b.758e61e"]]},{"id":"1811e1b.758e61e","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":857.6427993774414,"y":358.39280700683594,"z":"1a1ddf2c.df1b41","wires":[["227c03f7.c6066c"]]},{"id":"2b051e5b.50a662","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":853.9285583496094,"y":312.2499761581421,"z":"1a1ddf2c.df1b41","wires":[["227c03f7.c6066c"]]},{"id":"227c03f7.c6066c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='model-customization-uuid cannot be NULL or 0'/>","comments":"","x":1027.6428756713867,"y":331.53565406799316,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"5b308fe2.250b5","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":1729.0001258850098,"y":571.1428575515747,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"6954002.67688","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1471.4286041259766,"y":548.5714340209961,"z":"1a1ddf2c.df1b41","wires":[["bc71a20.de7366","5b308fe2.250b5"]]}] \ No newline at end of file
+[{"id":"16c70efe.7a8801","type":"dgstart","name":"DGSTART","outputs":1,"x":120,"y":81.25,"z":"1a1ddf2c.df1b41","wires":[["355a50a5.566cd"]]},{"id":"355a50a5.566cd","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":234,"y":141.25,"z":"1a1ddf2c.df1b41","wires":[["3cac45ed.2af29a"]]},{"id":"3cac45ed.2af29a","type":"method","name":"method vnf-topology-automated-assign","xml":"<method rpc='vnf-topology-automated-assign' mode='sync'>\n","comments":"","outputs":1,"x":236.5,"y":201.25,"z":"1a1ddf2c.df1b41","wires":[["7f45592b.5aa228"]]},{"id":"7f45592b.5aa228","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":274,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[["242b6039.a4933","5304daf6.f2f644","7994db7a.864d54","16f2f46d.f9323c","134b41a5.40812e","d578e5a.1ca0318","7e51ab70.dd7844","113a63d2.c73f9c","a83a3395.50d63"]]},{"id":"242b6039.a4933","type":"set","name":"set: order-status = PendingCreate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingCreate\"/>","comments":"","x":579.3571395874023,"y":844.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"82792209.9734a","type":"comment","name":"request-action = VNFActivateRequest","info":"","comments":"","x":204,"y":41.25,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"fb53bdbf.46f42","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":874.8571395874023,"y":785.821439743042,"z":"1a1ddf2c.df1b41","wires":[["58e46612.49adb8"]]},{"id":"ddf10b49.e08dc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"Encountered error while updating vf-module orchestration-status in AnAI\"/>","comments":"","x":1229.071388244629,"y":786.2499771118164,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"3f3242c8.1b61ee","type":"save","name":"save relationship: l3-network","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":902.8571395874023,"y":659.821439743042,"z":"1a1ddf2c.df1b41","wires":[["10b1439d.aea9cc"]]},{"id":"10b1439d.aea9cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1121.9999656677246,"y":659.1071357727051,"z":"1a1ddf2c.df1b41","wires":[["520b73a3.1208cc"]]},{"id":"5304daf6.f2f644","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":584.8571395874023,"y":659.821439743042,"z":"1a1ddf2c.df1b41","wires":[["3f3242c8.1b61ee"]]},{"id":"d2e43a22.4b50c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\"/>","comments":"","x":1483.357063293457,"y":657.964316368103,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"520b73a3.1208cc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1283.9999656677246,"y":659.1071357727051,"z":"1a1ddf2c.df1b41","wires":[["d2e43a22.4b50c8","6954002.67688"]]},{"id":"bc71a20.de7366","type":"save","name":"delete vf-module: l3-network relationship","xml":"<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1744.642921447754,"y":523.3928279876709,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"7994db7a.864d54","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />","comments":"","outputs":1,"x":613.3571395874023,"y":785.821439743042,"z":"1a1ddf2c.df1b41","wires":[["fb53bdbf.46f42"]]},{"id":"58e46612.49adb8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1042.928581237793,"y":786.2500095367432,"z":"1a1ddf2c.df1b41","wires":[["ddf10b49.e08dc8","6954002.67688"]]},{"id":"16f2f46d.f9323c","type":"call","name":"call: vnf-topology-automated-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-automated-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":615.3571395874023,"y":531.821439743042,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"134b41a5.40812e","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":543.3571395874023,"y":900.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"d578e5a.1ca0318","type":"switchNode","name":"switch ...SERVICE-DATA vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":597.3571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[["ac55335c.b48bc"]]},{"id":"ac55335c.b48bc","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":834.8571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[["60a230cd.63643"]]},{"id":"60a230cd.63643","type":"set","name":"set SERVICE-DATA vnf-networks[] = 0","xml":"<set>\n<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />\n","comments":"","x":1072.8571395874023,"y":591.821439743042,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"7e51ab70.dd7844","type":"save","name":"GET AnAI - vf-module","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >","comments":"","outputs":1,"x":546.6428604125977,"y":447.8214340209961,"z":"1a1ddf2c.df1b41","wires":[["d5f4c089.d7081","d330aef1.d0e27"]]},{"id":"d5f4c089.d7081","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":744.8571319580078,"y":419.25001335144043,"z":"1a1ddf2c.df1b41","wires":[["3b52247c.b50a5c"]]},{"id":"d330aef1.d0e27","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":750.4999923706055,"y":470.67858123779297,"z":"1a1ddf2c.df1b41","wires":[["a911107d.bce06"]]},{"id":"3b52247c.b50a5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":943.3571319580078,"y":419.25001335144043,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"a911107d.bce06","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value=\"`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":940.4999923706055,"y":470.67858123779297,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"113a63d2.c73f9c","type":"switchNode","name":"switch:vnf-id | config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":561.8333129882812,"y":261.25001335144043,"z":"1a1ddf2c.df1b41","wires":[["7c6dbcf3.1a3954"]]},{"id":"fec3a55d.1a66c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='vnf-id is already present in config-tree'/>","comments":"","x":970.5,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"7c6dbcf3.1a3954","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":772,"y":261.25,"z":"1a1ddf2c.df1b41","wires":[["fec3a55d.1a66c8"]]},{"id":"a83a3395.50d63","type":"switchNode","name":"switch: INPUT model-customization-uuid","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.model-customization-uuid`\">","comments":"","outputs":1,"x":598.5714111328125,"y":337.14282035827637,"z":"1a1ddf2c.df1b41","wires":[["2b051e5b.50a662","1811e1b.758e61e"]]},{"id":"1811e1b.758e61e","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":857.6427993774414,"y":358.39280700683594,"z":"1a1ddf2c.df1b41","wires":[["227c03f7.c6066c"]]},{"id":"2b051e5b.50a662","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":853.9285583496094,"y":312.2499761581421,"z":"1a1ddf2c.df1b41","wires":[["227c03f7.c6066c"]]},{"id":"227c03f7.c6066c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='model-customization-uuid cannot be NULL or 0'/>","comments":"","x":1027.6428756713867,"y":331.53565406799316,"z":"1a1ddf2c.df1b41","wires":[]},{"id":"5b308fe2.250b5","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":1729.0001258850098,"y":571.1428575515747,"z":"1a1ddf2c.df1b41","wires":[[]]},{"id":"6954002.67688","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1471.4286041259766,"y":548.5714340209961,"z":"1a1ddf2c.df1b41","wires":[["bc71a20.de7366","5b308fe2.250b5"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-delete.json
index b4cbfe16..1a957ffe 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-delete.json
@@ -1 +1 @@
-[{"id":"a17f2c56.75bec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":257.8570556640625,"y":235.57144355773926,"z":"e9465f3b.ff9db","wires":[["277a3558.11867a","35cf5f24.d47eb","bd77133.bab7af","ede0237b.f3b56","95956b76.93c358","c369ede6.f62b2","834d2cf5.5a461","e2863c33.6bb83"]]},{"id":"277a3558.11867a","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":542.2856979370117,"y":452.8453245162964,"z":"e9465f3b.ff9db","wires":[]},{"id":"3840051b.85529a","type":"method","name":"method vnf-topology-automated-delete","xml":"<method rpc='vnf-topology-automated-delete' mode='sync'>\n","comments":"","outputs":1,"x":250.9523468017578,"y":154.73809337615967,"z":"e9465f3b.ff9db","wires":[["a17f2c56.75bec"]]},{"id":"6ea1ded.d5f8b2","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":333.33326721191406,"y":74.16667461395264,"z":"e9465f3b.ff9db","wires":[["3840051b.85529a"]]},{"id":"8a168a7b.717948","type":"dgstart","name":"DGSTART","outputs":1,"x":123.49994659423828,"y":74,"z":"e9465f3b.ff9db","wires":[["6ea1ded.d5f8b2"]]},{"id":"6ca1cda5.7a4a04","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":749.0671157836914,"y":289.7478561401367,"z":"e9465f3b.ff9db","wires":[["b065b223.b815b"]]},{"id":"b065b223.b815b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":901.4002456665039,"y":289.74791717529297,"z":"e9465f3b.ff9db","wires":[]},{"id":"bd77133.bab7af","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":503.5432891845703,"y":500.6766357421875,"z":"e9465f3b.ff9db","wires":[]},{"id":"35cf5f24.d47eb","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":568.6796417236328,"y":403.0114555358887,"z":"e9465f3b.ff9db","wires":[]},{"id":"ede0237b.f3b56","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":511.2510757446289,"y":550.868616104126,"z":"e9465f3b.ff9db","wires":[]},{"id":"c369ede6.f62b2","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":547.2500152587891,"y":290.04765701293945,"z":"e9465f3b.ff9db","wires":[["6ca1cda5.7a4a04"]]},{"id":"95956b76.93c358","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":521.1428985595703,"y":596.0715312957764,"z":"e9465f3b.ff9db","wires":[]},{"id":"834d2cf5.5a461","type":"switchNode","name":"switch:vnf-id config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":547.1428451538086,"y":234.8571605682373,"z":"e9465f3b.ff9db","wires":[["6c92b5e8.1192bc"]]},{"id":"6c92b5e8.1192bc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":748.5974044799805,"y":235.03898811340332,"z":"e9465f3b.ff9db","wires":[["caf756bf.ce79e8"]]},{"id":"caf756bf.ce79e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":912.1883239746094,"y":235.19808864593506,"z":"e9465f3b.ff9db","wires":[]},{"id":"e2863c33.6bb83","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":567.1428833007812,"y":344.28573417663574,"z":"e9465f3b.ff9db","wires":[[]]}] \ No newline at end of file
+[{"id":"a17f2c56.75bec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":257.8570556640625,"y":235.57144355773926,"z":"e9465f3b.ff9db","wires":[["277a3558.11867a","35cf5f24.d47eb","bd77133.bab7af","ede0237b.f3b56","95956b76.93c358","c369ede6.f62b2","834d2cf5.5a461","e2863c33.6bb83"]]},{"id":"277a3558.11867a","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":542.2856979370117,"y":452.8453245162964,"z":"e9465f3b.ff9db","wires":[]},{"id":"3840051b.85529a","type":"method","name":"method vnf-topology-automated-delete","xml":"<method rpc='vnf-topology-automated-delete' mode='sync'>\n","comments":"","outputs":1,"x":250.9523468017578,"y":154.73809337615967,"z":"e9465f3b.ff9db","wires":[["a17f2c56.75bec"]]},{"id":"6ea1ded.d5f8b2","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":333.33326721191406,"y":74.16667461395264,"z":"e9465f3b.ff9db","wires":[["3840051b.85529a"]]},{"id":"8a168a7b.717948","type":"dgstart","name":"DGSTART","outputs":1,"x":123.49994659423828,"y":74,"z":"e9465f3b.ff9db","wires":[["6ea1ded.d5f8b2"]]},{"id":"6ca1cda5.7a4a04","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":749.0671157836914,"y":289.7478561401367,"z":"e9465f3b.ff9db","wires":[["b065b223.b815b"]]},{"id":"b065b223.b815b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":901.4002456665039,"y":289.74791717529297,"z":"e9465f3b.ff9db","wires":[]},{"id":"bd77133.bab7af","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":503.5432891845703,"y":500.6766357421875,"z":"e9465f3b.ff9db","wires":[]},{"id":"35cf5f24.d47eb","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":568.6796417236328,"y":403.0114555358887,"z":"e9465f3b.ff9db","wires":[]},{"id":"ede0237b.f3b56","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":511.2510757446289,"y":550.868616104126,"z":"e9465f3b.ff9db","wires":[]},{"id":"c369ede6.f62b2","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":547.2500152587891,"y":290.04765701293945,"z":"e9465f3b.ff9db","wires":[["6ca1cda5.7a4a04"]]},{"id":"95956b76.93c358","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":521.1428985595703,"y":596.0715312957764,"z":"e9465f3b.ff9db","wires":[]},{"id":"834d2cf5.5a461","type":"switchNode","name":"switch:vnf-id config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":547.1428451538086,"y":234.8571605682373,"z":"e9465f3b.ff9db","wires":[["6c92b5e8.1192bc"]]},{"id":"6c92b5e8.1192bc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":748.5974044799805,"y":235.03898811340332,"z":"e9465f3b.ff9db","wires":[["caf756bf.ce79e8"]]},{"id":"caf756bf.ce79e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='404'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":912.1883239746094,"y":235.19808864593506,"z":"e9465f3b.ff9db","wires":[]},{"id":"e2863c33.6bb83","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":567.1428833007812,"y":344.28573417663574,"z":"e9465f3b.ff9db","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-operation.json
index 22fe32d7..922a52c9 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-operation.json
@@ -1 +1 @@
-[{"id":"18c57a33.efbf46","type":"dgstart","name":"DGSTART","outputs":1,"x":138.3333282470703,"y":63.33333206176758,"z":"a1500f38.53c3e","wires":[["a39f2a21.325218"]]},{"id":"a39f2a21.325218","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":345.9444351196289,"y":64.11111640930176,"z":"a1500f38.53c3e","wires":[["7005a08d.a5fc7"]]},{"id":"7005a08d.a5fc7","type":"method","name":"vnf-topology-automated-operation","xml":"<method rpc='vnf-topology-automated-operation' mode='sync'>\n","comments":"","outputs":1,"x":259.8333206176758,"y":119.55555152893066,"z":"a1500f38.53c3e","wires":[["f2e2d7f9.0126f8"]]},{"id":"9162cd79.14658","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":422.7460174560547,"y":580.9523010253906,"z":"a1500f38.53c3e","wires":[["8224b548.40b4a8","5f465d1e.4d94b4","d983d392.1d9a6","98e7501f.26dbc","59d3b456.0a00fc"]]},{"id":"8224b548.40b4a8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":639.5793914794922,"y":866.7024803161621,"z":"a1500f38.53c3e","wires":[["72343cc8.fc7bb4"]]},{"id":"5f465d1e.4d94b4","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":640.3015747070312,"y":580.9523067474365,"z":"a1500f38.53c3e","wires":[["547b268.884f1d8"]]},{"id":"72343cc8.fc7bb4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":811.5793914794922,"y":866.7024803161621,"z":"a1500f38.53c3e","wires":[]},{"id":"d983d392.1d9a6","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":643.3015899658203,"y":702.2022953033447,"z":"a1500f38.53c3e","wires":[["f19c8d58.4a549"]]},{"id":"98e7501f.26dbc","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":643.0515899658203,"y":759.452296257019,"z":"a1500f38.53c3e","wires":[["4e79020d.f21e3c"]]},{"id":"cee7b9d8.a8e638","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":661.8015899658203,"y":643.4522972106934,"z":"a1500f38.53c3e","wires":[["7797f0bb.8a36c"]]},{"id":"59d3b456.0a00fc","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":640.6627502441406,"y":812.3135557174683,"z":"a1500f38.53c3e","wires":[["d8f73085.d4515"]]},{"id":"2b43b340.5116cc","type":"call","name":"call: vnf-topology-automated-assign","xml":"<call module='VNF-API' rpc='vnf-topology-automated-assign' mode='sync' >","comments":"","outputs":1,"x":1113.5515747070312,"y":580.9522495269775,"z":"a1500f38.53c3e","wires":[[]]},{"id":"fd2a3a1a.99f018","type":"call","name":"call: vnf-topology-automated-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-automated-changeassign' mode='sync' >","comments":"","outputs":1,"x":1136.8016967773438,"y":641.9523048400879,"z":"a1500f38.53c3e","wires":[[]]},{"id":"19c4d34a.91c3dd","type":"call","name":"call: vnf-topology-automated-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-automated-rollback' mode='sync' >","comments":"","outputs":1,"x":1037.5516967773438,"y":759.4523067474365,"z":"a1500f38.53c3e","wires":[[]]},{"id":"d8f73085.d4515","type":"call","name":"call: vnf-topology-automated-delete","xml":"<call module='VNF-API' rpc='vnf-topology-automated-delete' mode='sync' >","comments":"","outputs":1,"x":883.4128189086914,"y":812.3135566711426,"z":"a1500f38.53c3e","wires":[[]]},{"id":"828e15d2.79b178","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":1037.0516891479492,"y":701.4523005485535,"z":"a1500f38.53c3e","wires":[[]]},{"id":"ef5eb70c.59f308","type":"comment","name":"vnf-topology-automated-operation","info":"","comments":"","x":734.0793533325195,"y":72.92062950134277,"z":"a1500f38.53c3e","wires":[]},{"id":"f2e2d7f9.0126f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":240.33333587646484,"y":176.083345413208,"z":"a1500f38.53c3e","wires":[["9162cd79.14658","3eddd5cf.e6463a"]]},{"id":"2af077bd.a29358","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1346.5913696289062,"y":303.81356716156006,"z":"a1500f38.53c3e","wires":[["9f219d1a.64396","598e436e.a80f1c"]]},{"id":"598e436e.a80f1c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1575.305648803711,"y":354.8135452270508,"z":"a1500f38.53c3e","wires":[["d978e183.52eb8"]]},{"id":"9f219d1a.64396","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1573.7342681884766,"y":303.3850030899048,"z":"a1500f38.53c3e","wires":[["d978e183.52eb8"]]},{"id":"d978e183.52eb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1739.8770217895508,"y":354.6707239151001,"z":"a1500f38.53c3e","wires":[]},{"id":"dffc6547.7214d8","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1357.34130859375,"y":406.2420825958252,"z":"a1500f38.53c3e","wires":[["d60757e2.82ff78"]]},{"id":"d60757e2.82ff78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1576.3412780761719,"y":406.38492012023926,"z":"a1500f38.53c3e","wires":[["b2e6c97f.26fa58"]]},{"id":"b2e6c97f.26fa58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1765.198486328125,"y":406.67064094543457,"z":"a1500f38.53c3e","wires":[]},{"id":"8d7c9ac.030d068","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1353.4485397338867,"y":460.24215602874756,"z":"a1500f38.53c3e","wires":[["44e2dc10.614bd4"]]},{"id":"44e2dc10.614bd4","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1573.4485092163086,"y":460.3849935531616,"z":"a1500f38.53c3e","wires":[["3cb0240a.f6544c"]]},{"id":"3cb0240a.f6544c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1768.3057174682617,"y":460.67071437835693,"z":"a1500f38.53c3e","wires":[]},{"id":"193531be.f37bae","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1087.1191482543945,"y":303.79775619506836,"z":"a1500f38.53c3e","wires":[["2af077bd.a29358","dffc6547.7214d8","8d7c9ac.030d068","77a4d146.d7dc","77259fa6.669ab","7d03f557.462e9c"]]},{"id":"f19c8d58.4a549","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":791.6904830932617,"y":701.6190490722656,"z":"a1500f38.53c3e","wires":[["828e15d2.79b178"]]},{"id":"7797f0bb.8a36c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":854.4404830932617,"y":642.8690490722656,"z":"a1500f38.53c3e","wires":[["193531be.f37bae","fd2a3a1a.99f018"]]},{"id":"4e79020d.f21e3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":792.9404830932617,"y":759.1190500259399,"z":"a1500f38.53c3e","wires":[["19c4d34a.91c3dd"]]},{"id":"547b268.884f1d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":827.4404830932617,"y":580.8690509796143,"z":"a1500f38.53c3e","wires":[["193531be.f37bae","2b43b340.5116cc"]]},{"id":"77a4d146.d7dc","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1353.15478515625,"y":511.36915588378906,"z":"a1500f38.53c3e","wires":[["46e24365.9866cc"]]},{"id":"46e24365.9866cc","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1574.1547546386719,"y":511.5119934082031,"z":"a1500f38.53c3e","wires":[["c1fb7f1e.e7973"]]},{"id":"c1fb7f1e.e7973","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1769.011962890625,"y":511.79771423339844,"z":"a1500f38.53c3e","wires":[]},{"id":"3eddd5cf.e6463a","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":464.9842300415039,"y":176.24210929870605,"z":"a1500f38.53c3e","wires":[["fbc8c7a9.c38ab8","65fb1338.4b47ec"]]},{"id":"65fb1338.4b47ec","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":675.9841995239258,"y":227.38494682312012,"z":"a1500f38.53c3e","wires":[["f2246943.f6e1d8"]]},{"id":"fbc8c7a9.c38ab8","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":675.1271286010742,"y":175.81354522705078,"z":"a1500f38.53c3e","wires":[["f2246943.f6e1d8"]]},{"id":"f2246943.f6e1d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":850.8414077758789,"y":227.67066764831543,"z":"a1500f38.53c3e","wires":[]},{"id":"77259fa6.669ab","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":1332.9999694824219,"y":198.14290809631348,"z":"a1500f38.53c3e","wires":[["175c0792.497be8"]]},{"id":"175c0792.497be8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1536.5713806152344,"y":198.0000286102295,"z":"a1500f38.53c3e","wires":[["8639aa6b.22c9e8"]]},{"id":"8639aa6b.22c9e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":1698.0713806152344,"y":198.2500286102295,"z":"a1500f38.53c3e","wires":[]},{"id":"7d03f557.462e9c","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":1329.000015258789,"y":252.57145595550537,"z":"a1500f38.53c3e","wires":[["4fed628b.c7308c"]]},{"id":"4fed628b.c7308c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1536.8571338653564,"y":252.85716342926025,"z":"a1500f38.53c3e","wires":[["2d42aa93.47ca86"]]},{"id":"2d42aa93.47ca86","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":1698.3571338653564,"y":253.10716342926025,"z":"a1500f38.53c3e","wires":[]}] \ No newline at end of file
+[{"id":"18c57a33.efbf46","type":"dgstart","name":"DGSTART","outputs":1,"x":138.3333282470703,"y":63.33333206176758,"z":"a1500f38.53c3e","wires":[["a39f2a21.325218"]]},{"id":"a39f2a21.325218","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":345.9444351196289,"y":64.11111640930176,"z":"a1500f38.53c3e","wires":[["7005a08d.a5fc7"]]},{"id":"7005a08d.a5fc7","type":"method","name":"vnf-topology-automated-operation","xml":"<method rpc='vnf-topology-automated-operation' mode='sync'>\n","comments":"","outputs":1,"x":259.8333206176758,"y":119.55555152893066,"z":"a1500f38.53c3e","wires":[["f2e2d7f9.0126f8"]]},{"id":"9162cd79.14658","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":422.7460174560547,"y":580.9523010253906,"z":"a1500f38.53c3e","wires":[["8224b548.40b4a8","5f465d1e.4d94b4","d983d392.1d9a6","98e7501f.26dbc","59d3b456.0a00fc"]]},{"id":"8224b548.40b4a8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":639.5793914794922,"y":866.7024803161621,"z":"a1500f38.53c3e","wires":[["72343cc8.fc7bb4"]]},{"id":"5f465d1e.4d94b4","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":640.3015747070312,"y":580.9523067474365,"z":"a1500f38.53c3e","wires":[["547b268.884f1d8"]]},{"id":"72343cc8.fc7bb4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":811.5793914794922,"y":866.7024803161621,"z":"a1500f38.53c3e","wires":[]},{"id":"d983d392.1d9a6","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":643.3015899658203,"y":702.2022953033447,"z":"a1500f38.53c3e","wires":[["f19c8d58.4a549"]]},{"id":"98e7501f.26dbc","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":643.0515899658203,"y":759.452296257019,"z":"a1500f38.53c3e","wires":[["4e79020d.f21e3c"]]},{"id":"cee7b9d8.a8e638","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":661.8015899658203,"y":643.4522972106934,"z":"a1500f38.53c3e","wires":[["7797f0bb.8a36c"]]},{"id":"59d3b456.0a00fc","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":640.6627502441406,"y":812.3135557174683,"z":"a1500f38.53c3e","wires":[["d8f73085.d4515"]]},{"id":"2b43b340.5116cc","type":"call","name":"call: vnf-topology-automated-assign","xml":"<call module='VNF-API' rpc='vnf-topology-automated-assign' mode='sync' >","comments":"","outputs":1,"x":1113.5515747070312,"y":580.9522495269775,"z":"a1500f38.53c3e","wires":[[]]},{"id":"fd2a3a1a.99f018","type":"call","name":"call: vnf-topology-automated-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-automated-changeassign' mode='sync' >","comments":"","outputs":1,"x":1136.8016967773438,"y":641.9523048400879,"z":"a1500f38.53c3e","wires":[[]]},{"id":"19c4d34a.91c3dd","type":"call","name":"call: vnf-topology-automated-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-automated-rollback' mode='sync' >","comments":"","outputs":1,"x":1037.5516967773438,"y":759.4523067474365,"z":"a1500f38.53c3e","wires":[[]]},{"id":"d8f73085.d4515","type":"call","name":"call: vnf-topology-automated-delete","xml":"<call module='VNF-API' rpc='vnf-topology-automated-delete' mode='sync' >","comments":"","outputs":1,"x":883.4128189086914,"y":812.3135566711426,"z":"a1500f38.53c3e","wires":[[]]},{"id":"828e15d2.79b178","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":1037.0516891479492,"y":701.4523005485535,"z":"a1500f38.53c3e","wires":[[]]},{"id":"ef5eb70c.59f308","type":"comment","name":"vnf-topology-automated-operation","info":"","comments":"","x":734.0793533325195,"y":72.92062950134277,"z":"a1500f38.53c3e","wires":[]},{"id":"f2e2d7f9.0126f8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":240.33333587646484,"y":176.083345413208,"z":"a1500f38.53c3e","wires":[["9162cd79.14658","3eddd5cf.e6463a"]]},{"id":"2af077bd.a29358","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1346.5913696289062,"y":303.81356716156006,"z":"a1500f38.53c3e","wires":[["9f219d1a.64396","598e436e.a80f1c"]]},{"id":"598e436e.a80f1c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1575.305648803711,"y":354.8135452270508,"z":"a1500f38.53c3e","wires":[["d978e183.52eb8"]]},{"id":"9f219d1a.64396","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1573.7342681884766,"y":303.3850030899048,"z":"a1500f38.53c3e","wires":[["d978e183.52eb8"]]},{"id":"d978e183.52eb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1739.8770217895508,"y":354.6707239151001,"z":"a1500f38.53c3e","wires":[]},{"id":"dffc6547.7214d8","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1357.34130859375,"y":406.2420825958252,"z":"a1500f38.53c3e","wires":[["d60757e2.82ff78"]]},{"id":"d60757e2.82ff78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1576.3412780761719,"y":406.38492012023926,"z":"a1500f38.53c3e","wires":[["b2e6c97f.26fa58"]]},{"id":"b2e6c97f.26fa58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1765.198486328125,"y":406.67064094543457,"z":"a1500f38.53c3e","wires":[]},{"id":"8d7c9ac.030d068","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1353.4485397338867,"y":460.24215602874756,"z":"a1500f38.53c3e","wires":[["44e2dc10.614bd4"]]},{"id":"44e2dc10.614bd4","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1573.4485092163086,"y":460.3849935531616,"z":"a1500f38.53c3e","wires":[["3cb0240a.f6544c"]]},{"id":"3cb0240a.f6544c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1768.3057174682617,"y":460.67071437835693,"z":"a1500f38.53c3e","wires":[]},{"id":"193531be.f37bae","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1087.1191482543945,"y":303.79775619506836,"z":"a1500f38.53c3e","wires":[["2af077bd.a29358","dffc6547.7214d8","8d7c9ac.030d068","77a4d146.d7dc","77259fa6.669ab","7d03f557.462e9c"]]},{"id":"f19c8d58.4a549","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":791.6904830932617,"y":701.6190490722656,"z":"a1500f38.53c3e","wires":[["828e15d2.79b178"]]},{"id":"7797f0bb.8a36c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":854.4404830932617,"y":642.8690490722656,"z":"a1500f38.53c3e","wires":[["193531be.f37bae","fd2a3a1a.99f018"]]},{"id":"4e79020d.f21e3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":792.9404830932617,"y":759.1190500259399,"z":"a1500f38.53c3e","wires":[["19c4d34a.91c3dd"]]},{"id":"547b268.884f1d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":827.4404830932617,"y":580.8690509796143,"z":"a1500f38.53c3e","wires":[["193531be.f37bae","2b43b340.5116cc"]]},{"id":"77a4d146.d7dc","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1353.15478515625,"y":511.36915588378906,"z":"a1500f38.53c3e","wires":[["46e24365.9866cc"]]},{"id":"46e24365.9866cc","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1574.1547546386719,"y":511.5119934082031,"z":"a1500f38.53c3e","wires":[["c1fb7f1e.e7973"]]},{"id":"c1fb7f1e.e7973","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1769.011962890625,"y":511.79771423339844,"z":"a1500f38.53c3e","wires":[]},{"id":"3eddd5cf.e6463a","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":464.9842300415039,"y":176.24210929870605,"z":"a1500f38.53c3e","wires":[["fbc8c7a9.c38ab8","65fb1338.4b47ec"]]},{"id":"65fb1338.4b47ec","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":675.9841995239258,"y":227.38494682312012,"z":"a1500f38.53c3e","wires":[["f2246943.f6e1d8"]]},{"id":"fbc8c7a9.c38ab8","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":675.1271286010742,"y":175.81354522705078,"z":"a1500f38.53c3e","wires":[["f2246943.f6e1d8"]]},{"id":"f2246943.f6e1d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":850.8414077758789,"y":227.67066764831543,"z":"a1500f38.53c3e","wires":[]},{"id":"77259fa6.669ab","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":1332.9999694824219,"y":198.14290809631348,"z":"a1500f38.53c3e","wires":[["175c0792.497be8"]]},{"id":"175c0792.497be8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1536.5713806152344,"y":198.0000286102295,"z":"a1500f38.53c3e","wires":[["8639aa6b.22c9e8"]]},{"id":"8639aa6b.22c9e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":1698.0713806152344,"y":198.2500286102295,"z":"a1500f38.53c3e","wires":[]},{"id":"7d03f557.462e9c","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":1329.000015258789,"y":252.57145595550537,"z":"a1500f38.53c3e","wires":[["4fed628b.c7308c"]]},{"id":"4fed628b.c7308c","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1536.8571338653564,"y":252.85716342926025,"z":"a1500f38.53c3e","wires":[["2d42aa93.47ca86"]]},{"id":"2d42aa93.47ca86","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":1698.3571338653564,"y":253.10716342926025,"z":"a1500f38.53c3e","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-rollback.json
index 112f3d5a..b9b0359e 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-automated-rollback.json
@@ -1 +1 @@
-[{"id":"2df19079.01dee","type":"comment","name":"vnf-topology-automated-rollback","info":"","comments":"","x":781.6666259765625,"y":85,"z":"852e9052.1933","wires":[]},{"id":"8a5a63e.605c3a","type":"method","name":"method vnf-topology-automated-rollback","xml":"<method rpc='vnf-topology-automated-rollback' mode='sync'>\n","comments":"","outputs":1,"x":218.00005340576172,"y":143.72221851348877,"z":"852e9052.1933","wires":[["ea4526ce.6a7fe8"]]},{"id":"64773b27.1076f4","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":311.0000915527344,"y":65.61112022399902,"z":"852e9052.1933","wires":[["8a5a63e.605c3a"]]},{"id":"d15cd70a.44d268","type":"dgstart","name":"DGSTART","outputs":1,"x":107.83336639404297,"y":65.55555725097656,"z":"852e9052.1933","wires":[["64773b27.1076f4"]]},{"id":"38300bd0.9d91a4","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":565.0120162963867,"y":400.29102516174316,"z":"852e9052.1933","wires":[]},{"id":"8e11ce88.6d977","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">","comments":"","outputs":1,"x":596.4244003295898,"y":250.84835243225098,"z":"852e9052.1933","wires":[["527bd20f.db61ac"]]},{"id":"527bd20f.db61ac","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":828.0077819824219,"y":250.6816644668579,"z":"852e9052.1933","wires":[["8c38cdbb.f8955"]]},{"id":"8c38cdbb.f8955","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":980.3409118652344,"y":250.68172550201416,"z":"852e9052.1933","wires":[]},{"id":"8cc0bfaa.280a8","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":528.7697296142578,"y":447.87234020233154,"z":"852e9052.1933","wires":[]},{"id":"ed465a50.3ba868","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":816.6819763183594,"y":203.63890933990479,"z":"852e9052.1933","wires":[["a7bd6389.171b5"]]},{"id":"a7bd6389.171b5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>","comments":"","x":979.7727966308594,"y":204.04801273345947,"z":"852e9052.1933","wires":[]},{"id":"ffb7307a.7a1ec","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":591.6560516357422,"y":350.84999656677246,"z":"852e9052.1933","wires":[]},{"id":"5953a9f9.983b98","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":538.0450286865234,"y":495.85004782676697,"z":"852e9052.1933","wires":[]},{"id":"2d8f7fa7.aece","type":"switchNode","name":"switch:CONFIG == INPUT - vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":585.8334579467773,"y":203.63890933990479,"z":"852e9052.1933","wires":[["ed465a50.3ba868"]]},{"id":"ea4526ce.6a7fe8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":295.33343505859375,"y":202.88890647888184,"z":"852e9052.1933","wires":[["2d8f7fa7.aece","8e11ce88.6d977","ffb7307a.7a1ec","38300bd0.9d91a4","8cc0bfaa.280a8","5953a9f9.983b98","4ba4d3b6.88298c"]]},{"id":"5fa2bce2.0c59d4","type":"comment","name":"Only valid to rollback assigned vf-module with Orchestration status = PendingCreate","info":"","comments":"","x":793.0833740234375,"y":121.00000190734863,"z":"852e9052.1933","wires":[]},{"id":"4ba4d3b6.88298c","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":586.6428604125977,"y":300,"z":"852e9052.1933","wires":[[]]}] \ No newline at end of file
+[{"id":"2df19079.01dee","type":"comment","name":"vnf-topology-automated-rollback","info":"","comments":"","x":781.6666259765625,"y":85,"z":"852e9052.1933","wires":[]},{"id":"8a5a63e.605c3a","type":"method","name":"method vnf-topology-automated-rollback","xml":"<method rpc='vnf-topology-automated-rollback' mode='sync'>\n","comments":"","outputs":1,"x":218.00005340576172,"y":143.72221851348877,"z":"852e9052.1933","wires":[["ea4526ce.6a7fe8"]]},{"id":"64773b27.1076f4","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":311.0000915527344,"y":65.61112022399902,"z":"852e9052.1933","wires":[["8a5a63e.605c3a"]]},{"id":"d15cd70a.44d268","type":"dgstart","name":"DGSTART","outputs":1,"x":107.83336639404297,"y":65.55555725097656,"z":"852e9052.1933","wires":[["64773b27.1076f4"]]},{"id":"38300bd0.9d91a4","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":565.0120162963867,"y":400.29102516174316,"z":"852e9052.1933","wires":[]},{"id":"8e11ce88.6d977","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">","comments":"","outputs":1,"x":596.4244003295898,"y":250.84835243225098,"z":"852e9052.1933","wires":[["527bd20f.db61ac"]]},{"id":"527bd20f.db61ac","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":828.0077819824219,"y":250.6816644668579,"z":"852e9052.1933","wires":[["8c38cdbb.f8955"]]},{"id":"8c38cdbb.f8955","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":980.3409118652344,"y":250.68172550201416,"z":"852e9052.1933","wires":[]},{"id":"8cc0bfaa.280a8","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":528.7697296142578,"y":447.87234020233154,"z":"852e9052.1933","wires":[]},{"id":"ed465a50.3ba868","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":816.6819763183594,"y":203.63890933990479,"z":"852e9052.1933","wires":[["a7bd6389.171b5"]]},{"id":"a7bd6389.171b5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>","comments":"","x":979.7727966308594,"y":204.04801273345947,"z":"852e9052.1933","wires":[]},{"id":"ffb7307a.7a1ec","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":591.6560516357422,"y":350.84999656677246,"z":"852e9052.1933","wires":[]},{"id":"5953a9f9.983b98","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":538.0450286865234,"y":495.85004782676697,"z":"852e9052.1933","wires":[]},{"id":"2d8f7fa7.aece","type":"switchNode","name":"switch:CONFIG == INPUT - vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":585.8334579467773,"y":203.63890933990479,"z":"852e9052.1933","wires":[["ed465a50.3ba868"]]},{"id":"ea4526ce.6a7fe8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":295.33343505859375,"y":202.88890647888184,"z":"852e9052.1933","wires":[["2d8f7fa7.aece","8e11ce88.6d977","ffb7307a.7a1ec","38300bd0.9d91a4","8cc0bfaa.280a8","5953a9f9.983b98","4ba4d3b6.88298c"]]},{"id":"5fa2bce2.0c59d4","type":"comment","name":"Only valid to rollback assigned vf-module with Orchestration status = PendingCreate","info":"","comments":"","x":793.0833740234375,"y":121.00000190734863,"z":"852e9052.1933","wires":[]},{"id":"4ba4d3b6.88298c","type":"call","name":"call: rollback-eipam-ip-assignment","xml":"<call module='VNF-API' rpc='rollback-eipam-ip-assignment' mode='sync' >","comments":"","outputs":1,"x":586.6428604125977,"y":300,"z":"852e9052.1933","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json
index e0ca0c18..7ba41de9 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json
@@ -1 +1 @@
-[{"id":"1c2e4ec2.265511","type":"dgstart","name":"DGSTART","outputs":1,"x":168.57142639160156,"y":82.85714387893677,"z":"f2a32f4b.a395c","wires":[["327d7a0d.239446"]]},{"id":"327d7a0d.239446","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":390.4047393798828,"y":83.02382278442383,"z":"f2a32f4b.a395c","wires":[["b2fa78f1.5e9c28"]]},{"id":"a17bcae8.28c348","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":246.0714340209961,"y":185.85714387893677,"z":"f2a32f4b.a395c","wires":[["96ebfd33.34f83","fb382397.3c3d6","14bb58a1.af0e67","f9810dfb.b06c3","62e2a3ed.47ecac","3ae2afd7.ca527","ab86fb03.c39478","63823512.60608c","bd5aae62.fb397","2b097b37.aa27e4","4a603bf8.396a34"]]},{"id":"96ebfd33.34f83","type":"set","name":"set: order-status = PendingUpdate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingUpdate\"/>","comments":"","x":543.182975769043,"y":961.9848866462708,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"fb382397.3c3d6","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":481.4527893066406,"y":1096.7847657203674,"z":"f2a32f4b.a395c","wires":[]},{"id":"14bb58a1.af0e67","type":"switchNode","name":"switch: service-data order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":564.5714263916016,"y":229.85714387893677,"z":"f2a32f4b.a395c","wires":[["b9cd1561.1ea538"]]},{"id":"7f09bcc9.27e9a4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid service-data order status'/>","comments":"","x":969.3212432861328,"y":229.69051790237427,"z":"f2a32f4b.a395c","wires":[]},{"id":"b9cd1561.1ea538","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":810.7380523681641,"y":229.44039583206177,"z":"f2a32f4b.a395c","wires":[["7f09bcc9.27e9a4"]]},{"id":"b2fa78f1.5e9c28","type":"method","name":"method vnf-topology-changeassign","xml":"<method rpc='vnf-topology-changeassign' mode='sync'>\n","comments":"","outputs":1,"x":268.57142639160156,"y":133.85714387893677,"z":"f2a32f4b.a395c","wires":[["a17bcae8.28c348"]]},{"id":"f9810dfb.b06c3","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":481.1905288696289,"y":1007.9999012947083,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"62e2a3ed.47ecac","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":543.8572082519531,"y":912.6665992736816,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"3ae2afd7.ca527","type":"call","name":"call: vnf-topology-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":542.5714263916016,"y":274.85714387893677,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"63823512.60608c","type":"save","name":"delete relationship: vf-module","xml":"<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":526.7143096923828,"y":419.42879915237427,"z":"f2a32f4b.a395c","wires":[["c841e1cb.40476"]]},{"id":"8ad6d1c9.a9a0c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'An error occurred while deleting existing vf-module l3-network relationship in AnAI with with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id + ' vf-module update FAILED.'`\"/>","comments":"","x":928.5713043212891,"y":419.71416902542114,"z":"f2a32f4b.a395c","wires":[]},{"id":"ab86fb03.c39478","type":"save","name":"get AnAI - vf-module","xml":"<get-resource plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\">","comments":"","outputs":1,"x":500.57142639160156,"y":320.85714387893677,"z":"f2a32f4b.a395c","wires":[["1a5ea207.1792ee","34bdca57.146506"]]},{"id":"fdbb1fb1.edc49","type":"save","name":"save vf-module relationship: l3-network","xml":"<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":865.5435943603516,"y":545.4240374565125,"z":"f2a32f4b.a395c","wires":[["e5957add.e0e3b8"]]},{"id":"e5957add.e0e3b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1108.6878356933594,"y":545.4710698127747,"z":"f2a32f4b.a395c","wires":[["f3e1a4c1.9cbf48"]]},{"id":"bd5aae62.fb397","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":543.1903991699219,"y":545.3925185203552,"z":"f2a32f4b.a395c","wires":[["fdbb1fb1.edc49"]]},{"id":"d43666a.f2b7098","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to update vf-module l3-network relationship in AnAI. ' + $error-message`\"/>","comments":"","x":1435.6306610107422,"y":825.6659226417542,"z":"f2a32f4b.a395c","wires":[]},{"id":"f3e1a4c1.9cbf48","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1254.6665878295898,"y":545.7018132209778,"z":"f2a32f4b.a395c","wires":[["d43666a.f2b7098","9738bd98.25ecc","50861927.da6ba8","a7599cc5.49cd9"]]},{"id":"50861927.da6ba8","type":"save","name":"delete relationship: vf-module","xml":"<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1495.595199584961,"y":593.6305890083313,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"fef44b3b.61d0e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'An error occurred while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":881.8570098876953,"y":321.5712857246399,"z":"f2a32f4b.a395c","wires":[]},{"id":"c841e1cb.40476","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":742.5714263916016,"y":419.85714387893677,"z":"f2a32f4b.a395c","wires":[["8ad6d1c9.a9a0c"]]},{"id":"2b097b37.aa27e4","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":502.80956268310547,"y":1053.9524006843567,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"a7599cc5.49cd9","type":"for","name":"for i : tmp.AnAI.vfmodule.relationship","xml":"<for index=\"i\" start=\"0\" end=\"`$tmp.AnAI.vfmodule.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":1515.131004333496,"y":643.095263004303,"z":"f2a32f4b.a395c","wires":[["2c37487d.d71f68"]]},{"id":"2c37487d.d71f68","type":"switchNode","name":"switch: relationship.related-to","xml":"<switch test=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":1824.130973815918,"y":643.8095831871033,"z":"f2a32f4b.a395c","wires":[["adcc0a50.763648"]]},{"id":"adcc0a50.763648","type":"other","name":"l3-network","xml":"<outcome value='l3-network'>","comments":"","outputs":1,"x":2047.130973815918,"y":643.8095831871033,"z":"f2a32f4b.a395c","wires":[["fd90feeb.bd151"]]},{"id":"fd90feeb.bd151","type":"for","name":"for j : tmp.AnAI.vfmodule.relationship-data","xml":"<for index=\"j\" start=\"0\" end=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data_length`\">","comments":"","outputs":1,"x":1642.1309661865234,"y":726.4524254798889,"z":"f2a32f4b.a395c","wires":[["b995870e.83a938"]]},{"id":"b995870e.83a938","type":"save","name":"save vf-module relationship: l3-network","xml":"<save plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />","comments":"","outputs":1,"x":1999.7024230957031,"y":726.5953087806702,"z":"f2a32f4b.a395c","wires":[["cfb16deb.85c16","3cd815da.19e77a"]]},{"id":"cfb16deb.85c16","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2257.702423095703,"y":726.5953087806702,"z":"f2a32f4b.a395c","wires":[["a65d95ce.02bfa8"]]},{"id":"1a5ea207.1792ee","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":690.4286003112793,"y":321.00001192092896,"z":"f2a32f4b.a395c","wires":[["fef44b3b.61d0e8"]]},{"id":"9738bd98.25ecc","type":"set","name":"set error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\" />\n\t<parameter name=\"error-message\" value=\"`' | An error occurred while saving l3-network relationship with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id + ' for vf-module with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\" />\n","comments":"","x":1459.1667251586914,"y":545.6309809684753,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"a65d95ce.02bfa8","type":"set","name":"set error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\" />\n\t<parameter name=\"error-message\" value=\"`$error-message + ' | An error occurred while during rollback of l3-network relationship for vf-module with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\" />\n","comments":"","x":2455.6667404174805,"y":726.1309533119202,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"34bdca57.146506","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":697.3214263916016,"y":363.440456867218,"z":"f2a32f4b.a395c","wires":[["fef44b3b.61d0e8"]]},{"id":"3cd815da.19e77a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2267.9881286621094,"y":767.773805141449,"z":"f2a32f4b.a395c","wires":[["a65d95ce.02bfa8"]]},{"id":"4a603bf8.396a34","type":"switchNode","name":"switch ...service-data vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":543.8095855712891,"y":483.8095455169678,"z":"f2a32f4b.a395c","wires":[["b6182977.6d3518"]]},{"id":"b6182977.6d3518","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":771.2540588378906,"y":483.3372554779053,"z":"f2a32f4b.a395c","wires":[["8329b2ad.be702"]]},{"id":"8329b2ad.be702","type":"set","name":"set service-data vnf-networks[] = 0","xml":"<set>\n<parameter name = \"service-data.vnf-topology-information.vnf-assignments.vnf-networks_length\" value=\"0\" />\n","comments":"","x":992.809667799208,"y":483.33727614084864,"z":"f2a32f4b.a395c","wires":[]}] \ No newline at end of file
+[{"id":"1c2e4ec2.265511","type":"dgstart","name":"DGSTART","outputs":1,"x":168.57142639160156,"y":82.85714387893677,"z":"f2a32f4b.a395c","wires":[["327d7a0d.239446"]]},{"id":"327d7a0d.239446","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":390.4047393798828,"y":83.02382278442383,"z":"f2a32f4b.a395c","wires":[["b2fa78f1.5e9c28"]]},{"id":"a17bcae8.28c348","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":246.0714340209961,"y":185.85714387893677,"z":"f2a32f4b.a395c","wires":[["96ebfd33.34f83","fb382397.3c3d6","14bb58a1.af0e67","f9810dfb.b06c3","62e2a3ed.47ecac","3ae2afd7.ca527","ab86fb03.c39478","63823512.60608c","bd5aae62.fb397","2b097b37.aa27e4","4a603bf8.396a34"]]},{"id":"96ebfd33.34f83","type":"set","name":"set: order-status = PendingUpdate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingUpdate\"/>","comments":"","x":543.182975769043,"y":961.9848866462708,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"fb382397.3c3d6","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":481.4527893066406,"y":1096.7847657203674,"z":"f2a32f4b.a395c","wires":[]},{"id":"14bb58a1.af0e67","type":"switchNode","name":"switch: service-data order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":564.5714263916016,"y":229.85714387893677,"z":"f2a32f4b.a395c","wires":[["b9cd1561.1ea538"]]},{"id":"7f09bcc9.27e9a4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid service-data order status'/>","comments":"","x":969.3212432861328,"y":229.69051790237427,"z":"f2a32f4b.a395c","wires":[]},{"id":"b9cd1561.1ea538","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":810.7380523681641,"y":229.44039583206177,"z":"f2a32f4b.a395c","wires":[["7f09bcc9.27e9a4"]]},{"id":"b2fa78f1.5e9c28","type":"method","name":"method vnf-topology-changeassign","xml":"<method rpc='vnf-topology-changeassign' mode='sync'>\n","comments":"","outputs":1,"x":268.57142639160156,"y":133.85714387893677,"z":"f2a32f4b.a395c","wires":[["a17bcae8.28c348"]]},{"id":"f9810dfb.b06c3","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":481.1905288696289,"y":1007.9999012947083,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"62e2a3ed.47ecac","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":543.8572082519531,"y":912.6665992736816,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"3ae2afd7.ca527","type":"call","name":"call: vnf-topology-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":542.5714263916016,"y":274.85714387893677,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"63823512.60608c","type":"save","name":"delete relationship: vf-module","xml":"<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":526.7143096923828,"y":419.42879915237427,"z":"f2a32f4b.a395c","wires":[["c841e1cb.40476"]]},{"id":"8ad6d1c9.a9a0c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'An error occurred while deleting existing vf-module l3-network relationship in AnAI with with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id + ' vf-module update FAILED.'`\"/>","comments":"","x":928.5713043212891,"y":419.71416902542114,"z":"f2a32f4b.a395c","wires":[]},{"id":"ab86fb03.c39478","type":"save","name":"get AnAI - vf-module","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\">","comments":"","outputs":1,"x":500.57142639160156,"y":320.85714387893677,"z":"f2a32f4b.a395c","wires":[["1a5ea207.1792ee","34bdca57.146506"]]},{"id":"fdbb1fb1.edc49","type":"save","name":"save vf-module relationship: l3-network","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":865.5435943603516,"y":545.4240374565125,"z":"f2a32f4b.a395c","wires":[["e5957add.e0e3b8"]]},{"id":"e5957add.e0e3b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1108.6878356933594,"y":545.4710698127747,"z":"f2a32f4b.a395c","wires":[["f3e1a4c1.9cbf48"]]},{"id":"bd5aae62.fb397","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":543.1903991699219,"y":545.3925185203552,"z":"f2a32f4b.a395c","wires":[["fdbb1fb1.edc49"]]},{"id":"d43666a.f2b7098","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to update vf-module l3-network relationship in AnAI. ' + $error-message`\"/>","comments":"","x":1435.6306610107422,"y":825.6659226417542,"z":"f2a32f4b.a395c","wires":[]},{"id":"f3e1a4c1.9cbf48","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1254.6665878295898,"y":545.7018132209778,"z":"f2a32f4b.a395c","wires":[["d43666a.f2b7098","9738bd98.25ecc","50861927.da6ba8","a7599cc5.49cd9"]]},{"id":"50861927.da6ba8","type":"save","name":"delete relationship: vf-module","xml":"<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1495.595199584961,"y":593.6305890083313,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"fef44b3b.61d0e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'An error occurred while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":881.8570098876953,"y":321.5712857246399,"z":"f2a32f4b.a395c","wires":[]},{"id":"c841e1cb.40476","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":742.5714263916016,"y":419.85714387893677,"z":"f2a32f4b.a395c","wires":[["8ad6d1c9.a9a0c"]]},{"id":"2b097b37.aa27e4","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":502.80956268310547,"y":1053.9524006843567,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"a7599cc5.49cd9","type":"for","name":"for i : tmp.AnAI.vfmodule.relationship","xml":"<for index=\"i\" start=\"0\" end=\"`$tmp.AnAI.vfmodule.relationship-list.relationship_length`\">","comments":"","outputs":1,"x":1515.131004333496,"y":643.095263004303,"z":"f2a32f4b.a395c","wires":[["2c37487d.d71f68"]]},{"id":"2c37487d.d71f68","type":"switchNode","name":"switch: relationship.related-to","xml":"<switch test=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].related-to`\">","comments":"","outputs":1,"x":1824.130973815918,"y":643.8095831871033,"z":"f2a32f4b.a395c","wires":[["adcc0a50.763648"]]},{"id":"adcc0a50.763648","type":"other","name":"l3-network","xml":"<outcome value='l3-network'>","comments":"","outputs":1,"x":2047.130973815918,"y":643.8095831871033,"z":"f2a32f4b.a395c","wires":[["fd90feeb.bd151"]]},{"id":"fd90feeb.bd151","type":"for","name":"for j : tmp.AnAI.vfmodule.relationship-data","xml":"<for index=\"j\" start=\"0\" end=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data_length`\">","comments":"","outputs":1,"x":1642.1309661865234,"y":726.4524254798889,"z":"f2a32f4b.a395c","wires":[["b995870e.83a938"]]},{"id":"b995870e.83a938","type":"save","name":"save vf-module relationship: l3-network","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.AnAI.vfmodule.relationship-list.relationship[$i].relationship-data[$j].relationship-value`\" />","comments":"","outputs":1,"x":1999.7024230957031,"y":726.5953087806702,"z":"f2a32f4b.a395c","wires":[["cfb16deb.85c16","3cd815da.19e77a"]]},{"id":"cfb16deb.85c16","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2257.702423095703,"y":726.5953087806702,"z":"f2a32f4b.a395c","wires":[["a65d95ce.02bfa8"]]},{"id":"1a5ea207.1792ee","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":690.4286003112793,"y":321.00001192092896,"z":"f2a32f4b.a395c","wires":[["fef44b3b.61d0e8"]]},{"id":"9738bd98.25ecc","type":"set","name":"set error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\" />\n\t<parameter name=\"error-message\" value=\"`' | An error occurred while saving l3-network relationship with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id + ' for vf-module with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\" />\n","comments":"","x":1459.1667251586914,"y":545.6309809684753,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"a65d95ce.02bfa8","type":"set","name":"set error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\" />\n\t<parameter name=\"error-message\" value=\"`$error-message + ' | An error occurred while during rollback of l3-network relationship for vf-module with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\" />\n","comments":"","x":2455.6667404174805,"y":726.1309533119202,"z":"f2a32f4b.a395c","wires":[[]]},{"id":"34bdca57.146506","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":697.3214263916016,"y":363.440456867218,"z":"f2a32f4b.a395c","wires":[["fef44b3b.61d0e8"]]},{"id":"3cd815da.19e77a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2267.9881286621094,"y":767.773805141449,"z":"f2a32f4b.a395c","wires":[["a65d95ce.02bfa8"]]},{"id":"4a603bf8.396a34","type":"switchNode","name":"switch ...service-data vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":543.8095855712891,"y":483.8095455169678,"z":"f2a32f4b.a395c","wires":[["b6182977.6d3518"]]},{"id":"b6182977.6d3518","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":771.2540588378906,"y":483.3372554779053,"z":"f2a32f4b.a395c","wires":[["8329b2ad.be702"]]},{"id":"8329b2ad.be702","type":"set","name":"set service-data vnf-networks[] = 0","xml":"<set>\n<parameter name = \"service-data.vnf-topology-information.vnf-assignments.vnf-networks_length\" value=\"0\" />\n","comments":"","x":992.809667799208,"y":483.33727614084864,"z":"f2a32f4b.a395c","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json
index ec7779f2..2c7d5555 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json
@@ -61,7 +61,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 399.43206787109375,
"y": 81.83334445953369,
@@ -256,7 +256,7 @@
"id": "af3c9c59.5186d",
"type": "save",
"name": "update generic-vnf status to pending-delete",
- "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n",
+ "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n",
"comments": "",
"outputs": 1,
"x": 611.7352142333984,
@@ -266,4 +266,4 @@
[]
]
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json
index 751eb596..34cb3426 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json
@@ -67,7 +67,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 350.7653503417969,
"y": 69.05556106567383,
@@ -332,7 +332,7 @@
"id": "a2aea115.0a314",
"type": "save",
"name": "delete generic-vnf-l3-network",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n",
"comments": "",
"outputs": 1,
"x": 1227.9320983886719,
@@ -348,7 +348,7 @@
"id": "6635778e.a76f48",
"type": "save",
"name": "delete GammaResource: generic-vnf",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n",
"comments": "",
"outputs": 1,
"x": 1251.5912628173828,
@@ -364,7 +364,7 @@
"id": "7f88cb67.0cb8a4",
"type": "save",
"name": "delete generic-vnf-vserver",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n",
"comments": "",
"outputs": 1,
"x": 1219.3412628173828,
@@ -470,7 +470,7 @@
"id": "7b46fa5d.f08144",
"type": "save",
"name": "delete AnAI: generic-vnf",
- "xml": "<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n",
"comments": "",
"outputs": 1,
"x": 1211.0432662963867,
@@ -531,4 +531,4 @@
"z": "730f50c9.364a4",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json
index 5ddc59fa..2cb2e21a 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json
@@ -1 +1 @@
-[{"id":"7c224822.de0bf8","type":"dgstart","name":"DGSTART","outputs":1,"x":151.42857360839844,"y":77.14286041259766,"z":"18357c4f.d20534","wires":[["4450b5a4.63b3bc"]]},{"id":"d95979ed.a93438","type":"method","name":"vnf-topology-operation","xml":"<method rpc='vnf-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":218.92857360839844,"y":137.6507921218872,"z":"18357c4f.d20534","wires":[["4d30e664.ab5478"]]},{"id":"4d30e664.ab5478","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":237.00003051757812,"y":200.14287567138672,"z":"18357c4f.d20534","wires":[["f2e393f6.829c1"]]},{"id":"4450b5a4.63b3bc","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":359.03968048095703,"y":77.92064476013184,"z":"18357c4f.d20534","wires":[["d95979ed.a93438"]]},{"id":"f2e393f6.829c1","type":"switchNode","name":"switch: INPUT use-preload","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.use-preload`\">","comments":"","outputs":1,"x":482.1428680419922,"y":200.428560256958,"z":"18357c4f.d20534","wires":[["becf3fd1.846a7","e10f53ce.5364a","9db68f85.0badf"]]},{"id":"becf3fd1.846a7","type":"other","name":"Y","xml":"<outcome value='Y'>","comments":"","outputs":1,"x":729.3969612121582,"y":171.23642539978027,"z":"18357c4f.d20534","wires":[["34569cc.b53e864"]]},{"id":"e10f53ce.5364a","type":"other","name":"N","xml":"<outcome value='N'>","comments":"","outputs":1,"x":729.0159873962402,"y":272.36340522766113,"z":"18357c4f.d20534","wires":[["57f77e4c.ac732"]]},{"id":"34569cc.b53e864","type":"call","name":"call: vnf-topology-preload-operation","xml":"<call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' >","comments":"","outputs":1,"x":990.8571853637695,"y":201.00000953674316,"z":"18357c4f.d20534","wires":[[]]},{"id":"57f77e4c.ac732","type":"call","name":"call: vnf-topology-automated-operation","xml":"<call module='VNF-API' rpc='vnf-topology-automated-operation' mode='sync' >","comments":"","outputs":1,"x":1000.8571548461914,"y":272.42856311798096,"z":"18357c4f.d20534","wires":[[]]},{"id":"9db68f85.0badf","type":"other","name":"Null","xml":"<outcome value=''>","comments":"","outputs":1,"x":727.5714492797852,"y":223.14285564422607,"z":"18357c4f.d20534","wires":[["34569cc.b53e864"]]}] \ No newline at end of file
+[{"id":"7c224822.de0bf8","type":"dgstart","name":"DGSTART","outputs":1,"x":151.42857360839844,"y":77.14286041259766,"z":"18357c4f.d20534","wires":[["4450b5a4.63b3bc"]]},{"id":"d95979ed.a93438","type":"method","name":"vnf-topology-operation","xml":"<method rpc='vnf-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":218.92857360839844,"y":137.6507921218872,"z":"18357c4f.d20534","wires":[["4d30e664.ab5478"]]},{"id":"4d30e664.ab5478","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":237.00003051757812,"y":200.14287567138672,"z":"18357c4f.d20534","wires":[["f2e393f6.829c1"]]},{"id":"4450b5a4.63b3bc","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":359.03968048095703,"y":77.92064476013184,"z":"18357c4f.d20534","wires":[["d95979ed.a93438"]]},{"id":"f2e393f6.829c1","type":"switchNode","name":"switch: INPUT use-preload","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.use-preload`\">","comments":"","outputs":1,"x":482.1428680419922,"y":200.428560256958,"z":"18357c4f.d20534","wires":[["becf3fd1.846a7","e10f53ce.5364a","9db68f85.0badf"]]},{"id":"becf3fd1.846a7","type":"other","name":"Y","xml":"<outcome value='Y'>","comments":"","outputs":1,"x":729.3969612121582,"y":171.23642539978027,"z":"18357c4f.d20534","wires":[["34569cc.b53e864"]]},{"id":"e10f53ce.5364a","type":"other","name":"N","xml":"<outcome value='N'>","comments":"","outputs":1,"x":729.0159873962402,"y":272.36340522766113,"z":"18357c4f.d20534","wires":[["57f77e4c.ac732"]]},{"id":"34569cc.b53e864","type":"call","name":"call: vnf-topology-preload-operation","xml":"<call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' >","comments":"","outputs":1,"x":990.8571853637695,"y":201.00000953674316,"z":"18357c4f.d20534","wires":[[]]},{"id":"57f77e4c.ac732","type":"call","name":"call: vnf-topology-automated-operation","xml":"<call module='VNF-API' rpc='vnf-topology-automated-operation' mode='sync' >","comments":"","outputs":1,"x":1000.8571548461914,"y":272.42856311798096,"z":"18357c4f.d20534","wires":[[]]},{"id":"9db68f85.0badf","type":"other","name":"Null","xml":"<outcome value=''>","comments":"","outputs":1,"x":727.5714492797852,"y":223.14285564422607,"z":"18357c4f.d20534","wires":[["34569cc.b53e864"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-preload-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-preload-operation.json
index 460eb31d..af0cd9e9 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-preload-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-preload-operation.json
@@ -1 +1 @@
-[{"id":"27382898.127288","type":"dgstart","name":"DGSTART","outputs":1,"x":105.71430206298828,"y":20.000000953674316,"z":"92a428a4.4be018","wires":[["da86500.c82cab"]]},{"id":"da86500.c82cab","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":313.3254089355469,"y":20.777785301208496,"z":"92a428a4.4be018","wires":[["45974f49.3e0bb"]]},{"id":"45974f49.3e0bb","type":"method","name":"vnf-topology-preload-operation","xml":"<method rpc='vnf-topology-preload-operation' mode='sync'>\n","comments":"","outputs":1,"x":232.92855834960938,"y":80.79364585876465,"z":"92a428a4.4be018","wires":[["2e83e166.81c9ce"]]},{"id":"19e5b740.1bbdb9","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":364.4126968383789,"y":723.3332614898682,"z":"92a428a4.4be018","wires":[["bc453dc4.37403","f70ce018.29f22","6d06e616.179dc8","fdd37020.a7e9d","8b547a17.7f8778","37529cbb.9f60c4"]]},{"id":"bc453dc4.37403","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":579.9960556030273,"y":1140.083420753479,"z":"92a428a4.4be018","wires":[["66ea35b2.ce742c"]]},{"id":"f70ce018.29f22","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":581.9682540893555,"y":723.3332672119141,"z":"92a428a4.4be018","wires":[["a5973f66.bde0b"]]},{"id":"66ea35b2.ce742c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":751.9960556030273,"y":1140.083420753479,"z":"92a428a4.4be018","wires":[]},{"id":"6d06e616.179dc8","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":584.9682693481445,"y":812.5832557678223,"z":"92a428a4.4be018","wires":[["6fc64ea9.47d27"]]},{"id":"fdd37020.a7e9d","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":584.7182693481445,"y":854.8332567214966,"z":"92a428a4.4be018","wires":[["e81e121b.9d7d4"]]},{"id":"37529cbb.9f60c4","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":603.4682693481445,"y":768.8332576751709,"z":"92a428a4.4be018","wires":[["4b2ba6a6.5bfb58"]]},{"id":"8b547a17.7f8778","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":581.0794143676758,"y":1093.6944961547852,"z":"92a428a4.4be018","wires":[["463ecdea.916a04"]]},{"id":"dab3d2fe.9b3b8","type":"call","name":"call: vnf-topology-assign","xml":"<call module='VNF-API' rpc='vnf-topology-assign' mode='sync' >","comments":"","outputs":1,"x":974.2182540893555,"y":723.3332653045654,"z":"92a428a4.4be018","wires":[[]]},{"id":"90793683.10ad78","type":"other","name":"changedelete","xml":"<outcome value='changedelete'>","comments":"","outputs":1,"x":601.7182998657227,"y":952.5832653045654,"z":"92a428a4.4be018","wires":[["99083217.f89ae"]]},{"id":"852e8019.fd2ce","type":"call","name":"call: vnf-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":997.468376159668,"y":767.3332653045654,"z":"92a428a4.4be018","wires":[[]]},{"id":"d6877835.c8b078","type":"call","name":"call: vnf-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":979.218376159668,"y":854.8332672119141,"z":"92a428a4.4be018","wires":[[]]},{"id":"463ecdea.916a04","type":"call","name":"call: vnf-topology-delete","xml":"<call module='VNF-API' rpc='vnf-topology-delete' mode='sync' >","comments":"","outputs":1,"x":789.8294830322266,"y":1093.6944971084595,"z":"92a428a4.4be018","wires":[[]]},{"id":"7d86d5e2.f9dc1c","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":978.7183685302734,"y":811.833261013031,"z":"92a428a4.4be018","wires":[[]]},{"id":"18365e43.db5f52","type":"call","name":"call: vnf-topology-changedelete","xml":"<call module='VNF-API' rpc='vnf-topology-changedelete' mode='sync' >","comments":"","outputs":1,"x":984.2183837890625,"y":1043.583267211914,"z":"92a428a4.4be018","wires":[[]]},{"id":"edaa795d.815648","type":"comment","name":"vnf-topology-preload-operation","info":"","comments":"","x":708.6031723022461,"y":59.587297439575195,"z":"92a428a4.4be018","wires":[]},{"id":"2e83e166.81c9ce","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":169.8571548461914,"y":138.0000057220459,"z":"92a428a4.4be018","wires":[["e10d753d.1a5108","e57664b7.a0cb78","19e5b740.1bbdb9","6ee4c55.7765b3c"]]},{"id":"e10d753d.1a5108","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":418.36509704589844,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["f6d54468.393c88","7be45943.cc6978"]]},{"id":"f6d54468.393c88","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":632.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["d8f7b15c.f03e6"]]},{"id":"7be45943.cc6978","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":633.3651428222656,"y":185.58727836608887,"z":"92a428a4.4be018","wires":[["b1504b8f.bb2e18"]]},{"id":"d8f7b15c.f03e6","type":"switchNode","name":"switch: PRELOAD vnf-name","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":843.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["6b9d4424.f09efc","99560218.ef1e6"]]},{"id":"6b9d4424.f09efc","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1054.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["b2beb900.1fb638"]]},{"id":"99560218.ef1e6","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1055.3651428222656,"y":184.58727836608887,"z":"92a428a4.4be018","wires":[["34e1e6d9.6c147a"]]},{"id":"b2beb900.1fb638","type":"switchNode","name":"switch: vnf-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":1302.3650817871094,"y":138.15870571136475,"z":"92a428a4.4be018","wires":[["4acdda61.594564"]]},{"id":"4acdda61.594564","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1548.6984481811523,"y":137.825608253479,"z":"92a428a4.4be018","wires":[["4f6229f6.67b498"]]},{"id":"4f6229f6.67b498","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-name not found in preload-data'/>","comments":"","x":1707.3650741577148,"y":137.15870761871338,"z":"92a428a4.4be018","wires":[]},{"id":"34e1e6d9.6c147a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-name'/>","comments":"","x":1222.3651428222656,"y":184.58727836608887,"z":"92a428a4.4be018","wires":[]},{"id":"b1504b8f.bb2e18","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":794.8651428222656,"y":185.83727836608887,"z":"92a428a4.4be018","wires":[]},{"id":"e57664b7.a0cb78","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":410.2222442626953,"y":257.5872712135315,"z":"92a428a4.4be018","wires":[["e531261b.ed3c88","b1342015.3408b"]]},{"id":"e531261b.ed3c88","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":627.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["5edfa51c.3acd5c"]]},{"id":"b1342015.3408b","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":628.2222785949707,"y":308.87298822402954,"z":"92a428a4.4be018","wires":[["9119f902.c4ce58"]]},{"id":"5edfa51c.3acd5c","type":"switchNode","name":"switch: PRELOAD vnf-type","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":838.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["306c4502.a9f18a","457d774f.08d388"]]},{"id":"306c4502.a9f18a","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1049.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["713425d2.ff15dc"]]},{"id":"457d774f.08d388","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1050.2222785949707,"y":307.87298822402954,"z":"92a428a4.4be018","wires":[["4e5864e1.616eac"]]},{"id":"9119f902.c4ce58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":789.7222785949707,"y":309.12298822402954,"z":"92a428a4.4be018","wires":[]},{"id":"713425d2.ff15dc","type":"switchNode","name":"switch: vnf-type INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":1297.2222137451172,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["7851a2cb.dac9cc"]]},{"id":"4e5864e1.616eac","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-type'/>","comments":"","x":1217.222255706787,"y":307.87298822402954,"z":"92a428a4.4be018","wires":[]},{"id":"7851a2cb.dac9cc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1546.2222137451172,"y":258.9207673072815,"z":"92a428a4.4be018","wires":[["352d87ea.74b988"]]},{"id":"352d87ea.74b988","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-type not found in preload-data'/>","comments":"","x":1704.8888397216797,"y":258.25386667251587,"z":"92a428a4.4be018","wires":[]},{"id":"6ee4c55.7765b3c","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":405.75806427001953,"y":374.90874195098877,"z":"92a428a4.4be018","wires":[["a668f8f8.c2e6e8","36879ada.5a4b76"]]},{"id":"36879ada.5a4b76","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":588.7580184936523,"y":424.9087247848511,"z":"92a428a4.4be018","wires":[["caf5e229.ed387"]]},{"id":"a668f8f8.c2e6e8","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":587.9009628295898,"y":374.4801778793335,"z":"92a428a4.4be018","wires":[["caf5e229.ed387"]]},{"id":"caf5e229.ed387","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":763.6152267456055,"y":425.1944456100464,"z":"92a428a4.4be018","wires":[]},{"id":"bd1afb26.982af8","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1223.8295059204102,"y":489.05160427093506,"z":"92a428a4.4be018","wires":[["fa68e5d5.3ea798","cbda632b.05b6"]]},{"id":"cbda632b.05b6","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1456.829475402832,"y":527.1944417953491,"z":"92a428a4.4be018","wires":[["4e5d27c4.668018"]]},{"id":"fa68e5d5.3ea798","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1455.9724044799805,"y":489.6230401992798,"z":"92a428a4.4be018","wires":[["4e5d27c4.668018"]]},{"id":"4e5d27c4.668018","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1610.6866836547852,"y":527.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"92006f83.303b6","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1235.5795059204102,"y":570.0516042709351,"z":"92a428a4.4be018","wires":[["cae82f17.dd03f"]]},{"id":"cae82f17.dd03f","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1453.579475402832,"y":570.1944417953491,"z":"92a428a4.4be018","wires":[["e4890c61.433f"]]},{"id":"e4890c61.433f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1607.4366836547852,"y":570.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"844204d8.c22708","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1229.8295059204102,"y":614.0516042709351,"z":"92a428a4.4be018","wires":[["b35bce0.f21be3"]]},{"id":"b35bce0.f21be3","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1447.829475402832,"y":614.1944417953491,"z":"92a428a4.4be018","wires":[["d570b3ad.3533e"]]},{"id":"d570b3ad.3533e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1601.6866836547852,"y":614.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"b87379e9.53f3e8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":941.3573303222656,"y":488.60720443725586,"z":"92a428a4.4be018","wires":[["bd1afb26.982af8","92006f83.303b6","844204d8.c22708","450707b1.858888"]]},{"id":"6fc64ea9.47d27","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":733.3571624755859,"y":812.0000095367432,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","7d86d5e2.f9dc1c"]]},{"id":"4b2ba6a6.5bfb58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":762.1071624755859,"y":768.2500095367432,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","852e8019.fd2ce"]]},{"id":"e81e121b.9d7d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":734.6071624755859,"y":854.5000104904175,"z":"92a428a4.4be018","wires":[["d6877835.c8b078","b87379e9.53f3e8"]]},{"id":"a5973f66.bde0b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":752.1071624755859,"y":723.2500114440918,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","dab3d2fe.9b3b8"]]},{"id":"4038275c.842618","type":"comment","name":"changedelete is for 1604 VNF ONLY","info":"","comments":"","x":1038.857162475586,"y":903.7500133514404,"z":"92a428a4.4be018","wires":[]},{"id":"450707b1.858888","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1229.1072082519531,"y":656.6071491241455,"z":"92a428a4.4be018","wires":[["9cbb01c7.83921"]]},{"id":"9cbb01c7.83921","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1447.107177734375,"y":656.7499866485596,"z":"92a428a4.4be018","wires":[["e698a55e.3f6698"]]},{"id":"e698a55e.3f6698","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1600.9643859863281,"y":657.0357074737549,"z":"92a428a4.4be018","wires":[]},{"id":"4636fdf4.bf5944","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":982.6071662902832,"y":953.0000133514404,"z":"92a428a4.4be018","wires":[["8e8be05f.50d97"]]},{"id":"8e8be05f.50d97","type":"outcome","name":"other","xml":"<outcome value='other'>","comments":"","outputs":1,"x":1200.607135772705,"y":953.1428508758545,"z":"92a428a4.4be018","wires":[["5fc9284e.ceef08"]]},{"id":"5fc9284e.ceef08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1354.4643440246582,"y":953.4285717010498,"z":"92a428a4.4be018","wires":[]},{"id":"1576a27c.acc86e","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":952.6071853637695,"y":996.5000276565552,"z":"92a428a4.4be018","wires":[["bb182be9.4c74d8"]]},{"id":"bb182be9.4c74d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1134.6071548461914,"y":996.6428651809692,"z":"92a428a4.4be018","wires":[["4b5b253c.5dcfcc"]]},{"id":"4b5b253c.5dcfcc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1288.4643630981445,"y":996.9285860061646,"z":"92a428a4.4be018","wires":[]},{"id":"99083217.f89ae","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":763.8571662902832,"y":952.7500133514404,"z":"92a428a4.4be018","wires":[["4636fdf4.bf5944","1576a27c.acc86e","18365e43.db5f52"]]},{"id":"99f9cba3.9ea678","type":"comment","name":"Removing outcome for changeDelete in 1707","info":"ks220y: Confirmed with Pat Cheung, as MSO is not at all calling with this svc action","comments":"","x":696.1904373168945,"y":911.4815158843994,"z":"92a428a4.4be018","wires":[]}] \ No newline at end of file
+[{"id":"27382898.127288","type":"dgstart","name":"DGSTART","outputs":1,"x":105.71430206298828,"y":20.000000953674316,"z":"92a428a4.4be018","wires":[["da86500.c82cab"]]},{"id":"da86500.c82cab","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-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='VNF-API' version='${project.version}'>","outputs":1,"x":313.3254089355469,"y":20.777785301208496,"z":"92a428a4.4be018","wires":[["45974f49.3e0bb"]]},{"id":"45974f49.3e0bb","type":"method","name":"vnf-topology-preload-operation","xml":"<method rpc='vnf-topology-preload-operation' mode='sync'>\n","comments":"","outputs":1,"x":232.92855834960938,"y":80.79364585876465,"z":"92a428a4.4be018","wires":[["2e83e166.81c9ce"]]},{"id":"19e5b740.1bbdb9","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\"; // equal to commit\n\t\tenum \"delete\";\t // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":364.4126968383789,"y":723.3332614898682,"z":"92a428a4.4be018","wires":[["bc453dc4.37403","f70ce018.29f22","6d06e616.179dc8","fdd37020.a7e9d","8b547a17.7f8778","37529cbb.9f60c4"]]},{"id":"bc453dc4.37403","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":579.9960556030273,"y":1140.083420753479,"z":"92a428a4.4be018","wires":[["66ea35b2.ce742c"]]},{"id":"f70ce018.29f22","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":581.9682540893555,"y":723.3332672119141,"z":"92a428a4.4be018","wires":[["a5973f66.bde0b"]]},{"id":"66ea35b2.ce742c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":751.9960556030273,"y":1140.083420753479,"z":"92a428a4.4be018","wires":[]},{"id":"6d06e616.179dc8","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":584.9682693481445,"y":812.5832557678223,"z":"92a428a4.4be018","wires":[["6fc64ea9.47d27"]]},{"id":"fdd37020.a7e9d","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":584.7182693481445,"y":854.8332567214966,"z":"92a428a4.4be018","wires":[["e81e121b.9d7d4"]]},{"id":"37529cbb.9f60c4","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":603.4682693481445,"y":768.8332576751709,"z":"92a428a4.4be018","wires":[["4b2ba6a6.5bfb58"]]},{"id":"8b547a17.7f8778","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":581.0794143676758,"y":1093.6944961547852,"z":"92a428a4.4be018","wires":[["463ecdea.916a04"]]},{"id":"dab3d2fe.9b3b8","type":"call","name":"call: vnf-topology-assign","xml":"<call module='VNF-API' rpc='vnf-topology-assign' mode='sync' >","comments":"","outputs":1,"x":974.2182540893555,"y":723.3332653045654,"z":"92a428a4.4be018","wires":[[]]},{"id":"90793683.10ad78","type":"other","name":"changedelete","xml":"<outcome value='changedelete'>","comments":"","outputs":1,"x":601.7182998657227,"y":952.5832653045654,"z":"92a428a4.4be018","wires":[["99083217.f89ae"]]},{"id":"852e8019.fd2ce","type":"call","name":"call: vnf-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":997.468376159668,"y":767.3332653045654,"z":"92a428a4.4be018","wires":[[]]},{"id":"d6877835.c8b078","type":"call","name":"call: vnf-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":979.218376159668,"y":854.8332672119141,"z":"92a428a4.4be018","wires":[[]]},{"id":"463ecdea.916a04","type":"call","name":"call: vnf-topology-delete","xml":"<call module='VNF-API' rpc='vnf-topology-delete' mode='sync' >","comments":"","outputs":1,"x":789.8294830322266,"y":1093.6944971084595,"z":"92a428a4.4be018","wires":[[]]},{"id":"7d86d5e2.f9dc1c","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":978.7183685302734,"y":811.833261013031,"z":"92a428a4.4be018","wires":[[]]},{"id":"18365e43.db5f52","type":"call","name":"call: vnf-topology-changedelete","xml":"<call module='VNF-API' rpc='vnf-topology-changedelete' mode='sync' >","comments":"","outputs":1,"x":984.2183837890625,"y":1043.583267211914,"z":"92a428a4.4be018","wires":[[]]},{"id":"edaa795d.815648","type":"comment","name":"vnf-topology-preload-operation","info":"","comments":"","x":708.6031723022461,"y":59.587297439575195,"z":"92a428a4.4be018","wires":[]},{"id":"2e83e166.81c9ce","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":169.8571548461914,"y":138.0000057220459,"z":"92a428a4.4be018","wires":[["e10d753d.1a5108","e57664b7.a0cb78","19e5b740.1bbdb9","6ee4c55.7765b3c"]]},{"id":"e10d753d.1a5108","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":418.36509704589844,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["f6d54468.393c88","7be45943.cc6978"]]},{"id":"f6d54468.393c88","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":632.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["d8f7b15c.f03e6"]]},{"id":"7be45943.cc6978","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":633.3651428222656,"y":185.58727836608887,"z":"92a428a4.4be018","wires":[["b1504b8f.bb2e18"]]},{"id":"d8f7b15c.f03e6","type":"switchNode","name":"switch: PRELOAD vnf-name","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":843.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["6b9d4424.f09efc","99560218.ef1e6"]]},{"id":"6b9d4424.f09efc","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1054.3650970458984,"y":138.15870761871338,"z":"92a428a4.4be018","wires":[["b2beb900.1fb638"]]},{"id":"99560218.ef1e6","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1055.3651428222656,"y":184.58727836608887,"z":"92a428a4.4be018","wires":[["34e1e6d9.6c147a"]]},{"id":"b2beb900.1fb638","type":"switchNode","name":"switch: vnf-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":1302.3650817871094,"y":138.15870571136475,"z":"92a428a4.4be018","wires":[["4acdda61.594564"]]},{"id":"4acdda61.594564","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1548.6984481811523,"y":137.825608253479,"z":"92a428a4.4be018","wires":[["4f6229f6.67b498"]]},{"id":"4f6229f6.67b498","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-name not found in preload-data'/>","comments":"","x":1707.3650741577148,"y":137.15870761871338,"z":"92a428a4.4be018","wires":[]},{"id":"34e1e6d9.6c147a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-name'/>","comments":"","x":1222.3651428222656,"y":184.58727836608887,"z":"92a428a4.4be018","wires":[]},{"id":"b1504b8f.bb2e18","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":794.8651428222656,"y":185.83727836608887,"z":"92a428a4.4be018","wires":[]},{"id":"e57664b7.a0cb78","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":410.2222442626953,"y":257.5872712135315,"z":"92a428a4.4be018","wires":[["e531261b.ed3c88","b1342015.3408b"]]},{"id":"e531261b.ed3c88","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":627.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["5edfa51c.3acd5c"]]},{"id":"b1342015.3408b","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":628.2222785949707,"y":308.87298822402954,"z":"92a428a4.4be018","wires":[["9119f902.c4ce58"]]},{"id":"5edfa51c.3acd5c","type":"switchNode","name":"switch: PRELOAD vnf-type","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":838.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["306c4502.a9f18a","457d774f.08d388"]]},{"id":"306c4502.a9f18a","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1049.2222366333008,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["713425d2.ff15dc"]]},{"id":"457d774f.08d388","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1050.2222785949707,"y":307.87298822402954,"z":"92a428a4.4be018","wires":[["4e5864e1.616eac"]]},{"id":"9119f902.c4ce58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":789.7222785949707,"y":309.12298822402954,"z":"92a428a4.4be018","wires":[]},{"id":"713425d2.ff15dc","type":"switchNode","name":"switch: vnf-type INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":1297.2222137451172,"y":258.5872712135315,"z":"92a428a4.4be018","wires":[["7851a2cb.dac9cc"]]},{"id":"4e5864e1.616eac","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-type'/>","comments":"","x":1217.222255706787,"y":307.87298822402954,"z":"92a428a4.4be018","wires":[]},{"id":"7851a2cb.dac9cc","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1546.2222137451172,"y":258.9207673072815,"z":"92a428a4.4be018","wires":[["352d87ea.74b988"]]},{"id":"352d87ea.74b988","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-type not found in preload-data'/>","comments":"","x":1704.8888397216797,"y":258.25386667251587,"z":"92a428a4.4be018","wires":[]},{"id":"6ee4c55.7765b3c","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":405.75806427001953,"y":374.90874195098877,"z":"92a428a4.4be018","wires":[["a668f8f8.c2e6e8","36879ada.5a4b76"]]},{"id":"36879ada.5a4b76","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":588.7580184936523,"y":424.9087247848511,"z":"92a428a4.4be018","wires":[["caf5e229.ed387"]]},{"id":"a668f8f8.c2e6e8","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":587.9009628295898,"y":374.4801778793335,"z":"92a428a4.4be018","wires":[["caf5e229.ed387"]]},{"id":"caf5e229.ed387","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":763.6152267456055,"y":425.1944456100464,"z":"92a428a4.4be018","wires":[]},{"id":"bd1afb26.982af8","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1223.8295059204102,"y":489.05160427093506,"z":"92a428a4.4be018","wires":[["fa68e5d5.3ea798","cbda632b.05b6"]]},{"id":"cbda632b.05b6","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1456.829475402832,"y":527.1944417953491,"z":"92a428a4.4be018","wires":[["4e5d27c4.668018"]]},{"id":"fa68e5d5.3ea798","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1455.9724044799805,"y":489.6230401992798,"z":"92a428a4.4be018","wires":[["4e5d27c4.668018"]]},{"id":"4e5d27c4.668018","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1610.6866836547852,"y":527.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"92006f83.303b6","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1235.5795059204102,"y":570.0516042709351,"z":"92a428a4.4be018","wires":[["cae82f17.dd03f"]]},{"id":"cae82f17.dd03f","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1453.579475402832,"y":570.1944417953491,"z":"92a428a4.4be018","wires":[["e4890c61.433f"]]},{"id":"e4890c61.433f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1607.4366836547852,"y":570.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"844204d8.c22708","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1229.8295059204102,"y":614.0516042709351,"z":"92a428a4.4be018","wires":[["b35bce0.f21be3"]]},{"id":"b35bce0.f21be3","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1447.829475402832,"y":614.1944417953491,"z":"92a428a4.4be018","wires":[["d570b3ad.3533e"]]},{"id":"d570b3ad.3533e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1601.6866836547852,"y":614.4801626205444,"z":"92a428a4.4be018","wires":[]},{"id":"b87379e9.53f3e8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":941.3573303222656,"y":488.60720443725586,"z":"92a428a4.4be018","wires":[["bd1afb26.982af8","92006f83.303b6","844204d8.c22708","450707b1.858888"]]},{"id":"6fc64ea9.47d27","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":733.3571624755859,"y":812.0000095367432,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","7d86d5e2.f9dc1c"]]},{"id":"4b2ba6a6.5bfb58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":762.1071624755859,"y":768.2500095367432,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","852e8019.fd2ce"]]},{"id":"e81e121b.9d7d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":734.6071624755859,"y":854.5000104904175,"z":"92a428a4.4be018","wires":[["d6877835.c8b078","b87379e9.53f3e8"]]},{"id":"a5973f66.bde0b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":752.1071624755859,"y":723.2500114440918,"z":"92a428a4.4be018","wires":[["b87379e9.53f3e8","dab3d2fe.9b3b8"]]},{"id":"4038275c.842618","type":"comment","name":"changedelete is for 1604 VNF ONLY","info":"","comments":"","x":1038.857162475586,"y":903.7500133514404,"z":"92a428a4.4be018","wires":[]},{"id":"450707b1.858888","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1229.1072082519531,"y":656.6071491241455,"z":"92a428a4.4be018","wires":[["9cbb01c7.83921"]]},{"id":"9cbb01c7.83921","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1447.107177734375,"y":656.7499866485596,"z":"92a428a4.4be018","wires":[["e698a55e.3f6698"]]},{"id":"e698a55e.3f6698","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1600.9643859863281,"y":657.0357074737549,"z":"92a428a4.4be018","wires":[]},{"id":"4636fdf4.bf5944","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":982.6071662902832,"y":953.0000133514404,"z":"92a428a4.4be018","wires":[["8e8be05f.50d97"]]},{"id":"8e8be05f.50d97","type":"outcome","name":"other","xml":"<outcome value='other'>","comments":"","outputs":1,"x":1200.607135772705,"y":953.1428508758545,"z":"92a428a4.4be018","wires":[["5fc9284e.ceef08"]]},{"id":"5fc9284e.ceef08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1354.4643440246582,"y":953.4285717010498,"z":"92a428a4.4be018","wires":[]},{"id":"1576a27c.acc86e","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":952.6071853637695,"y":996.5000276565552,"z":"92a428a4.4be018","wires":[["bb182be9.4c74d8"]]},{"id":"bb182be9.4c74d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1134.6071548461914,"y":996.6428651809692,"z":"92a428a4.4be018","wires":[["4b5b253c.5dcfcc"]]},{"id":"4b5b253c.5dcfcc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1288.4643630981445,"y":996.9285860061646,"z":"92a428a4.4be018","wires":[]},{"id":"99083217.f89ae","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":763.8571662902832,"y":952.7500133514404,"z":"92a428a4.4be018","wires":[["4636fdf4.bf5944","1576a27c.acc86e","18365e43.db5f52"]]},{"id":"99f9cba3.9ea678","type":"comment","name":"Removing outcome for changeDelete in 1707","info":"ks220y: Confirmed with Pat Cheung, as MSO is not at all calling with this svc action","comments":"","x":696.1904373168945,"y":911.4815158843994,"z":"92a428a4.4be018","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json
index 1d3d454b..65a828db 100644
--- a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json
@@ -49,7 +49,7 @@
"module": "VNF-API",
"version": "${project.version}",
"comments": "",
- "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>",
+ "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='VNF-API' version='${project.version}'>",
"outputs": 1,
"x": 329.6543884277344,
"y": 77.15432167053223,
@@ -289,4 +289,4 @@
"z": "da6e10f.d63acf",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
index 29b93a7a..70fbf6a0 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
@@ -87,7 +87,7 @@
<parameter name="tmp.dhcpEnabled.boolean" value="false" />
</set></outcome></switch><set>
<parameter name="tmp.gateway-address" value="`$preload-data.network-topology-information.subnets[$i].gateway-address`" />
-</set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block atomic='true'><execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+</set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block atomic='true'><execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
<parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$i].start-address`" />
<parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$i].ip-version`" />
<parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$i].cidr-mask`" />
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
index 4525ffa8..7f35d4e7 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
@@ -61,7 +61,7 @@
<set>
<parameter name="tmp.subnetUpdate" value="1" />
</set></outcome></switch><switch test="`$preload-data.network-topology-information.subnets[$n].gateway-address`"><outcome value=''><block>
-<execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+<execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
<parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$n].start-address`" />
<parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$n].ip-version`" />
<parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$n].cidr-mask`" />
@@ -196,7 +196,7 @@
</set></outcome></switch><set>
<parameter name='tmp.gateway-address' value='`$preload-data.network-topology-information.subnets[$i].gateway-address`' />
</set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block>
-<execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+<execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
<parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$i].start-address`" />
<parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$i].ip-version`" />
<parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$i].cidr-mask`" />
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
index 966f66b9..f5efcc61 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
@@ -1,6 +1,6 @@
<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='VNF-API' version='${project.version}'><method rpc="preload-vf-module-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vf-module-topology-operation-input.request-information.request-action`">
-<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
+<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource"
resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vf-module-topology-operation-input.vf-module-topology-information.vf-module-identifiers.vf-module-model-id">
<outcome value='not-found'>
<return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
index 97e4a18e..a8929f27 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
@@ -1,6 +1,6 @@
<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='VNF-API' version='${project.version}'><method rpc="preload-vnf-instance-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vnf-instance-topology-operation-input.request-information.request-action`">
-<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
+<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource"
resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vnf-instance-topology-operation-input.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id">
<outcome value='not-found'>
<return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
index 043dbe31..f2059764 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
@@ -5,7 +5,7 @@
<parameter name='service-data.service-information.service-type'
value='NOT_APPLICABLE' />
-</set><update plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" resource="SQL"
+</set><update plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"
key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status
WHERE info = $vnf-topology-operation-input.vnf-request-information.vnf-id" ><outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
index dafaa16b..28a77e88 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
@@ -7,7 +7,7 @@
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'VNFActivateRequest'" />
-</return></outcome></switch><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'
pfx='db.vf-module-model'>
@@ -59,7 +59,7 @@
<block atomic="true"><set>
<parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'
value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />
-</set></block></for></block><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'
+</set></block></for></block><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'
pfx='db.vf-module-to-vfc-mapping[]'>
@@ -75,7 +75,7 @@
<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'
value='`$db.vf-module-to-vfc-mapping_length`' />
</set><for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >
-<block atomic="true"><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'
+<block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'
pfx='db.vfc-model'>
@@ -122,7 +122,7 @@
</set></outcome></call></block></for><set>
<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'
value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />
-</set><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'
+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'
pfx='db.vfc-to-network-role-mapping[]'>
@@ -308,17 +308,17 @@
<parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips-v6[$ip-count-index].ip-address-ipv6'
value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' /></set></outcome></switch></for></block></for></block></for></outcome></switch></for></for><for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >
<for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >
-<block atomic="true"><delete plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'
+<block atomic="true"><delete plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id
AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id
AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' ><outcome value='failure'>
-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">
+<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="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>
<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>
<parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>
-</record></outcome></delete><save plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" resource="SQL"
+</record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"
key="INSERT INTO VIPR_CONFIGURATION (vnf_id,
vnf_name,
ecomp_service_instance_id,
@@ -331,7 +331,7 @@
$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name ,
$vnf-topology-operation.vnf-request-information.aic-cloud-region ,
'Rackspace')" ><outcome value='failure'>
-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">
+<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="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>