summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json925
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml4
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json1432
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.json458
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json530
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.json792
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml315
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml11
-rw-r--r--[-rwxr-xr-x]platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml3
-rwxr-xr-xplatform-logic/lcm/src/main/json/LCM_config-scale-out.json4
-rwxr-xr-xplatform-logic/lcm/src/main/json/LCM_health-check.json4
-rwxr-xr-xplatform-logic/lcm/src/main/xml/LCM_config-scale-out.xml4
-rwxr-xr-xplatform-logic/lcm/src/main/xml/LCM_health-check.xml4
14 files changed, 3093 insertions, 1395 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index ef453318..aef62059 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,455 +1,470 @@
-[
- {
- "id": "3492b641.0dfbba",
- "type": "other",
- "name": "update",
- "xml": "<outcome value='Update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 673,
- "y": 276.6667003631592,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "f2d65f4a.d687"
- ]
- ]
- },
- {
- "id": "668a1af1.719b34",
- "type": "other",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 709.2221145629883,
- "y": 478.33349609375,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "3b8ddbef.903fa4"
- ]
- ]
- },
- {
- "id": "3b8ddbef.903fa4",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 859.6667594909668,
- "y": 473.3335485458374,
- "z": "cbb28df7.1359",
- "wires": [
- []
- ]
- },
- {
- "id": "c0cbee48.6a5f9",
- "type": "comment",
- "name": "TODO: Delete topology from AAI",
- "info": "",
- "comments": "",
- "x": 817.3334274291992,
- "y": 429.0001735687256,
- "z": "cbb28df7.1359",
- "wires": []
- },
- {
- "id": "d3c03070.16287",
- "type": "switchNode",
- "name": "switch aai-event-trigger",
- "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 465.5555648803711,
- "y": 345.2222261428833,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "3492b641.0dfbba",
- "668a1af1.719b34"
- ]
- ]
- },
- {
- "id": "6bfaf616.869108",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 1267.333755493164,
- "y": 270.1112537384033,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "c706e157.72486",
- "4130ca8.c1efa34"
- ]
- ]
- },
- {
- "id": "f4c114b8.d66028",
- "type": "execute",
- "name": "execute RestApiCallNode Get token",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1523.993263244629,
- "y": 132.0305051803589,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "fafa0167.57f14",
- "c8836a7f.1ba7f8"
- ]
- ]
- },
- {
- "id": "fafa0167.57f14",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1758.993263244629,
- "y": 110.03050518035889,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "bd59ffd7.cdf9"
- ]
- ]
- },
- {
- "id": "c8836a7f.1ba7f8",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1751.243263244629,
- "y": 163.67338848114014,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "8505bfec.1c327"
- ]
- ]
- },
- {
- "id": "bd59ffd7.cdf9",
- "type": "set",
- "name": "set token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
- "comments": "",
- "x": 1912.993263244629,
- "y": 111.03050518035889,
- "z": "cbb28df7.1359",
- "wires": []
- },
- {
- "id": "c706e157.72486",
- "type": "execute",
- "name": "execute RestApiCallNode Get Topology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
- "comments": "",
- "outputs": 1,
- "x": 1527.3266906738281,
- "y": 225.73424291610718,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "87479d00.dc1c9",
- "c2d07026.26d52"
- ]
- ]
- },
- {
- "id": "87479d00.dc1c9",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1785.882022857666,
- "y": 203.73422479629517,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "3aa58504.f6229a"
- ]
- ]
- },
- {
- "id": "3aa58504.f6229a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1961.4375534057617,
- "y": 201.40094709396362,
- "z": "cbb28df7.1359",
- "wires": [
- []
- ]
- },
- {
- "id": "dca7d6ac.f501f8",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
- "comments": "",
- "x": 1969.6598281860352,
- "y": 275.6230607032776,
- "z": "cbb28df7.1359",
- "wires": []
- },
- {
- "id": "c2d07026.26d52",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1791.3265075683594,
- "y": 274.845290184021,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "dca7d6ac.f501f8"
- ]
- ]
- },
- {
- "id": "7cae77af.f5b818",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 105.9999008178711,
- "y": 85,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "b697d007.11e41"
- ]
- ]
- },
- {
- "id": "b697d007.11e41",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "version": "${project.version}",
- "comments": "",
- "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 244.11102676391602,
- "y": 126.44446134567261,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "49de6de0.6f78a4"
- ]
- ]
- },
- {
- "id": "49de6de0.6f78a4",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-discovery",
- "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 340.5555877685547,
- "y": 237.22224235534668,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "5f1e0612.f09808"
- ]
- ]
- },
- {
- "id": "5f1e0612.f09808",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 248.77781677246094,
- "y": 346.11122035980225,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "d3c03070.16287"
- ]
- ]
- },
- {
- "id": "4130ca8.c1efa34",
- "type": "for",
- "name": "for each Network",
- "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1459.481460571289,
- "y": 353.2221817970276,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "5ae402a2.fe5ffc"
- ]
- ]
- },
- {
- "id": "5ae402a2.fe5ffc",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1649.4814224243164,
- "y": 360.9999747276306,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "7d9ae4c3.21708c",
- "f67aa4a3.311fc8"
- ]
- ]
- },
- {
- "id": "7d9ae4c3.21708c",
- "type": "call",
- "name": "call update-network-to-aai",
- "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1902.8148441314697,
- "y": 424.33334493637085,
- "z": "cbb28df7.1359",
- "wires": [
- []
- ]
- },
- {
- "id": "f67aa4a3.311fc8",
- "type": "set",
- "name": "set network",
- "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
- "comments": "",
- "x": 1855.036964416504,
- "y": 342.11108922958374,
- "z": "cbb28df7.1359",
- "wires": []
- },
- {
- "id": "8505bfec.1c327",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1912.8146591186523,
- "y": 158.77776765823364,
- "z": "cbb28df7.1359",
- "wires": [
- []
- ]
- },
- {
- "id": "27eaeed1.46c512",
- "type": "comment",
- "name": "Do Nothing",
- "info": "",
- "comments": "",
- "x": 2048.3702328999834,
- "y": 157.66664340760974,
- "z": "cbb28df7.1359",
- "wires": []
- },
- {
- "id": "416dcc31.e9a444",
- "type": "switchNode",
- "name": "switch type",
- "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 948.0001487731934,
- "y": 279.00003147125244,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "7de88c94.fa0ca4",
- "8ee217f7.3b1bd8"
- ]
- ]
- },
- {
- "id": "f2d65f4a.d687",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 802.9999847412109,
- "y": 277.00002002716064,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "416dcc31.e9a444"
- ]
- ]
- },
- {
- "id": "7de88c94.fa0ca4",
- "type": "other",
- "name": "SOTN",
- "xml": "<outcome value='SOTN'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1101.9999313354492,
- "y": 235.00000190734863,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "6bfaf616.869108"
- ]
- ]
- },
- {
- "id": "8ee217f7.3b1bd8",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1098.9999313354492,
- "y": 359.00000953674316,
- "z": "cbb28df7.1359",
- "wires": [
- [
- "c0794a5f.727638"
- ]
- ]
- },
- {
- "id": "c0794a5f.727638",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
- "comments": "",
- "x": 1247.7726364135742,
- "y": 358.43917751312256,
- "z": "cbb28df7.1359",
- "wires": []
- }
-]
+[
+ {
+ "id": "1d39536e.bcea8d",
+ "type": "other",
+ "name": "update",
+ "xml": "<outcome value='Update'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 630.0000991821289,
+ "y": 392.6666978597641,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "eb33b12.26d255"
+ ]
+ ]
+ },
+ {
+ "id": "e7963432.3c05f8",
+ "type": "other",
+ "name": "delete",
+ "xml": "<outcome value='delete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 666.2222137451172,
+ "y": 594.3334935903549,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "bdac689.e471598"
+ ]
+ ]
+ },
+ {
+ "id": "bdac689.e471598",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 816.6668586730957,
+ "y": 589.3335460424423,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "27946419.4db7ac",
+ "type": "comment",
+ "name": "TODO: Delete topology from AAI",
+ "info": "",
+ "comments": "",
+ "x": 774.3335266113281,
+ "y": 545.0001710653305,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "1b12380b.1bb078",
+ "type": "switchNode",
+ "name": "switch aai-event-trigger",
+ "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 422.5556640625,
+ "y": 461.2222236394882,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "1d39536e.bcea8d",
+ "e7963432.3c05f8"
+ ]
+ ]
+ },
+ {
+ "id": "8b3f9b57.fb7ca8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1224.333854675293,
+ "y": 386.11125123500824,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "6bd0a191.4d206",
+ "1e8929fa.00dd96",
+ "f740e66d.fb9468"
+ ]
+ ]
+ },
+ {
+ "id": "d4ab9cef.99595",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get token",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1480.9933624267578,
+ "y": 248.0305026769638,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "9a5236ed.1ea128",
+ "5a03214d.f8c65"
+ ]
+ ]
+ },
+ {
+ "id": "9a5236ed.1ea128",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1715.9933624267578,
+ "y": 226.0305026769638,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "8343226c.c2c78"
+ ]
+ ]
+ },
+ {
+ "id": "5a03214d.f8c65",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1708.2433624267578,
+ "y": 279.67338597774506,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "194b3286.c3d03d"
+ ]
+ ]
+ },
+ {
+ "id": "8343226c.c2c78",
+ "type": "set",
+ "name": "set token-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+ "comments": "",
+ "x": 1869.9933624267578,
+ "y": 227.0305026769638,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "6bd0a191.4d206",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get Topology",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1484.326789855957,
+ "y": 341.7342404127121,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "7690c31d.5032fc",
+ "3ee8b658.f04c7a"
+ ]
+ ]
+ },
+ {
+ "id": "7690c31d.5032fc",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1742.882122039795,
+ "y": 319.7342222929001,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "5faa0ea5.47b54"
+ ]
+ ]
+ },
+ {
+ "id": "5faa0ea5.47b54",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1918.4376525878906,
+ "y": 317.40094459056854,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "30f38062.10fc2",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+ "comments": "",
+ "x": 1926.659927368164,
+ "y": 391.6230581998825,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "3ee8b658.f04c7a",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1748.3266067504883,
+ "y": 390.8452876806259,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "30f38062.10fc2"
+ ]
+ ]
+ },
+ {
+ "id": "d6f1376d.103958",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 77,
+ "y": 168.00000381469727,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "b042ac6b.0b2f5"
+ ]
+ ]
+ },
+ {
+ "id": "b042ac6b.0b2f5",
+ "type": "service-logic",
+ "name": "DataChange ${project.version}",
+ "module": "DataChange",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
+ "outputs": 1,
+ "x": 201.11112594604492,
+ "y": 242.44445884227753,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "fa0cd6cd.4d3678"
+ ]
+ ]
+ },
+ {
+ "id": "fa0cd6cd.4d3678",
+ "type": "method",
+ "name": "method esr-thirdparty-sdnc-discovery",
+ "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 297.5556869506836,
+ "y": 353.2222398519516,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "17dbe4b2.90a36b"
+ ]
+ ]
+ },
+ {
+ "id": "17dbe4b2.90a36b",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 205.77791595458984,
+ "y": 462.11121785640717,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "1b12380b.1bb078"
+ ]
+ ]
+ },
+ {
+ "id": "1e8929fa.00dd96",
+ "type": "for",
+ "name": "for each Network",
+ "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1416.481559753418,
+ "y": 469.2221792936325,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "7ac7e4f1.ee6b4c"
+ ]
+ ]
+ },
+ {
+ "id": "7ac7e4f1.ee6b4c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1606.4815216064453,
+ "y": 476.99997222423553,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "1bdd6882.262a87",
+ "73f341e0.4fb9a"
+ ]
+ ]
+ },
+ {
+ "id": "1bdd6882.262a87",
+ "type": "call",
+ "name": "call update-network-to-aai",
+ "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1859.8149433135986,
+ "y": 540.3333424329758,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "73f341e0.4fb9a",
+ "type": "set",
+ "name": "set network",
+ "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
+ "comments": "",
+ "x": 1812.0370635986328,
+ "y": 458.11108672618866,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "194b3286.c3d03d",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1869.8147583007812,
+ "y": 274.77776515483856,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "f5a2b8a2.ec17c8",
+ "type": "comment",
+ "name": "Do Nothing",
+ "info": "",
+ "comments": "",
+ "x": 2005.3703320821123,
+ "y": 273.66664090421466,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "86797eba.6e658",
+ "type": "switchNode",
+ "name": "switch type",
+ "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 905.0002479553223,
+ "y": 395.00002896785736,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "5d555655.1a63b8",
+ "698c0c25.f99474"
+ ]
+ ]
+ },
+ {
+ "id": "eb33b12.26d255",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 760.0000839233398,
+ "y": 393.00001752376556,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "86797eba.6e658"
+ ]
+ ]
+ },
+ {
+ "id": "5d555655.1a63b8",
+ "type": "other",
+ "name": "SOTN",
+ "xml": "<outcome value='SOTN'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1059.0000305175781,
+ "y": 350.99999940395355,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "8b3f9b57.fb7ca8"
+ ]
+ ]
+ },
+ {
+ "id": "698c0c25.f99474",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1056.0000305175781,
+ "y": 475.0000070333481,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ [
+ "8899e728.ec90b8"
+ ]
+ ]
+ },
+ {
+ "id": "8899e728.ec90b8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+ "comments": "",
+ "x": 1204.7727355957031,
+ "y": 474.4391750097275,
+ "z": "5f9799f8.016aa8",
+ "wires": []
+ },
+ {
+ "id": "f740e66d.fb9468",
+ "type": "execute",
+ "name": "execute Properties",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1423.03125,
+ "y": 193.03125,
+ "z": "5f9799f8.016aa8",
+ "wires": [
+ []
+ ]
+ }
+]
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index dcab41bd..3382b996 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -9,6 +9,10 @@
<switch test="`$prop.sdncRestApi.type`">
<outcome value='SOTN'>
<block atomic="true">
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
index 8df5b59d..b83f7f5e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
@@ -1,57 +1,57 @@
[
{
- "id": "77c2b18.8d31ed",
+ "id": "39b306a6.ed3522",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 112,
- "y": 53.57143306732178,
- "z": "9db1531d.07a1a",
+ "x": 100,
+ "y": 63.57143306732178,
+ "z": "1e0169fe.460196",
"wires": [
[
- "9dcfa1bf.c57ff"
+ "79f0b111.72d778"
]
]
},
{
- "id": "f8a5c87f.00d498",
+ "id": "1b629c80.7881d4",
"type": "method",
"name": "method self-serve-netbox-ip-assign",
"xml": "<method rpc='self-serve-netbox-ip-assign' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 247.7857208251953,
- "y": 110.69842147827148,
- "z": "9db1531d.07a1a",
+ "x": 235.7857208251953,
+ "y": 120.69842147827148,
+ "z": "1e0169fe.460196",
"wires": [
[
- "547eae19.add57"
+ "56a052c7.058c9c"
]
]
},
{
- "id": "547eae19.add57",
+ "id": "56a052c7.058c9c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 141.32144165039062,
- "y": 197.0000400543213,
- "z": "9db1531d.07a1a",
+ "x": 129.32144165039062,
+ "y": 207.0000400543213,
+ "z": "1e0169fe.460196",
"wires": [
[
- "74f4f85d.362368",
- "511e7db4.d38c5c",
- "1c580da3.ca9442",
- "9b5b9dd.e182f6",
- "727a4c78.25da9c"
+ "90086e75.cd6fc",
+ "3efa365b.993a9a",
+ "7e104793.732a5",
+ "f91de1d4.ae1798",
+ "2734c8ea.c23828"
]
]
},
{
- "id": "9dcfa1bf.c57ff",
+ "id": "79f0b111.72d778",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -59,1727 +59,1791 @@
"comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 384.8571472167969,
- "y": 53,
- "z": "9db1531d.07a1a",
+ "x": 372.8571472167969,
+ "y": 63,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f8a5c87f.00d498"
+ "1b629c80.7881d4"
]
]
},
{
- "id": "74f4f85d.362368",
+ "id": "90086e75.cd6fc",
"type": "switchNode",
"name": "switch: ss.capability-name",
"xml": "<switch test='`$ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 399.4999694824219,
- "y": 200.82144165039062,
- "z": "9db1531d.07a1a",
+ "x": 387.4999694824219,
+ "y": 210.82144165039062,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b9e21b14.67ef6"
+ "b10180d1.330c9"
]
]
},
{
- "id": "b9e21b14.67ef6",
+ "id": "b10180d1.330c9",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"outputs": 1,
- "x": 624.4999923706055,
- "y": 201.32144021987915,
- "z": "9db1531d.07a1a",
+ "x": 612.4999923706055,
+ "y": 211.32144021987915,
+ "z": "1e0169fe.460196",
"wires": [
[
- "73fe504e.4705c"
+ "66f17fa3.bde278"
]
]
},
{
- "id": "73fe504e.4705c",
+ "id": "66f17fa3.bde278",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status=\"failure\">\n\t<parameter name=\"ack-final\" value=\"Y\" />\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"ss.capability-name is null\" />\n",
"comments": "",
- "x": 784.4166641235352,
- "y": 201.43253898620605,
- "z": "9db1531d.07a1a",
+ "x": 772.4166641235352,
+ "y": 211.43253898620605,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "511e7db4.d38c5c",
+ "id": "3efa365b.993a9a",
"type": "switchNode",
"name": "switch: ss.capability-action",
"xml": "<switch test='`$ss.capability-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 402.74996185302734,
- "y": 276.82143688201904,
- "z": "9db1531d.07a1a",
+ "x": 390.74996185302734,
+ "y": 286.82143688201904,
+ "z": "1e0169fe.460196",
"wires": [
[
- "44dc8d7e.430a74"
+ "8acb2cf7.4ff328"
]
]
},
{
- "id": "44dc8d7e.430a74",
+ "id": "8acb2cf7.4ff328",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 626.2499618530273,
- "y": 277.07143688201904,
- "z": "9db1531d.07a1a",
+ "x": 614.2499618530273,
+ "y": 287.07143688201904,
+ "z": "1e0169fe.460196",
"wires": [
[
- "1a43de2d.0a450a"
+ "307ed0c1.fb7998"
]
]
},
{
- "id": "1a43de2d.0a450a",
+ "id": "307ed0c1.fb7998",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status=\"failure\">\n\t<parameter name=\"ack-final\" value=\"Y\" />\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"ss.capability-action is null\" />\n",
"comments": "",
- "x": 786.166633605957,
- "y": 277.18253564834595,
- "z": "9db1531d.07a1a",
+ "x": 774.166633605957,
+ "y": 287.18253564834595,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "19870db6.43192a",
- "type": "outcome",
- "name": "unassign",
- "xml": "<outcome value='unassign'>",
- "comments": "",
- "outputs": 1,
- "x": 1251.8930969238281,
- "y": 3041.6666650772095,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "d275ec9.837569"
- ]
- ]
- },
- {
- "id": "1c580da3.ca9442",
+ "id": "7e104793.732a5",
"type": "call",
"name": "call self-serve-capability-param-resolution",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 453.41680908203125,
- "y": 351.82147216796875,
- "z": "9db1531d.07a1a",
+ "x": 441.41680908203125,
+ "y": 361.82147216796875,
+ "z": "1e0169fe.460196",
"wires": [
[
- "5d40b27c.221a9c"
+ "47c181e5.fedda"
]
]
},
{
- "id": "5d40b27c.221a9c",
+ "id": "47c181e5.fedda",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 757.6667060852051,
- "y": 353.821475982666,
- "z": "9db1531d.07a1a",
+ "x": 745.6667060852051,
+ "y": 363.821475982666,
+ "z": "1e0169fe.460196",
"wires": [
[
- "edcc63af.4dd9d8"
+ "fe0e4241.5b80e8"
]
]
},
{
- "id": "edcc63af.4dd9d8",
+ "id": "fe0e4241.5b80e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status=\"failure\">\n\t<parameter name=\"ack-final\" value=\"Y\" />\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n",
"comments": "",
- "x": 916.4166870117188,
- "y": 353.82147216796875,
- "z": "9db1531d.07a1a",
+ "x": 904.4166870117188,
+ "y": 363.82147216796875,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "4f9c6ac7.4bbeac",
+ "id": "a92c49b1.faf6c",
"type": "set",
"name": "set tmp.ss.param.capability-name",
"xml": "<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
"comments": "",
- "x": 1199.0635833740234,
- "y": 1963.7697825431824,
- "z": "9db1531d.07a1a",
+ "x": 1187.0635833740234,
+ "y": 1973.7697825431824,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "c92d4312.5079b8",
+ "id": "ca92a840.cb9a5",
"type": "for",
"name": "for pidx in param_length",
"xml": "<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">",
"comments": "",
"outputs": 1,
- "x": 909.2778091430664,
- "y": 1963.8412528038025,
- "z": "9db1531d.07a1a",
+ "x": 897.2778091430664,
+ "y": 1973.8412528038025,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f2a77014.d729d8",
- "864fa674.d2c07",
- "4f9c6ac7.4bbeac"
+ "864a8266.73cc7",
+ "b15a003.31b4b",
+ "a92c49b1.faf6c"
]
]
},
{
- "id": "864fa674.d2c07",
+ "id": "b15a003.31b4b",
"type": "switchNode",
"name": "switch: capability-name - ss vs param",
"xml": "<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1212.139045715332,
- "y": 2045.119035243988,
- "z": "9db1531d.07a1a",
+ "x": 1200.139045715332,
+ "y": 2055.119035243988,
+ "z": "1e0169fe.460196",
"wires": [
[
- "27ca1b50.7b7b94"
+ "5f27f686.c72e78"
]
]
},
{
- "id": "27ca1b50.7b7b94",
+ "id": "5f27f686.c72e78",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1450.8890533447266,
- "y": 2044.869035243988,
- "z": "9db1531d.07a1a",
+ "x": 1438.8890533447266,
+ "y": 2054.869035243988,
+ "z": "1e0169fe.460196",
"wires": [
[
- "8094ff69.1f8708"
+ "b6e45a86.008848"
]
]
},
{
- "id": "e4dea9e2.e240e8",
+ "id": "52a3fa95.c6446c",
"type": "switchNode",
"name": "switch: resource-key[].name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1700.7783126831055,
- "y": 2295.1630301475525,
- "z": "9db1531d.07a1a",
+ "x": 1688.7783126831055,
+ "y": 2305.1630301475525,
+ "z": "1e0169fe.460196",
"wires": [
[
- "33db91f0.e9f01e",
- "e6bd6a68.08413",
- "5e2abf9b.b85b4",
- "a20a3dc.5fc3fc",
- "82eaeb00.f8a53"
+ "12d1fbad.020824",
+ "31df3307.8fd214",
+ "8556b639.07cc4",
+ "32ab7f7f.33dea",
+ "28ed7d99.2fd922"
]
]
},
{
- "id": "e6bd6a68.08413",
+ "id": "31df3307.8fd214",
"type": "outcome",
"name": "service-instance-id",
"xml": "<outcome value='service-instance-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1972.167221069336,
- "y": 2294.6352486610413,
- "z": "9db1531d.07a1a",
+ "x": 1960.167221069336,
+ "y": 2304.6352486610413,
+ "z": "1e0169fe.460196",
"wires": [
[
- "ef960f90.e62e4"
+ "15e0f6f3.464d99"
]
]
},
{
- "id": "ef960f90.e62e4",
+ "id": "15e0f6f3.464d99",
"type": "set",
"name": "set tmp.ss.service-instance-id",
"xml": "<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2238.417221069336,
- "y": 2294.3852486610413,
- "z": "9db1531d.07a1a",
+ "x": 2226.417221069336,
+ "y": 2304.3852486610413,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "b434a262.2a412",
+ "id": "702f24b8.ab2b14",
"type": "set",
"name": "set service-data...param[].value = ip-address",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' \n\tvalue='`$ip[0]`' />\n",
"comments": "",
- "x": 2534.960205078125,
- "y": 2879.62744140625,
- "z": "9db1531d.07a1a",
+ "x": 3014.388885498047,
+ "y": 2875.3416357040405,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "7e13641e.d9c954",
+ "id": "daef3d9b.976aa",
"type": "update",
"name": "get-resource IPAM_IP_ASSIGNEMENT",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from IPAM_IP_ASSIGNEMENT \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id' >",
"comments": "",
"outputs": 1,
- "x": 1727.3771667480469,
- "y": 3040.488076210022,
- "z": "9db1531d.07a1a",
+ "x": 2188.472640991211,
+ "y": 2976.2020263671875,
+ "z": "1e0169fe.460196",
"wires": [
[
- "986620e4.a7ba3",
- "95406bea.6b1b6"
+ "c57f67d2.fa9d8",
+ "b7a6dad5.6dc8c"
]
]
},
{
- "id": "986620e4.a7ba3",
+ "id": "c57f67d2.fa9d8",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2021.9645042419434,
- "y": 3041.4881093502045,
- "z": "9db1531d.07a1a",
+ "x": 2483.0599784851074,
+ "y": 2977.20205950737,
+ "z": "1e0169fe.460196",
"wires": [
[
- "d043ccbb.6e195"
+ "e5ae09f3.4e9b7"
]
]
},
{
- "id": "d275ec9.837569",
+ "id": "9e365126.584608",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1421.2144622802734,
- "y": 3042.1310205459595,
- "z": "9db1531d.07a1a",
+ "x": 1882.3099365234375,
+ "y": 2977.844970703125,
+ "z": "1e0169fe.460196",
"wires": [
[
- "7e13641e.d9c954"
+ "daef3d9b.976aa"
]
]
},
{
- "id": "eabe3654.2861f",
+ "id": "b0815fb0.6c8c58",
"type": "for",
"name": "for kidx in resource-key_length",
"xml": "<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`\">",
"comments": "",
"outputs": 1,
- "x": 1417.6393966674805,
- "y": 2293.0241141319275,
- "z": "9db1531d.07a1a",
+ "x": 1405.6393966674805,
+ "y": 2303.0241141319275,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e4dea9e2.e240e8"
+ "52a3fa95.c6446c"
]
]
},
{
- "id": "3a044c4d.1e750c",
+ "id": "9d646260.b0f88",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 625.5358581542969,
- "y": 1961.9642333984375,
- "z": "9db1531d.07a1a",
+ "x": 613.5358581542969,
+ "y": 1971.9642333984375,
+ "z": "1e0169fe.460196",
"wires": [
[
- "c92d4312.5079b8",
- "4ffc883e.37e15"
+ "ca92a840.cb9a5",
+ "dddd3293.e9766"
]
]
},
{
- "id": "776bc197.c4cea8",
+ "id": "12508de3.d24ce2",
"type": "update",
"name": "update IPAM_IP_ASSIGNEMENT to PENDING_DELETE...",
"xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
"comments": "",
"outputs": 1,
- "x": 2550.274139404297,
- "y": 3132.166787147522,
- "z": "9db1531d.07a1a",
+ "x": 3011.369613647461,
+ "y": 3067.8807373046875,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b463a755.296e38"
+ "e08179b3.30edc"
]
]
},
{
- "id": "e61cd52d.9b53c8",
+ "id": "86f22edb.c1e37",
"type": "set",
"name": "set status = PENDING_DELETE",
"xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
"comments": "",
- "x": 2460.190643310547,
- "y": 3090.500039100647,
- "z": "9db1531d.07a1a",
+ "x": 2921.286117553711,
+ "y": 3026.2139892578125,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "b463a755.296e38",
+ "id": "e08179b3.30edc",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2857.9405975341797,
- "y": 3132.7501106262207,
- "z": "9db1531d.07a1a",
+ "x": 3319.0360717773438,
+ "y": 3068.4640607833862,
+ "z": "1e0169fe.460196",
"wires": [
[
- "623c3038.c77a88"
+ "a80cdb69.81f35"
]
]
},
{
- "id": "623c3038.c77a88",
+ "id": "a80cdb69.81f35",
"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 NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
"comments": "",
- "x": 3036.940887451172,
- "y": 3132.5597314834595,
- "z": "9db1531d.07a1a",
+ "x": 3498.036361694336,
+ "y": 3068.273681640625,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "46730243.5a19d4",
+ "id": "2ba87204.72c89e",
"type": "execute",
"name": "execute Netbox unassign IP addresses",
"xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
"comments": "",
"outputs": 1,
- "x": 2480.2740173339844,
- "y": 3178.416848182678,
- "z": "9db1531d.07a1a",
+ "x": 2941.3694915771484,
+ "y": 3114.1307983398438,
+ "z": "1e0169fe.460196",
"wires": [
[
- "41c93106.7eb858",
- "7f8823ca.cd3dd4"
+ "d761dd7d.5daac",
+ "70a92bf3.d01214"
]
]
},
{
- "id": "41c93106.7eb858",
+ "id": "d761dd7d.5daac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2723.6072845458984,
- "y": 3178.4167976379395,
- "z": "9db1531d.07a1a",
+ "x": 3184.7027587890625,
+ "y": 3114.130747795105,
+ "z": "1e0169fe.460196",
"wires": [
[
- "572457e6.ddb978"
+ "ac3185a3.0297d8"
]
]
},
{
- "id": "572457e6.ddb978",
+ "id": "ac3185a3.0297d8",
"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 NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`\" />\n",
"comments": "",
- "x": 2885.6073112487793,
- "y": 3178.226532936096,
- "z": "9db1531d.07a1a",
+ "x": 3346.7027854919434,
+ "y": 3113.9404830932617,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "a33aa0af.bd279",
+ "id": "9487046d.9fad68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2200.893051147461,
- "y": 3089.916666984558,
- "z": "9db1531d.07a1a",
+ "x": 2661.988525390625,
+ "y": 3025.6306171417236,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e61cd52d.9b53c8",
- "776bc197.c4cea8",
- "46730243.5a19d4"
+ "86f22edb.c1e37",
+ "12508de3.d24ce2",
+ "2ba87204.72c89e"
]
]
},
{
- "id": "4ffc883e.37e15",
+ "id": "dddd3293.e9766",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 861.3414611816406,
- "y": 2018.9087219238281,
- "z": "9db1531d.07a1a",
+ "x": 849.3414611816406,
+ "y": 2028.9087219238281,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
},
{
- "id": "33db91f0.e9f01e",
+ "id": "12d1fbad.020824",
"type": "outcome",
"name": "vf-module-id",
"xml": "<outcome value='vf-module-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1954.000228881836,
- "y": 2340.885187625885,
- "z": "9db1531d.07a1a",
+ "x": 1942.000228881836,
+ "y": 2350.885187625885,
+ "z": "1e0169fe.460196",
"wires": [
[
- "6181952e.31b6cc"
+ "e91a4a82.52be28"
]
]
},
{
- "id": "6181952e.31b6cc",
+ "id": "e91a4a82.52be28",
"type": "set",
"name": "set tmp.ss.vf-module-id",
"xml": "<set>\n<parameter name='tmp.ss.vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2220.0003509521484,
- "y": 2340.885187625885,
- "z": "9db1531d.07a1a",
+ "x": 2208.0003509521484,
+ "y": 2350.885187625885,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "369a3888.44684",
+ "id": "ae56d16c.edce5",
"type": "set",
"name": "set resource-resolution-data.status = DELETED",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n",
"comments": "",
- "x": 2990.499969482422,
- "y": 3233.737548828125,
- "z": "9db1531d.07a1a",
+ "x": 3451.595443725586,
+ "y": 3169.4514989852905,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "5e2abf9b.b85b4",
+ "id": "8556b639.07cc4",
"type": "outcome",
"name": "prefix-id",
"xml": "<outcome value='prefix-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1943.055892944336,
- "y": 2385.135218143463,
- "z": "9db1531d.07a1a",
+ "x": 1931.055892944336,
+ "y": 2395.135218143463,
+ "z": "1e0169fe.460196",
"wires": [
[
- "6a64ea7a.aa0bac"
+ "246a1d6a.080fa2"
]
]
},
{
- "id": "6a64ea7a.aa0bac",
+ "id": "246a1d6a.080fa2",
"type": "set",
"name": "set prefix-id",
"xml": "<set>\n<parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2189.555892944336,
- "y": 2385.385187625885,
- "z": "9db1531d.07a1a",
+ "x": 2177.555892944336,
+ "y": 2395.385187625885,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "5ddc29c0.4ba838",
+ "id": "d994622b.100b98",
"type": "execute",
"name": "execute NetboxClient assignIpAddress",
"xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"assignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"vf_module_id\" value=\"`$tmp.ss.vf-module-id`\" />\n<parameter name=\"prefix_id\" value=\"`$tmp.ss.prefix-id`\" />\n<parameter name=\"resource_name\" value=\"`$tmp.ss.param.name`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
"comments": "",
"outputs": 1,
- "x": 1724.9526672363281,
- "y": 2699.655068397522,
- "z": "9db1531d.07a1a",
+ "x": 2204.38134765625,
+ "y": 2695.3692626953125,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b4f4fccf.d98da",
- "69e14266.f416c4"
+ "5fcd5073.23e8c8",
+ "1a67a440.ccf65c"
]
]
},
{
- "id": "b4f4fccf.d98da",
+ "id": "5fcd5073.23e8c8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2041.9526672363281,
- "y": 2701.6550073623657,
- "z": "9db1531d.07a1a",
+ "x": 2521.38134765625,
+ "y": 2697.3692016601562,
+ "z": "1e0169fe.460196",
"wires": [
[
- "3690386c.790168"
+ "b53fc0c4.6e6db"
]
]
},
{
- "id": "3690386c.790168",
+ "id": "b53fc0c4.6e6db",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2249.952667236328,
- "y": 2705.6550073623657,
- "z": "9db1531d.07a1a",
+ "x": 2729.38134765625,
+ "y": 2701.3692016601562,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e87ee382.86daa8",
- "8cda7799.2cc048"
+ "aefd9233.639b38",
+ "5924f9f1.b07eb"
]
]
},
{
- "id": "e87ee382.86daa8",
+ "id": "aefd9233.639b38",
"type": "set",
"name": "set resource-resolution-data.status = FAILED",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' value='FAILED' />\n",
"comments": "",
- "x": 2566.9527282714844,
- "y": 2709.6549768447876,
- "z": "9db1531d.07a1a",
+ "x": 3046.3814086914062,
+ "y": 2705.369171142578,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "8cda7799.2cc048",
+ "id": "5924f9f1.b07eb",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
"comments": "",
- "x": 2464.3335876464844,
- "y": 2759.2582397460938,
- "z": "9db1531d.07a1a",
+ "x": 2943.7622680664062,
+ "y": 2754.9724340438843,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "e9502efd.cfacb8",
+ "id": "8459943a.0741",
"type": "set",
"name": "set resource-resolution-data.status = SUCCESS",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n",
"comments": "",
- "x": 2552.0357666015625,
- "y": 2930.3457641601562,
- "z": "9db1531d.07a1a",
+ "x": 3031.4644470214844,
+ "y": 2926.059958457947,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "a20a3dc.5fc3fc",
+ "id": "32ab7f7f.33dea",
"type": "outcome",
"name": "ip-address-id",
"xml": "<outcome value='ip-address-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1956.9370422363281,
- "y": 2429.9922919273376,
- "z": "9db1531d.07a1a",
+ "x": 1944.9370422363281,
+ "y": 2439.9922919273376,
+ "z": "1e0169fe.460196",
"wires": [
[
- "a24b6a2f.50759"
+ "1be9a0f0.cb1137"
]
]
},
{
- "id": "a24b6a2f.50759",
+ "id": "1be9a0f0.cb1137",
"type": "set",
"name": "ip-address-id",
"xml": "<set>\n<parameter name='tmp.ss.ip-address-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2191.9369201660156,
- "y": 2429.992352962494,
- "z": "9db1531d.07a1a",
+ "x": 2179.9369201660156,
+ "y": 2439.992352962494,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "82eaeb00.f8a53",
+ "id": "28ed7d99.2fd922",
"type": "outcome",
"name": "external_key",
"xml": "<outcome value='external_key'>\n",
"comments": "",
"outputs": 1,
- "x": 1944.5560607910156,
- "y": 2475.7065863609314,
- "z": "9db1531d.07a1a",
+ "x": 1932.5560607910156,
+ "y": 2485.7065863609314,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f64e7f28.5f1c28"
+ "e3062b19.33e69"
]
]
},
{
- "id": "f64e7f28.5f1c28",
+ "id": "e3062b19.33e69",
"type": "set",
"name": "set external-key",
"xml": "<set>\n<parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2193.127471923828,
- "y": 2475.7066473960876,
- "z": "9db1531d.07a1a",
+ "x": 2181.127471923828,
+ "y": 2485.7066473960876,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "f2a77014.d729d8",
+ "id": "864a8266.73cc7",
"type": "set",
"name": "set tmp.ss.param.name",
"xml": "<set>\n<parameter name='tmp.ss.param.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`' />\n",
"comments": "",
- "x": 1170.8495254516602,
- "y": 2003.9602675437927,
- "z": "9db1531d.07a1a",
+ "x": 1158.8495254516602,
+ "y": 2013.9602675437927,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "8094ff69.1f8708",
- "type": "switchNode",
- "name": "switch: resource-resolution-data.status",
- "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 773.2856140136719,
- "y": 2269.9287109375,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "8231bfda.4aa0f8",
- "4c0fccb3.f454ac"
- ]
- ]
- },
- {
- "id": "8231bfda.4aa0f8",
- "type": "not-found",
- "name": "FAILED",
- "xml": "<outcome value='FAILED'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1004.7144165039062,
- "y": 2265.928756713867,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "575caaa7.2470a4"
- ]
- ]
- },
- {
- "id": "4c0fccb3.f454ac",
- "type": "success",
- "name": "PENDING",
- "xml": "<outcome value='PENDING'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1011.4285926818848,
- "y": 2317.6430847644806,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "575caaa7.2470a4"
- ]
- ]
- },
- {
- "id": "575caaa7.2470a4",
+ "id": "b6e45a86.008848",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1166.1429138183594,
- "y": 2289.9287719726562,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "eabe3654.2861f",
- "423ab3ab.c683cc"
- ]
- ]
- },
- {
- "id": "e4db42f9.ac9b4",
- "type": "outcome",
- "name": "assign",
- "xml": "<outcome value='assign'>",
- "comments": "",
- "outputs": 1,
- "x": 1224.0000305175781,
- "y": 2697.738320350647,
- "z": "9db1531d.07a1a",
+ "x": 1154.1429138183594,
+ "y": 2299.9287719726562,
+ "z": "1e0169fe.460196",
"wires": [
[
- "de47a062.0e7368"
+ "b0815fb0.6c8c58",
+ "ea11f211.eef478"
]
]
},
{
- "id": "423ab3ab.c683cc",
+ "id": "ea11f211.eef478",
"type": "switchNode",
"name": "switch: ss.capability-action",
"xml": "<switch test='`$ss.capability-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 988.0000305175781,
- "y": 2695.738320350647,
- "z": "9db1531d.07a1a",
+ "x": 976.0000305175781,
+ "y": 2705.738320350647,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e4db42f9.ac9b4",
- "19870db6.43192a"
+ "398f1da9.7fc262",
+ "c615cc08.6cc77"
]
]
},
{
- "id": "de47a062.0e7368",
+ "id": "b4174ab1.8632e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1399.4286804199219,
- "y": 2698.595559120178,
- "z": "9db1531d.07a1a",
+ "x": 1878.8573608398438,
+ "y": 2694.3097534179688,
+ "z": "1e0169fe.460196",
"wires": [
[
- "5ddc29c0.4ba838"
+ "d994622b.100b98"
]
]
},
{
- "id": "95406bea.6b1b6",
+ "id": "b7a6dad5.6dc8c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2018.6786499023438,
- "y": 3089.202422142029,
- "z": "9db1531d.07a1a",
+ "x": 2479.774124145508,
+ "y": 3024.9163722991943,
+ "z": "1e0169fe.460196",
"wires": [
[
- "a33aa0af.bd279"
+ "9487046d.9fad68"
]
]
},
{
- "id": "69e14266.f416c4",
+ "id": "1a67a440.ccf65c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2050.0000915527344,
- "y": 2765.1666259765625,
- "z": "9db1531d.07a1a",
+ "x": 2529.4287719726562,
+ "y": 2760.880820274353,
+ "z": "1e0169fe.460196",
"wires": [
[
- "3337d755.bc6f9"
+ "6b7d48cd.fe82"
]
]
},
{
- "id": "d043ccbb.6e195",
+ "id": "e5ae09f3.4e9b7",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2192.1073128836497,
- "y": 3041.916687147958,
- "z": "9db1531d.07a1a",
+ "x": 2653.2027871268137,
+ "y": 2977.6306373051234,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
},
{
- "id": "3337d755.bc6f9",
+ "id": "6b7d48cd.fe82",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2244.2857360839844,
- "y": 2845.166748046875,
- "z": "9db1531d.07a1a",
+ "x": 2723.7144165039062,
+ "y": 2840.8809423446655,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e9502efd.cfacb8",
- "b434a262.2a412",
- "fd2e7345.c27e6"
+ "8459943a.0741",
+ "702f24b8.ab2b14",
+ "722fee02.ac2218"
]
]
},
{
- "id": "7f8823ca.cd3dd4",
+ "id": "70a92bf3.d01214",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2728.571990966797,
- "y": 3232.3094482421875,
- "z": "9db1531d.07a1a",
+ "x": 3189.667465209961,
+ "y": 3168.023398399353,
+ "z": "1e0169fe.460196",
"wires": [
[
- "369a3888.44684"
+ "ae56d16c.edce5"
]
]
},
{
- "id": "a51df821.acc4",
+ "id": "612ded0b.7aa5c4",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 600.4285583496094,
- "y": 441.4284896850586,
- "z": "9db1531d.07a1a",
+ "x": 588.4285583496094,
+ "y": 451.4284896850586,
+ "z": "1e0169fe.460196",
"wires": [
[
- "a0639b3c.7eba9"
+ "c436ca39.dad55"
]
]
},
{
- "id": "9b5b9dd.e182f6",
+ "id": "f91de1d4.ae1798",
"type": "switchNode",
"name": "switch capability-type. vnf",
"xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
"comments": "",
"outputs": 1,
- "x": 397,
- "y": 442.14276123046875,
- "z": "9db1531d.07a1a",
+ "x": 385,
+ "y": 452.14276123046875,
+ "z": "1e0169fe.460196",
"wires": [
[
- "a51df821.acc4"
+ "612ded0b.7aa5c4"
]
]
},
{
- "id": "727a4c78.25da9c",
+ "id": "2734c8ea.c23828",
"type": "switchNode",
"name": "switch capability-type vf-module",
"xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
"comments": "",
"outputs": 1,
- "x": 419.28582763671875,
- "y": 1827.6666259765625,
- "z": "9db1531d.07a1a",
+ "x": 407.28582763671875,
+ "y": 1837.6666259765625,
+ "z": "1e0169fe.460196",
"wires": [
[
- "5b0a7046.83e3"
+ "76727ba.3b8bb04"
]
]
},
{
- "id": "5b0a7046.83e3",
+ "id": "76727ba.3b8bb04",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 638.2858276367188,
- "y": 1828.6666870117188,
- "z": "9db1531d.07a1a",
+ "x": 626.2858276367188,
+ "y": 1838.6666870117188,
+ "z": "1e0169fe.460196",
"wires": [
[
- "3a044c4d.1e750c"
+ "9d646260.b0f88"
]
]
},
{
- "id": "25965467.621de4",
+ "id": "74139423.e17614",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>",
"comments": "",
"outputs": 1,
- "x": 1213.3333129882812,
- "y": 1557.3690576553345,
- "z": "9db1531d.07a1a",
+ "x": 1177.5833129882812,
+ "y": 1389.8692016601562,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f0b88a86.aebb68"
+ "e51b7888.989928"
]
]
},
{
- "id": "e7afaccf.d0036",
+ "id": "b8362705.36557",
"type": "set",
"name": "set tmp.ss.param.capability-name",
"xml": "<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
"comments": "",
- "x": 1222.1705474853516,
- "y": 537.4722971916199,
- "z": "9db1531d.07a1a",
+ "x": 1210.1705474853516,
+ "y": 547.4722971916199,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "bfedad8c.b95118",
+ "id": "37af35ce.c8f9aa",
"type": "for",
"name": "for pidx in param_length",
"xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 932.3847732543945,
- "y": 537.54376745224,
- "z": "9db1531d.07a1a",
+ "x": 920.3847732543945,
+ "y": 547.54376745224,
+ "z": "1e0169fe.460196",
"wires": [
[
- "eadf5468.9c709",
- "f0ad10ad.1e953",
- "e7afaccf.d0036"
+ "f4266bba.68463",
+ "ea3f1334.a266f8",
+ "b8362705.36557"
]
]
},
{
- "id": "f0ad10ad.1e953",
+ "id": "ea3f1334.a266f8",
"type": "switchNode",
"name": "switch: capability-name - ss vs param",
"xml": "<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1235.2460098266602,
- "y": 618.8215498924255,
- "z": "9db1531d.07a1a",
+ "x": 1223.2460098266602,
+ "y": 628.8215498924255,
+ "z": "1e0169fe.460196",
"wires": [
[
- "6a7d5101.40aa8"
+ "d7993c29.a6c5f8"
]
]
},
{
- "id": "6a7d5101.40aa8",
+ "id": "d7993c29.a6c5f8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1473.9960174560547,
- "y": 618.5715498924255,
- "z": "9db1531d.07a1a",
+ "x": 1461.9960174560547,
+ "y": 628.5715498924255,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b4530e81.fa1df"
+ "35313136.60f71e"
]
]
},
{
- "id": "e13f79d4.74035",
+ "id": "85af5a4b.a2187",
"type": "switchNode",
"name": "switch: resource-key[].name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1662.2185287475586,
- "y": 810.8654227256775,
- "z": "9db1531d.07a1a",
+ "x": 1650.2185287475586,
+ "y": 820.8654227256775,
+ "z": "1e0169fe.460196",
"wires": [
[
- "2eeaa08a.1d2c78",
- "9af0367b.dbd1f8",
- "f747f187.002e28",
- "81e1796a.cad958"
+ "6c06e68b.da7eb8",
+ "8b40c4df.047c2",
+ "5bcfaea0.c0c0f8",
+ "714a9ad3.25a814"
]
]
},
{
- "id": "9af0367b.dbd1f8",
+ "id": "8b40c4df.047c2",
"type": "outcome",
"name": "service-instance-id",
"xml": "<outcome value='service-instance-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1933.607437133789,
- "y": 810.3376412391663,
- "z": "9db1531d.07a1a",
+ "x": 1921.607437133789,
+ "y": 820.3376412391663,
+ "z": "1e0169fe.460196",
"wires": [
[
- "c656a145.06dbc"
+ "ee744de2.8b10f8"
]
]
},
{
- "id": "c656a145.06dbc",
+ "id": "ee744de2.8b10f8",
"type": "set",
"name": "set tmp.ss.service-instance-id",
"xml": "<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2199.857437133789,
- "y": 810.0876412391663,
- "z": "9db1531d.07a1a",
+ "x": 2187.857437133789,
+ "y": 820.0876412391663,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "41f4db04.700f14",
+ "id": "53877355.ae41ac",
"type": "update",
"name": "get-resource IPAM_IP_ASSIGNEMENT",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from IPAM_IP_ASSIGNEMENT \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id' >",
"comments": "",
"outputs": 1,
- "x": 1688.8173828125,
- "y": 1556.190468788147,
- "z": "9db1531d.07a1a",
+ "x": 2175.3888549804688,
+ "y": 1491.9048852920532,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b267b2b4.23a3e8",
- "9b01dbab.a7a7a8"
+ "1455e2db.491d8d",
+ "f61d39ca.54246"
]
]
},
{
- "id": "b267b2b4.23a3e8",
+ "id": "1455e2db.491d8d",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1983.4047203063965,
- "y": 1557.1905019283295,
- "z": "9db1531d.07a1a",
+ "x": 2469.9761924743652,
+ "y": 1492.9049184322357,
+ "z": "1e0169fe.460196",
"wires": [
[
- "c67fc199.97dec"
+ "4d3d930a.c74edc"
]
]
},
{
- "id": "f0b88a86.aebb68",
+ "id": "2e96e14a.d8a666",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1382.6546783447266,
- "y": 1557.8334131240845,
- "z": "9db1531d.07a1a",
+ "x": 1872.9761352539062,
+ "y": 1408.5477905273438,
+ "z": "1e0169fe.460196",
"wires": [
[
- "41f4db04.700f14"
+ "53877355.ae41ac"
]
]
},
{
- "id": "e6246ef9.3e7788",
+ "id": "8b797c86.449c88",
"type": "for",
"name": "for kidx in resource-key_length",
"xml": "<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`\">",
"comments": "",
"outputs": 1,
- "x": 1379.0796127319336,
- "y": 808.7265067100525,
- "z": "9db1531d.07a1a",
+ "x": 1367.0796127319336,
+ "y": 818.7265067100525,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e13f79d4.74035"
+ "85af5a4b.a2187"
]
]
},
{
- "id": "a0639b3c.7eba9",
+ "id": "c436ca39.dad55",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 648.642822265625,
- "y": 535.666748046875,
- "z": "9db1531d.07a1a",
+ "x": 636.642822265625,
+ "y": 545.666748046875,
+ "z": "1e0169fe.460196",
"wires": [
[
- "bfedad8c.b95118",
- "dd52194f.db49b8"
+ "37af35ce.c8f9aa",
+ "419443bc.89754c"
]
]
},
{
- "id": "37aec3a4.7d6aa4",
+ "id": "7d36e25f.6ea3f4",
"type": "update",
"name": "update IPAM_IP_ASSIGNEMENT to PENDING_DELETE...",
"xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
"comments": "",
"outputs": 1,
- "x": 2511.71435546875,
- "y": 1647.869179725647,
- "z": "9db1531d.07a1a",
+ "x": 2998.2858276367188,
+ "y": 1583.5835962295532,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f17fba04.5953f8"
+ "ca94a980.5b06e"
]
]
},
{
- "id": "f7bb8b39.bef09",
+ "id": "954b1950.33da8",
"type": "set",
"name": "set status = PENDING_DELETE",
"xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
"comments": "",
- "x": 2421.630859375,
- "y": 1606.202431678772,
- "z": "9db1531d.07a1a",
+ "x": 2908.2023315429688,
+ "y": 1541.9168481826782,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "f17fba04.5953f8",
+ "id": "ca94a980.5b06e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2819.380813598633,
- "y": 1648.4525032043457,
- "z": "9db1531d.07a1a",
+ "x": 3305.9522857666016,
+ "y": 1584.166919708252,
+ "z": "1e0169fe.460196",
"wires": [
[
- "7d1f077f.575248"
+ "ddd93d50.c85558"
]
]
},
{
- "id": "7d1f077f.575248",
+ "id": "ddd93d50.c85558",
"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 NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
"comments": "",
- "x": 2998.381103515625,
- "y": 1648.2621240615845,
- "z": "9db1531d.07a1a",
+ "x": 3484.9525756835938,
+ "y": 1583.9765405654907,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "91f6c6fc.2974a8",
+ "id": "d3428a19.b74a38",
"type": "execute",
"name": "execute Netbox unassign IP addresses",
"xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
"comments": "",
"outputs": 1,
- "x": 2441.7142333984375,
- "y": 1694.1192407608032,
- "z": "9db1531d.07a1a",
+ "x": 2928.2857055664062,
+ "y": 1629.8336572647095,
+ "z": "1e0169fe.460196",
"wires": [
[
- "54af54c4.b3a344",
- "286269c8.56b2fe"
+ "a11ee488.c69c1",
+ "bacc37f5.251158"
]
]
},
{
- "id": "54af54c4.b3a344",
+ "id": "a11ee488.c69c1",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2685.0475006103516,
- "y": 1694.1191902160645,
- "z": "9db1531d.07a1a",
+ "x": 3171.6189727783203,
+ "y": 1629.8336067199707,
+ "z": "1e0169fe.460196",
"wires": [
[
- "3d527d1f.8bda2a"
+ "727fae.421bc054"
]
]
},
{
- "id": "3d527d1f.8bda2a",
+ "id": "727fae.421bc054",
"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 NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`\" />\n",
"comments": "",
- "x": 2847.0475273132324,
- "y": 1693.9289255142212,
- "z": "9db1531d.07a1a",
+ "x": 3333.618999481201,
+ "y": 1629.6433420181274,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "8bad1bbc.e7a648",
+ "id": "199cb084.41994f",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2162.333267211914,
- "y": 1605.619059562683,
- "z": "9db1531d.07a1a",
+ "x": 2648.904739379883,
+ "y": 1541.3334760665894,
+ "z": "1e0169fe.460196",
"wires": [
[
- "f7bb8b39.bef09",
- "37aec3a4.7d6aa4",
- "91f6c6fc.2974a8"
+ "954b1950.33da8",
+ "7d36e25f.6ea3f4",
+ "d3428a19.b74a38"
]
]
},
{
- "id": "dd52194f.db49b8",
+ "id": "419443bc.89754c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 884.4484252929688,
- "y": 592.6112365722656,
- "z": "9db1531d.07a1a",
+ "x": 872.4484252929688,
+ "y": 602.6112365722656,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
},
{
- "id": "2eeaa08a.1d2c78",
+ "id": "6c06e68b.da7eb8",
"type": "outcome",
"name": "vnf-id",
"xml": "<outcome value='vnf-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1915.440444946289,
- "y": 856.58758020401,
- "z": "9db1531d.07a1a",
+ "x": 1903.440444946289,
+ "y": 866.58758020401,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e99c4040.fdfb6"
+ "48b45ebc.19189"
]
]
},
{
- "id": "e99c4040.fdfb6",
+ "id": "48b45ebc.19189",
"type": "set",
"name": "set tmp.ss.vnf-id",
"xml": "<set>\n<parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2181.4405670166016,
- "y": 856.58758020401,
- "z": "9db1531d.07a1a",
+ "x": 2169.4405670166016,
+ "y": 866.58758020401,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "8b1d70.bdf8029",
+ "id": "4c0830f.966f55",
"type": "set",
"name": "set resource-resolution-data.status = DELETED",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n",
"comments": "",
- "x": 2951.940185546875,
- "y": 1749.43994140625,
- "z": "9db1531d.07a1a",
+ "x": 3438.5116577148438,
+ "y": 1685.1543579101562,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "f747f187.002e28",
+ "id": "5bcfaea0.c0c0f8",
"type": "outcome",
"name": "prefix-id",
"xml": "<outcome value='prefix-id'>\n",
"comments": "",
"outputs": 1,
- "x": 1904.496109008789,
- "y": 900.8376107215881,
- "z": "9db1531d.07a1a",
+ "x": 1892.496109008789,
+ "y": 910.8376107215881,
+ "z": "1e0169fe.460196",
"wires": [
[
- "2ed5a6cf.2a2e6a"
+ "dd169952.c2ddc8"
]
]
},
{
- "id": "2ed5a6cf.2a2e6a",
+ "id": "dd169952.c2ddc8",
"type": "set",
"name": "set prefix-id",
"xml": "<set>\n<parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2150.996109008789,
- "y": 901.08758020401,
- "z": "9db1531d.07a1a",
+ "x": 2138.996109008789,
+ "y": 911.08758020401,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "cb98d7d9.b5a08",
+ "id": "3246d2cf.e446ce",
"type": "execute",
"name": "execute NetboxClient assignIpAddress",
"xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"assignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"vf_module_id\" value=\"`$tmp.ss.vnf-id`\" />\n<parameter name=\"prefix_id\" value=\"`$tmp.ss.prefix-id`\" />\n<parameter name=\"resource_name\" value=\"`$tmp.ss.param.name`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
"comments": "",
"outputs": 1,
- "x": 1686.3928833007812,
- "y": 1215.357460975647,
- "z": "9db1531d.07a1a",
+ "x": 2200.1068725585938,
+ "y": 1209.6432886123657,
+ "z": "1e0169fe.460196",
"wires": [
[
- "158c4088.3cd6c7",
- "2aec43bd.80530c"
+ "bc02f9c5.d3009",
+ "5a42ccdf.863d7c"
]
]
},
{
- "id": "158c4088.3cd6c7",
+ "id": "bc02f9c5.d3009",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2003.3928833007812,
- "y": 1217.3573999404907,
- "z": "9db1531d.07a1a",
+ "x": 2517.1068725585938,
+ "y": 1211.6432275772095,
+ "z": "1e0169fe.460196",
"wires": [
[
- "2e7a036b.bc0adc"
+ "9be2285f.3688f8"
]
]
},
{
- "id": "2e7a036b.bc0adc",
+ "id": "9be2285f.3688f8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2211.3928833007812,
- "y": 1221.3573999404907,
- "z": "9db1531d.07a1a",
+ "x": 2725.1068725585938,
+ "y": 1215.6432275772095,
+ "z": "1e0169fe.460196",
"wires": [
[
- "51bf773d.df62b",
- "bc6879f4.baae4"
+ "be8fa4c5.70a7a",
+ "742a806a.1c8b48"
]
]
},
{
- "id": "51bf773d.df62b",
+ "id": "be8fa4c5.70a7a",
"type": "set",
"name": "set resource-resolution-data.status = FAILED",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' value='FAILED' />\n",
"comments": "",
- "x": 2528.3929443359375,
- "y": 1225.3573694229126,
- "z": "9db1531d.07a1a",
+ "x": 3042.10693359375,
+ "y": 1219.6431970596313,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "bc6879f4.baae4",
+ "id": "742a806a.1c8b48",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
"comments": "",
- "x": 2425.7738037109375,
- "y": 1274.9606323242188,
- "z": "9db1531d.07a1a",
+ "x": 2939.48779296875,
+ "y": 1269.2464599609375,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "49b2f547.09aa04",
+ "id": "291a0f5b.065428",
"type": "set",
"name": "set resource-resolution-data.status = SUCCESS",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n",
"comments": "",
- "x": 2505.47607421875,
- "y": 1420.0482177734375,
- "z": "9db1531d.07a1a",
+ "x": 3019.1900634765625,
+ "y": 1414.3340454101562,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "81e1796a.cad958",
+ "id": "714a9ad3.25a814",
"type": "outcome",
"name": "external_key",
"xml": "<outcome value='external_key'>\n",
"comments": "",
"outputs": 1,
- "x": 1927.246337890625,
- "y": 951.4089965820312,
- "z": "9db1531d.07a1a",
+ "x": 1915.246337890625,
+ "y": 961.4089965820312,
+ "z": "1e0169fe.460196",
"wires": [
[
- "96f2e2c3.446d68"
+ "bc0a0828.40d9d8"
]
]
},
{
- "id": "96f2e2c3.446d68",
+ "id": "bc0a0828.40d9d8",
"type": "set",
"name": "set external-key",
"xml": "<set>\n<parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
"comments": "",
- "x": 2175.8177490234375,
- "y": 951.4090576171875,
- "z": "9db1531d.07a1a",
+ "x": 2163.8177490234375,
+ "y": 961.4090576171875,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "eadf5468.9c709",
+ "id": "f4266bba.68463",
"type": "set",
"name": "set tmp.ss.param.name",
"xml": "<set>\n<parameter name='tmp.ss.param.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].name`' />\n",
"comments": "",
- "x": 1193.9564895629883,
- "y": 577.6627821922302,
- "z": "9db1531d.07a1a",
+ "x": 1181.9564895629883,
+ "y": 587.6627821922302,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "b4530e81.fa1df",
- "type": "switchNode",
- "name": "switch: resource-resolution-data.status",
- "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 734.725830078125,
- "y": 785.631103515625,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "ef20c0ae.2f0268",
- "fe2c0013.43141"
- ]
- ]
- },
- {
- "id": "ef20c0ae.2f0268",
- "type": "not-found",
- "name": "FAILED",
- "xml": "<outcome value='FAILED'>\n",
- "comments": "",
- "outputs": 1,
- "x": 966.1546325683594,
- "y": 781.6311492919922,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "b3e8cd71.0d271"
- ]
- ]
- },
- {
- "id": "fe2c0013.43141",
- "type": "success",
- "name": "PENDING",
- "xml": "<outcome value='PENDING'>\n",
- "comments": "",
- "outputs": 1,
- "x": 972.8688087463379,
- "y": 833.3454773426056,
- "z": "9db1531d.07a1a",
- "wires": [
- [
- "b3e8cd71.0d271"
- ]
- ]
- },
- {
- "id": "b3e8cd71.0d271",
+ "id": "35313136.60f71e",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1127.5831298828125,
- "y": 805.6311645507812,
- "z": "9db1531d.07a1a",
+ "x": 1115.5831298828125,
+ "y": 815.6311645507812,
+ "z": "1e0169fe.460196",
"wires": [
[
- "e6246ef9.3e7788",
- "e6294bd0.41d4c8"
+ "8b797c86.449c88",
+ "f17ee439.871ec"
]
]
},
{
- "id": "c1c70c33.d44a98",
+ "id": "3ab742ab.07506e",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>",
"comments": "",
"outputs": 1,
- "x": 1185.4402465820312,
- "y": 1213.440712928772,
- "z": "9db1531d.07a1a",
+ "x": 1172.190185546875,
+ "y": 1227.190673828125,
+ "z": "1e0169fe.460196",
"wires": [
[
- "1bb6495a.fa8da7"
+ "ac9eaafc.1d31a"
]
]
},
{
- "id": "e6294bd0.41d4c8",
+ "id": "f17ee439.871ec",
"type": "switchNode",
"name": "switch: ss.capability-action",
"xml": "<switch test='`$ss.capability-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 949.4402465820312,
- "y": 1211.440712928772,
- "z": "9db1531d.07a1a",
+ "x": 934.9402770996094,
+ "y": 1232.690673828125,
+ "z": "1e0169fe.460196",
"wires": [
[
- "c1c70c33.d44a98",
- "25965467.621de4"
+ "3ab742ab.07506e",
+ "74139423.e17614"
]
]
},
{
- "id": "1bb6495a.fa8da7",
+ "id": "26e5147.b2e3b6c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1360.868896484375,
- "y": 1214.2979516983032,
- "z": "9db1531d.07a1a",
+ "x": 1920.8328857421875,
+ "y": 1214.8339233398438,
+ "z": "1e0169fe.460196",
"wires": [
[
- "cb98d7d9.b5a08"
+ "3246d2cf.e446ce"
]
]
},
{
- "id": "9b01dbab.a7a7a8",
+ "id": "f61d39ca.54246",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1980.1188659667969,
- "y": 1604.9048147201538,
- "z": "9db1531d.07a1a",
+ "x": 2466.6903381347656,
+ "y": 1540.61923122406,
+ "z": "1e0169fe.460196",
"wires": [
[
- "8bad1bbc.e7a648"
+ "199cb084.41994f"
]
]
},
{
- "id": "2aec43bd.80530c",
+ "id": "5a42ccdf.863d7c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2011.4403076171875,
- "y": 1280.8690185546873,
- "z": "9db1531d.07a1a",
+ "x": 2525.154296875,
+ "y": 1275.154846191406,
+ "z": "1e0169fe.460196",
"wires": [
[
- "b964039a.43a1a"
+ "82bf193e.1c3e9"
]
]
},
{
- "id": "c67fc199.97dec",
+ "id": "4d3d930a.c74edc",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2153.547528948103,
- "y": 1557.6190797260829,
- "z": "9db1531d.07a1a",
+ "x": 2640.1190011160716,
+ "y": 1493.3334962299891,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
},
{
- "id": "b964039a.43a1a",
+ "id": "82bf193e.1c3e9",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2205.7259521484375,
- "y": 1360.869140625,
- "z": "9db1531d.07a1a",
+ "x": 2719.43994140625,
+ "y": 1355.1549682617188,
+ "z": "1e0169fe.460196",
"wires": [
[
- "49b2f547.09aa04",
- "3bdfdc4f.b39f24",
- "4628865b.a3d7d"
+ "291a0f5b.065428",
+ "ddc0044e.197a88",
+ "96318d27.c30ac8"
]
]
},
{
- "id": "286269c8.56b2fe",
+ "id": "bacc37f5.251158",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2690.01220703125,
- "y": 1748.0118408203125,
- "z": "9db1531d.07a1a",
+ "x": 3176.5836791992188,
+ "y": 1683.7262573242188,
+ "z": "1e0169fe.460196",
"wires": [
[
- "8b1d70.bdf8029"
+ "4c0830f.966f55"
]
]
},
{
- "id": "4628865b.a3d7d",
+ "id": "96318d27.c30ac8",
"type": "set",
"name": "set service-data...param[].value = ip-address",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].value' \n\tvalue='`$ip[0]`' />\n",
"comments": "",
- "x": 2495,
- "y": 1380,
- "z": "9db1531d.07a1a",
+ "x": 3008.7139892578125,
+ "y": 1374.2858276367188,
+ "z": "1e0169fe.460196",
"wires": []
},
{
- "id": "3bdfdc4f.b39f24",
+ "id": "ddc0044e.197a88",
"type": "execute",
"name": "SliStringUtils - split subnet",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n <parameter name=\"original_string\" value=\"`$self_serve_netbox_ip_assignement.ip-address`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"ip\" />\n \n",
"comments": "",
"outputs": 1,
- "x": 2439,
- "y": 1340,
- "z": "9db1531d.07a1a",
+ "x": 2952.7139892578125,
+ "y": 1334.2858276367188,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
},
{
- "id": "fd2e7345.c27e6",
+ "id": "722fee02.ac2218",
"type": "execute",
"name": "SliStringUtils - split subnet",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n <parameter name=\"original_string\" value=\"`$self_serve_netbox_ip_assignement.ip-address`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"ip\" />\n \n",
"comments": "",
"outputs": 1,
- "x": 2481,
- "y": 2829,
- "z": "9db1531d.07a1a",
+ "x": 2960.428680419922,
+ "y": 2824.7141942977905,
+ "z": "1e0169fe.460196",
"wires": [
[]
]
+ },
+ {
+ "id": "ac9eaafc.1d31a",
+ "type": "switchNode",
+ "name": "switch: resource-resolution-data.status",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1408.392822265625,
+ "y": 1221.9642944335938,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "e91661da.3b8608",
+ "bf37d131.8b2478"
+ ]
+ ]
+ },
+ {
+ "id": "e91661da.3b8608",
+ "type": "not-found",
+ "name": "FAILED",
+ "xml": "<outcome value='FAILED'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1694.643310546875,
+ "y": 1191.53564453125,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "26e5147.b2e3b6c"
+ ]
+ ]
+ },
+ {
+ "id": "bf37d131.8b2478",
+ "type": "success",
+ "name": "PENDING",
+ "xml": "<outcome value='PENDING'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1693.678466796875,
+ "y": 1235.3931274414062,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "26e5147.b2e3b6c"
+ ]
+ ]
+ },
+ {
+ "id": "e51b7888.989928",
+ "type": "switchNode",
+ "name": "switch: resource-resolution-data.status",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1431.249755859375,
+ "y": 1393.750244140625,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "26889fb2.5ce19"
+ ]
+ ]
+ },
+ {
+ "id": "26889fb2.5ce19",
+ "type": "success",
+ "name": "SUCCESS",
+ "xml": "<outcome value='SUCCESS'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1688.678466796875,
+ "y": 1393.9644775390625,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "2e96e14a.d8a666"
+ ]
+ ]
+ },
+ {
+ "id": "c615cc08.6cc77",
+ "type": "outcome",
+ "name": "unassign",
+ "xml": "<outcome value='unassign'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1181.428466796875,
+ "y": 2975.71435546875,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "5bd2efc8.0cc53"
+ ]
+ ]
+ },
+ {
+ "id": "398f1da9.7fc262",
+ "type": "outcome",
+ "name": "assign",
+ "xml": "<outcome value='assign'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1181.749755859375,
+ "y": 2705.8930053710938,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "71585e8c.8a959"
+ ]
+ ]
+ },
+ {
+ "id": "71585e8c.8a959",
+ "type": "switchNode",
+ "name": "switch: resource-resolution-data.status",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1417.952392578125,
+ "y": 2700.6666259765625,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "83c2a9a4.58aa98",
+ "bd2c6000.241588"
+ ]
+ ]
+ },
+ {
+ "id": "83c2a9a4.58aa98",
+ "type": "not-found",
+ "name": "FAILED",
+ "xml": "<outcome value='FAILED'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1704.202880859375,
+ "y": 2670.2379760742188,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "b4174ab1.8632e"
+ ]
+ ]
+ },
+ {
+ "id": "bd2c6000.241588",
+ "type": "success",
+ "name": "PENDING",
+ "xml": "<outcome value='PENDING'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1703.238037109375,
+ "y": 2714.095458984375,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "b4174ab1.8632e"
+ ]
+ ]
+ },
+ {
+ "id": "5bd2efc8.0cc53",
+ "type": "switchNode",
+ "name": "switch: resource-resolution-data.status",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1435.0949096679688,
+ "y": 2979.5953979492188,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "9c7404ad.aa898"
+ ]
+ ]
+ },
+ {
+ "id": "9c7404ad.aa898",
+ "type": "success",
+ "name": "SUCCESS",
+ "xml": "<outcome value='SUCCESS'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1692.5236206054688,
+ "y": 2979.8096313476562,
+ "z": "1e0169fe.460196",
+ "wires": [
+ [
+ "9e365126.584608"
+ ]
+ ]
}
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.json
index ec9841e1..df489bd7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.json
@@ -1 +1,457 @@
-[{"id":"e165f010.244d3","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":62.85714340209961,"z":"e620a365.4a257","wires":[["4deb4c65.576eb4"]]},{"id":"4deb4c65.576eb4","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":244.28570556640625,"y":103.09525489807129,"z":"e620a365.4a257","wires":[["aa880087.e2472"]]},{"id":"aa880087.e2472","type":"method","name":"method self-serve-vf-module-forking-logic","xml":"<method rpc='self-serve-vf-module-forking-logic' mode='sync'>\n","comments":"","outputs":1,"x":267.85719299316406,"y":151.42857551574707,"z":"e620a365.4a257","wires":[["d3462033.237df"]]},{"id":"c11380d2.2767f","type":"switchNode","name":"switch: param[].name","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$p].name`\">\n","comments":"","outputs":1,"x":787.5833282470703,"y":408,"z":"e620a365.4a257","wires":[["b8195917.3db608","df581beb.247948"]]},{"id":"86ff4916.e930e8","type":"for","name":"for p in vf-module-input-parameters.param[]","xml":"<for silentFailure='true' index='p' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >\n","comments":"","outputs":1,"x":493.6904754638672,"y":408.50003242492676,"z":"e620a365.4a257","wires":[["c11380d2.2767f"]]},{"id":"c8a0fdfa.fd72b","type":"set","name":"set tmp.exist.vf_module_label = true","xml":"<set>\n<parameter name='tmp.exist.vf_module_label' value='true' />","comments":"","x":1329.4762573242188,"y":456.85717010498047,"z":"e620a365.4a257","wires":[]},{"id":"b371231d.f6d19","type":"set","name":"set tmp.exist.sdnc-model-name = true","xml":"<set>\n<parameter name='tmp.exist.sdnc-model-name' value='true' />\n","comments":"","x":1332.1903648376465,"y":407.85718536376953,"z":"e620a365.4a257","wires":[]},{"id":"d3462033.237df","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":173,"y":302.809513092041,"z":"e620a365.4a257","wires":[["86ff4916.e930e8","72d0f5dc.50ef7c","75ac533a.ce71cc","db5f2cda.e500e"]]},{"id":"b8195917.3db608","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":1043.7619040352956,"y":407.9047944205147,"z":"e620a365.4a257","wires":[["b371231d.f6d19"]]},{"id":"df581beb.247948","type":"outcome","name":"vf_module_label","xml":"<outcome value='vf_module_label'>\n","comments":"","outputs":1,"x":1046.619026184082,"y":457.33336639404297,"z":"e620a365.4a257","wires":[["c8a0fdfa.fd72b"]]},{"id":"8b2508c1.bc86a8","type":"get-resource","name":"get VF_MODEL.sdnc_model_name","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT sdnc_model_name from VF_MODEL \n \tWHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid \n \tAND sdnc_model_name is not null'\n pfx='db.vf-model-name'>\n\n","comments":"","outputs":1,"x":1199.8572235107422,"y":689.1187467575073,"z":"e620a365.4a257","wires":[["af18ec02.f7299","8e3154c6.67b2b8","4cedd1e8.5cfed"]]},{"id":"af18ec02.f7299","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1450.2143478393555,"y":599.4996871948242,"z":"e620a365.4a257","wires":[["52ada15a.6e3a4"]]},{"id":"8e3154c6.67b2b8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1455.928596496582,"y":786.642599105835,"z":"e620a365.4a257","wires":[["8672ba0c.2720a8"]]},{"id":"52ada15a.6e3a4","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_MODEL table to determine self-serve forking criteria\" />\n","comments":"","x":1631.2143287658691,"y":599.6425943374634,"z":"e620a365.4a257","wires":[]},{"id":"4d4baf34.251d7","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":951.7026138305664,"y":689.3090238571167,"z":"e620a365.4a257","wires":[["8b2508c1.bc86a8"]]},{"id":"db5f2cda.e500e","type":"switchNode","name":"switch: tmp.exist.sdnc-model-name && tmp.exist.vf_module_label == true","xml":"<switch test=\"`$tmp.exist.sdnc-model-name == 'true' and $tmp.exist.vf_module_label == 'true'`\">\n","comments":"","outputs":1,"x":582.0594329833984,"y":602.571252822876,"z":"e620a365.4a257","wires":[["4d4baf34.251d7","aa171664.89cd08"]]},{"id":"aa171664.89cd08","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":954.6668395996094,"y":522.9283447265625,"z":"e620a365.4a257","wires":[["c7aef73a.253c28"]]},{"id":"fbd180e.095ed8","type":"get-resource","name":"get VF_MODULE_MODEL.vf-module-label","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT vf_module_label from VF_MODULE_MODEL \n \tWHERE vf_customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid\n \tAND vf_module_label is not null '\n pfx='db.vf-module-label'>\n\n","comments":"","outputs":1,"x":1728.0953903198242,"y":689.3570070266724,"z":"e620a365.4a257","wires":[["e361309f.659c5","49207b1f.4607b4","c961fc85.cf2a1"]]},{"id":"e361309f.659c5","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2003.4526138305664,"y":689.4521379470825,"z":"e620a365.4a257","wires":[["5894d7f0.070508"]]},{"id":"49207b1f.4607b4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2014.0239715576172,"y":737.1664037704468,"z":"e620a365.4a257","wires":[["3bf1408b.9009b"]]},{"id":"5894d7f0.070508","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 to determine self-serve forking criteria\" />\n","comments":"","x":2177.5951232910156,"y":690.0235834121704,"z":"e620a365.4a257","wires":[]},{"id":"c961fc85.cf2a1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2007.809684753418,"y":640.3570623397827,"z":"e620a365.4a257","wires":[["67e5bedb.4b89e"]]},{"id":"4cedd1e8.5cfed","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1453.8691101074219,"y":689.1188116073608,"z":"e620a365.4a257","wires":[["fbd180e.095ed8"]]},{"id":"72d0f5dc.50ef7c","type":"set","name":"initialize tmp.exist.sdnc-model-name && tmp.exist.vf_module_label = false","xml":"<set>\n<parameter name='tmp.exist.sdnc-model-name' value='false' />\n<parameter name='tmp.exist.vf_module_label' value='false' />\n","comments":"","x":585.5833053588867,"y":303.08317470550537,"z":"e620a365.4a257","wires":[]},{"id":"75ac533a.ce71cc","type":"switchNode","name":"switch: vf-module-input-parameters.param_length","xml":"<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n","comments":"","outputs":1,"x":513.4404830932617,"y":351.559458732605,"z":"e620a365.4a257","wires":[["5f717077.c3f3c"]]},{"id":"5f717077.c3f3c","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":777.0119018554688,"y":351.8451986312866,"z":"e620a365.4a257","wires":[["ddeb321c.3bad4"]]},{"id":"ddeb321c.3bad4","type":"set","name":"set vf-module-input-parameters.param_length = 0","xml":"<set>\n<parameter name='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length' value='0' />\n","comments":"","x":1050.7261428833008,"y":351.70236015319824,"z":"e620a365.4a257","wires":[]},{"id":"3bf1408b.9009b","type":"set","name":"set ss.self-serve-flag = false","xml":"<set>\n<parameter name='ss.self-serve-flag' value='false' />\n","comments":"","x":2229.999801635742,"y":737.1428709030151,"z":"e620a365.4a257","wires":[]},{"id":"c7aef73a.253c28","type":"set","name":"set ss.self-serve-flag = true","xml":"<set>\n<parameter name='ss.self-serve-flag' value='true' />\n","comments":"","x":1166.0001373291016,"y":522.428596496582,"z":"e620a365.4a257","wires":[]},{"id":"8672ba0c.2720a8","type":"set","name":"set ss.self-serve-flag = false","xml":"<set>\n<parameter name='ss.self-serve-flag' value='false' />\n","comments":"","x":1682.857192993164,"y":786.1428442001343,"z":"e620a365.4a257","wires":[]},{"id":"67e5bedb.4b89e","type":"set","name":"set ss.self-serve-flag = true","xml":"<set>\n<parameter name='ss.self-serve-flag' value='true' />\n","comments":"","x":2218.571548461914,"y":640.1428442001343,"z":"e620a365.4a257","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "8aa8ea11.740be",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 100,
+ "y": 50,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "69365dae.668034"
+ ]
+ ]
+ },
+ {
+ "id": "69365dae.668034",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 214.28570556640625,
+ "y": 90.23811149597168,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "f7dcbe91.e46188"
+ ]
+ ]
+ },
+ {
+ "id": "f7dcbe91.e46188",
+ "type": "method",
+ "name": "method self-serve-vf-module-forking-logic",
+ "xml": "<method rpc='self-serve-vf-module-forking-logic' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 237.85719299316406,
+ "y": 138.57143211364746,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "8ac3a01b.fa2a38"
+ ]
+ ]
+ },
+ {
+ "id": "66ba1bad.63f02c",
+ "type": "switchNode",
+ "name": "switch: param[].name",
+ "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$p].name`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 757.5833282470703,
+ "y": 395.1428565979004,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "f1b12470.776ec8",
+ "540a60cc.25f5f8"
+ ]
+ ]
+ },
+ {
+ "id": "e59ddfff.f29228",
+ "type": "for",
+ "name": "for p in vf-module-input-parameters.param[]",
+ "xml": "<for silentFailure='true' index='p' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 463.6904754638672,
+ "y": 395.64288902282715,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "66ba1bad.63f02c"
+ ]
+ ]
+ },
+ {
+ "id": "736b235f.f41374",
+ "type": "set",
+ "name": "set tmp.exist.vf_module_label = true",
+ "xml": "<set>\n<parameter name='tmp.exist.vf_module_label' value='true' />",
+ "comments": "",
+ "x": 1299.4762573242188,
+ "y": 444.00002670288086,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "8f743c14.96209",
+ "type": "set",
+ "name": "set tmp.exist.sdnc-model-name = true",
+ "xml": "<set>\n<parameter name='tmp.exist.sdnc-model-name' value='true' />\n",
+ "comments": "",
+ "x": 1302.1903648376465,
+ "y": 395.0000419616699,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "8ac3a01b.fa2a38",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 143,
+ "y": 289.9523696899414,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "e59ddfff.f29228",
+ "968d6f83.1e8cb8",
+ "87abb41.4b21fc8",
+ "71f24135.a396b8"
+ ]
+ ]
+ },
+ {
+ "id": "f1b12470.776ec8",
+ "type": "outcome",
+ "name": "sdnc_model_name",
+ "xml": "<outcome value='sdnc_model_name'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1013.7619040352956,
+ "y": 395.0476510184151,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "8f743c14.96209"
+ ]
+ ]
+ },
+ {
+ "id": "540a60cc.25f5f8",
+ "type": "outcome",
+ "name": "vf_module_label",
+ "xml": "<outcome value='vf_module_label'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1016.619026184082,
+ "y": 444.47622299194336,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "736b235f.f41374"
+ ]
+ ]
+ },
+ {
+ "id": "18b84933.21068f",
+ "type": "get-resource",
+ "name": "get VF_MODEL.sdnc_model_name",
+ "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT sdnc_model_name from VF_MODEL \n \tWHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid \n \tAND sdnc_model_name is not null'\n pfx='db.vf-model-name'>\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1169.8572235107422,
+ "y": 676.2616033554077,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "d95cfab.cfa8f08",
+ "91b70953.025358",
+ "e5e4f7b1.a891f"
+ ]
+ ]
+ },
+ {
+ "id": "d95cfab.cfa8f08",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1420.2143478393555,
+ "y": 586.6425437927246,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "4d1797d1.55ba98"
+ ]
+ ]
+ },
+ {
+ "id": "91b70953.025358",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1425.928596496582,
+ "y": 773.7854557037354,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "cdc75221.415348"
+ ]
+ ]
+ },
+ {
+ "id": "4d1797d1.55ba98",
+ "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_MODEL table to determine self-serve forking criteria\" />\n",
+ "comments": "",
+ "x": 1601.2143287658691,
+ "y": 586.7854509353638,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "da046f4e.feca88",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921.7026138305664,
+ "y": 676.4518804550171,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "18b84933.21068f"
+ ]
+ ]
+ },
+ {
+ "id": "71f24135.a396b8",
+ "type": "switchNode",
+ "name": "switch: tmp.exist.sdnc-model-name && tmp.exist.vf_module_label == true",
+ "xml": "<switch test=\"`$tmp.exist.sdnc-model-name == 'true' and $tmp.exist.vf_module_label == 'true'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 552.0594329833984,
+ "y": 589.7141094207764,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "da046f4e.feca88",
+ "af375362.061b2"
+ ]
+ ]
+ },
+ {
+ "id": "af375362.061b2",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 924.6668395996094,
+ "y": 510.0712013244629,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "b5bbd060.67f058"
+ ]
+ ]
+ },
+ {
+ "id": "c6dbcf48.080eb8",
+ "type": "get-resource",
+ "name": "get VF_MODULE_MODEL.vf-module-label",
+ "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT vf_module_label from VF_MODULE_MODEL \n \tWHERE vf_customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid\n \tAND vf_module_label is not null '\n pfx='db.vf-module-label'>\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1698.0953903198242,
+ "y": 676.4998636245728,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "89568209.e5f728",
+ "2dda5e9d.c9b972",
+ "cbe36505.a168d8"
+ ]
+ ]
+ },
+ {
+ "id": "89568209.e5f728",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1973.4526138305664,
+ "y": 676.5949945449829,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "aa612980.7b237"
+ ]
+ ]
+ },
+ {
+ "id": "2dda5e9d.c9b972",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1984.0239715576172,
+ "y": 724.3092603683472,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "2bea618b.553156"
+ ]
+ ]
+ },
+ {
+ "id": "aa612980.7b237",
+ "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 to determine self-serve forking criteria\" />\n",
+ "comments": "",
+ "x": 2147.5951232910156,
+ "y": 677.1664400100708,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "cbe36505.a168d8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1977.809684753418,
+ "y": 627.4999189376831,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "69e505b7.70a894"
+ ]
+ ]
+ },
+ {
+ "id": "e5e4f7b1.a891f",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1423.8691101074219,
+ "y": 676.2616682052612,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "c6dbcf48.080eb8"
+ ]
+ ]
+ },
+ {
+ "id": "968d6f83.1e8cb8",
+ "type": "set",
+ "name": "initialize tmp.exist.sdnc-model-name && tmp.exist.vf_module_label = false",
+ "xml": "<set>\n<parameter name='tmp.exist.sdnc-model-name' value='false' />\n<parameter name='tmp.exist.vf_module_label' value='false' />\n",
+ "comments": "",
+ "x": 555.5833053588867,
+ "y": 290.22603130340576,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "87abb41.4b21fc8",
+ "type": "switchNode",
+ "name": "switch: vf-module-input-parameters.param_length",
+ "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 483.4404830932617,
+ "y": 338.70231533050537,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "afd3db14.e78eb"
+ ]
+ ]
+ },
+ {
+ "id": "afd3db14.e78eb",
+ "type": "other",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 747.0119018554688,
+ "y": 338.988055229187,
+ "z": "8316db2b.abe9a",
+ "wires": [
+ [
+ "460cb6a0.e01ee8"
+ ]
+ ]
+ },
+ {
+ "id": "460cb6a0.e01ee8",
+ "type": "set",
+ "name": "set vf-module-input-parameters.param_length = 0",
+ "xml": "<set>\n<parameter name='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length' value='0' />\n",
+ "comments": "",
+ "x": 1020.7261428833008,
+ "y": 338.84521675109863,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "2bea618b.553156",
+ "type": "set",
+ "name": "set ss.self-serve-flag = false",
+ "xml": "<set>\n<parameter name='ss.self-serve-flag' value='false' />\n",
+ "comments": "",
+ "x": 2199.999801635742,
+ "y": 724.2857275009155,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "b5bbd060.67f058",
+ "type": "set",
+ "name": "set ss.self-serve-flag = true",
+ "xml": "<set>\n<parameter name='ss.self-serve-flag' value='true' />\n",
+ "comments": "",
+ "x": 1143.5,
+ "y": 508.32147216796875,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "cdc75221.415348",
+ "type": "set",
+ "name": "set ss.self-serve-flag = false",
+ "xml": "<set>\n<parameter name='ss.self-serve-flag' value='false' />\n",
+ "comments": "",
+ "x": 1652.857192993164,
+ "y": 773.2857007980347,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ },
+ {
+ "id": "69e505b7.70a894",
+ "type": "set",
+ "name": "set ss.self-serve-flag = true",
+ "xml": "<set>\n<parameter name='ss.self-serve-flag' value='true' />\n",
+ "comments": "",
+ "x": 2196.07177734375,
+ "y": 624.7857666015625,
+ "z": "8316db2b.abe9a",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
index 86c905b6..9ef063ea 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
@@ -1 +1,529 @@
-[{"id":"582b5aa0.7eeaf4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":260,"y":410.2500066757202,"z":"348b9f74.369c5","wires":[["bd96033d.8336e","7fd8cb2f.5fa374","38370c7c.c4f0d4","d5c4e5aa.7d5948","1bbaae3f.e0d542","aa17e02a.1771"]]},{"id":"bd96033d.8336e","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":517.7619094848633,"y":368.08034229278564,"z":"348b9f74.369c5","wires":[["2f85d56c.ed707a"]]},{"id":"2f85d56c.ed707a","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":743.476203918457,"y":368.0803461074829,"z":"348b9f74.369c5","wires":[["372f23ad.72c64c"]]},{"id":"372f23ad.72c64c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":894.9047698974609,"y":368.0803442001343,"z":"348b9f74.369c5","wires":[]},{"id":"7fd8cb2f.5fa374","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":506.3332726614817,"y":326.6517738614764,"z":"348b9f74.369c5","wires":[["bd1aeb1f.a739c8"]]},{"id":"bd1aeb1f.a739c8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":742.0476243155344,"y":325.22317164284846,"z":"348b9f74.369c5","wires":[["afc00ae4.9d9d18"]]},{"id":"afc00ae4.9d9d18","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":892.0475976126536,"y":325.2231811795916,"z":"348b9f74.369c5","wires":[]},{"id":"38370c7c.c4f0d4","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":516.3333260672434,"y":410.9374889646258,"z":"348b9f74.369c5","wires":[["be233ca5.19ebe"]]},{"id":"be233ca5.19ebe","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":743.4761995588033,"y":410.9374998637609,"z":"348b9f74.369c5","wires":[["32cbb07.e56b45"]]},{"id":"32cbb07.e56b45","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is a required input\" />\n","comments":"","x":894.9047655378072,"y":410.93749795641224,"z":"348b9f74.369c5","wires":[]},{"id":"68df33c4.fea8fc","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1134.7978477478027,"y":558.3662624359131,"z":"348b9f74.369c5","wires":[["10cb7b10.f12585"]]},{"id":"10cb7b10.f12585","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1339.7978477478027,"y":558.3662452697754,"z":"348b9f74.369c5","wires":[["f4a32f1c.bd90b"]]},{"id":"f4a32f1c.bd90b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1491.2264137268066,"y":558.3662433624268,"z":"348b9f74.369c5","wires":[]},{"id":"fe896fef.dd825","type":"switchNode","name":"switch tenant","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n","comments":"","outputs":1,"x":1080.6549263000488,"y":599.7947731018066,"z":"348b9f74.369c5","wires":[["74a78b37.2da984"]]},{"id":"74a78b37.2da984","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1338.3692436218262,"y":599.794807434082,"z":"348b9f74.369c5","wires":[["dd5d5cef.7e70f"]]},{"id":"dd5d5cef.7e70f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.vnf-request-input.tenant is a required input\" />\n","comments":"","x":1489.79780960083,"y":599.7948055267334,"z":"348b9f74.369c5","wires":[]},{"id":"dbb5229b.87433","type":"comment","name":"Validation of required fields","info":"","comments":"","x":666.3332824707031,"y":282.36605644226074,"z":"348b9f74.369c5","wires":[]},{"id":"d5c4e5aa.7d5948","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":500.32141876220703,"y":600.0447483062744,"z":"348b9f74.369c5","wires":[["24b1818b.56cbbe"]]},{"id":"24b1818b.56cbbe","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":677.4047393798828,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["a750cf34.02893"]]},{"id":"a750cf34.02893","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":874.0713500976562,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["68df33c4.fea8fc","fe896fef.dd825","26f7b426.cb378c"]]},{"id":"980060b2.05cd2","type":"dgstart","name":"DGSTART","outputs":1,"x":178.7500098092214,"y":154.9136562347412,"z":"348b9f74.369c5","wires":[["16c74c85.6dd223"]]},{"id":"16c74c85.6dd223","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":292.03571537562766,"y":195.1517677307129,"z":"348b9f74.369c5","wires":[["323a6f66.9143"]]},{"id":"323a6f66.9143","type":"method","name":"method validate-vnf-input","xml":"<method rpc='validate-vnf-input' mode='sync'>\n","comments":"","outputs":1,"x":227.42863682338157,"y":236.16365242004395,"z":"348b9f74.369c5","wires":[["582b5aa0.7eeaf4"]]},{"id":"b04d7cd7.867c8","type":"comment","name":"validate-vnf-input","info":"","comments":"","x":573.0948660714284,"y":102.5,"z":"348b9f74.369c5","wires":[]},{"id":"1bbaae3f.e0d542","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":529.3571570260183,"y":455.00001525878906,"z":"348b9f74.369c5","wires":[["7c1a77b8.6014f8"]]},{"id":"7c1a77b8.6014f8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":741.7857382638113,"y":455.0000114440918,"z":"348b9f74.369c5","wires":[["3c78fe4d.85e032"]]},{"id":"3c78fe4d.85e032","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":893.2143042428152,"y":455.00000953674316,"z":"348b9f74.369c5","wires":[]},{"id":"aa17e02a.1771","type":"switchNode","name":"switch vnf-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":486.8571662902832,"y":498.5000057220459,"z":"348b9f74.369c5","wires":[["fee9192a.df3c38"]]},{"id":"fee9192a.df3c38","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":742.1428756713867,"y":497.07143783569336,"z":"348b9f74.369c5","wires":[["34c1ea3e.84a8a6"]]},{"id":"34c1ea3e.84a8a6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.vnf-id is a required input\" />\n","comments":"","x":893.5714416503906,"y":497.0714359283447,"z":"348b9f74.369c5","wires":[]},{"id":"26f7b426.cb378c","type":"switchNode","name":"switch aic-cloud-region","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":1110.0000076293945,"y":642.0714302062988,"z":"348b9f74.369c5","wires":[["59831b6.e59aee4"]]},{"id":"59831b6.e59aee4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1336.7143249511719,"y":642.0714645385742,"z":"348b9f74.369c5","wires":[["b0aeb3a5.71fc5"]]},{"id":"b0aeb3a5.71fc5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-request-input.aic-cloud-region is a required input\" />\n","comments":"","x":1488.1428909301758,"y":642.0714626312256,"z":"348b9f74.369c5","wires":[]},{"id":"18880cde.db6723","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1105.4761505126953,"y":757.2619113922119,"z":"348b9f74.369c5","wires":[["9cbd6868.f694f8"]]},{"id":"9cbd6868.f694f8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1310.4761505126953,"y":757.2618942260742,"z":"348b9f74.369c5","wires":[["5efeb3c6.10dcbc"]]},{"id":"5efeb3c6.10dcbc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1461.9047164916992,"y":757.2618923187256,"z":"348b9f74.369c5","wires":[]},{"id":"8fbbcbd5.fd98c8","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":695.4163703918457,"y":757.1904706954956,"z":"348b9f74.369c5","wires":[["b11b3301.491e"]]},{"id":"b11b3301.491e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":875.4163589477539,"y":757.1904373168945,"z":"348b9f74.369c5","wires":[["18880cde.db6723"]]},{"id":"bdabc15d.2497b","type":"comment","name":"model-customization-uuid validation moved to changeassign DG","info":"","comments":"","x":755,"y":722.5000104904175,"z":"348b9f74.369c5","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "76c41400.105bfc",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 215.03125,
+ "y": 380.7500047683716,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "2a2419b1.808286",
+ "63aa7131.36521",
+ "eac281c.1de128",
+ "e567acf8.fa2ee",
+ "b96ae981.783b38"
+ ]
+ ]
+ },
+ {
+ "id": "2a2419b1.808286",
+ "type": "switchNode",
+ "name": "switch svc-request-id",
+ "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 472.7931594848633,
+ "y": 338.580340385437,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "b04eadfc.363d6"
+ ]
+ ]
+ },
+ {
+ "id": "b04eadfc.363d6",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 698.507453918457,
+ "y": 338.5803442001343,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "7a089ce3.3d6db4"
+ ]
+ ]
+ },
+ {
+ "id": "7a089ce3.3d6db4",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
+ "comments": "",
+ "x": 849.9360198974609,
+ "y": 338.58034229278564,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "63aa7131.36521",
+ "type": "switchNode",
+ "name": "switch svc-action",
+ "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 461.3645226614817,
+ "y": 297.15177195412775,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "9a54011a.7a533"
+ ]
+ ]
+ },
+ {
+ "id": "9a54011a.7a533",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 697.0788743155344,
+ "y": 295.7231697354998,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "ae9fbdb1.99d76"
+ ]
+ ]
+ },
+ {
+ "id": "ae9fbdb1.99d76",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",
+ "comments": "",
+ "x": 847.0788476126536,
+ "y": 295.723179272243,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "eac281c.1de128",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 471.36457606724343,
+ "y": 381.43748705727717,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "723ab622.079618"
+ ]
+ ]
+ },
+ {
+ "id": "723ab622.079618",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 698.5074495588033,
+ "y": 381.43749795641224,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "af6a2199.40114"
+ ]
+ ]
+ },
+ {
+ "id": "af6a2199.40114",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is a required input\" />\n",
+ "comments": "",
+ "x": 849.9360155378072,
+ "y": 381.4374960490636,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "cb0aa11e.ba442",
+ "type": "switchNode",
+ "name": "switch model-customization-id",
+ "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1089.8290977478027,
+ "y": 528.8662605285645,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "f7d46398.5727f"
+ ]
+ ]
+ },
+ {
+ "id": "f7d46398.5727f",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1294.8290977478027,
+ "y": 528.8662433624268,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "4203f831.9a99a8"
+ ]
+ ]
+ },
+ {
+ "id": "4203f831.9a99a8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+ "comments": "",
+ "x": 1446.2576637268066,
+ "y": 528.8662414550781,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "3314ab19.e03fa4",
+ "type": "switchNode",
+ "name": "switch tenant",
+ "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1035.6861763000488,
+ "y": 570.294771194458,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "8f23daeb.368758"
+ ]
+ ]
+ },
+ {
+ "id": "8f23daeb.368758",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1293.4004936218262,
+ "y": 570.2948055267334,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "d455e65.3d8f318"
+ ]
+ ]
+ },
+ {
+ "id": "d455e65.3d8f318",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.vnf-request-input.tenant is a required input\" />\n",
+ "comments": "",
+ "x": 1444.82905960083,
+ "y": 570.2948036193848,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "b6a4138f.58b28",
+ "type": "comment",
+ "name": "Validation of required fields",
+ "info": "",
+ "comments": "",
+ "x": 621.3645324707031,
+ "y": 252.8660545349121,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "e567acf8.fa2ee",
+ "type": "switchNode",
+ "name": "switch svc-action",
+ "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 455.35266876220703,
+ "y": 570.5447463989258,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "99eee3d5.45a48"
+ ]
+ ]
+ },
+ {
+ "id": "99eee3d5.45a48",
+ "type": "outcome",
+ "name": "assign",
+ "xml": "<outcome value='assign'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 632.4359893798828,
+ "y": 570.1280860900879,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "74f6768d.61c458"
+ ]
+ ]
+ },
+ {
+ "id": "74f6768d.61c458",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 829.1026000976562,
+ "y": 570.1280860900879,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "cb0aa11e.ba442",
+ "3314ab19.e03fa4",
+ "14a1f7ee.4225a8"
+ ]
+ ]
+ },
+ {
+ "id": "75d1af24.b59b7",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 133.7812598092214,
+ "y": 125.41365432739258,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "7a2246ee.79a8f8"
+ ]
+ ]
+ },
+ {
+ "id": "7a2246ee.79a8f8",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 247.06696537562766,
+ "y": 165.65176582336426,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "58cd5caf.4f7f64"
+ ]
+ ]
+ },
+ {
+ "id": "58cd5caf.4f7f64",
+ "type": "method",
+ "name": "method validate-vnf-input",
+ "xml": "<method rpc='validate-vnf-input' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 182.45988682338157,
+ "y": 206.6636505126953,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "76c41400.105bfc"
+ ]
+ ]
+ },
+ {
+ "id": "4fd47656.8c48d8",
+ "type": "comment",
+ "name": "validate-vnf-input",
+ "info": "",
+ "comments": "",
+ "x": 528.1261160714284,
+ "y": 72.99999809265137,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "b96ae981.783b38",
+ "type": "switchNode",
+ "name": "switch service-instance-id",
+ "xml": "<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 484.3884070260183,
+ "y": 425.50001335144043,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "222c65be.19adaa"
+ ]
+ ]
+ },
+ {
+ "id": "222c65be.19adaa",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 696.8169882638113,
+ "y": 425.50000953674316,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "419149d7.f3c9e8"
+ ]
+ ]
+ },
+ {
+ "id": "419149d7.f3c9e8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"service-information.service-instance-id is a required input\" />\n",
+ "comments": "",
+ "x": 848.2455542428152,
+ "y": 425.50000762939453,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "14a1f7ee.4225a8",
+ "type": "switchNode",
+ "name": "switch aic-cloud-region",
+ "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1065.0312576293945,
+ "y": 612.5714282989502,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "34b6bd95.7d9342"
+ ]
+ ]
+ },
+ {
+ "id": "34b6bd95.7d9342",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1291.7455749511719,
+ "y": 612.5714626312256,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "2a60eee3.33bf02"
+ ]
+ ]
+ },
+ {
+ "id": "2a60eee3.33bf02",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-request-input.aic-cloud-region is a required input\" />\n",
+ "comments": "",
+ "x": 1443.1741409301758,
+ "y": 612.571460723877,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "786596f7.351798",
+ "type": "switchNode",
+ "name": "switch model-customization-id",
+ "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1060.5074005126953,
+ "y": 727.7619094848633,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "47670feb.a0d52"
+ ]
+ ]
+ },
+ {
+ "id": "47670feb.a0d52",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1265.5074005126953,
+ "y": 727.7618923187256,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "57c8f1dd.5353b"
+ ]
+ ]
+ },
+ {
+ "id": "57c8f1dd.5353b",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+ "comments": "",
+ "x": 1416.9359664916992,
+ "y": 727.761890411377,
+ "z": "62d88521.de373c",
+ "wires": []
+ },
+ {
+ "id": "cfe766b3.3ac5a8",
+ "type": "outcome",
+ "name": "changeassign",
+ "xml": "<outcome value='changeassign'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 650.4476203918457,
+ "y": 727.690468788147,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "43346cb0.8ff874"
+ ]
+ ]
+ },
+ {
+ "id": "43346cb0.8ff874",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 830.4476089477539,
+ "y": 727.6904354095459,
+ "z": "62d88521.de373c",
+ "wires": [
+ [
+ "786596f7.351798"
+ ]
+ ]
+ },
+ {
+ "id": "75147ce8.6bd644",
+ "type": "comment",
+ "name": "model-customization-uuid validation moved to changeassign DG",
+ "info": "",
+ "comments": "",
+ "x": 710.03125,
+ "y": 693.0000085830688,
+ "z": "62d88521.de373c",
+ "wires": []
+ }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.json
index b077d2de..7476b037 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.json
@@ -1 +1,791 @@
-[{"id":"2fd9471b.69af38","type":"dgstart","name":"DGSTART","outputs":1,"x":158.57142639160156,"y":106.6993715763092,"z":"4c9ab6a.7151748","wires":[["e752038e.d1f5a"]]},{"id":"e752038e.d1f5a","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":272.8571319580078,"y":146.93748307228088,"z":"4c9ab6a.7151748","wires":[["d99c33c9.917fc"]]},{"id":"d99c33c9.917fc","type":"method","name":"method vnf-topology-operation-unassign","xml":"<method rpc='vnf-topology-operation-unassign' mode='sync'>\n","comments":"","outputs":1,"x":255.00005340576172,"y":186.6993715763092,"z":"4c9ab6a.7151748","wires":[["d7bc4779.1eda58"]]},{"id":"6b4e98eb.f45fd8","type":"comment","name":"vnf-topology-operation-unassign","info":"","comments":"","x":552.9162826538086,"y":54.28571534156799,"z":"4c9ab6a.7151748","wires":[]},{"id":"57b1a585.c0996c","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":562.0952377319336,"y":285.5565092563629,"z":"4c9ab6a.7151748","wires":[["95806c13.7cfc4","c0203520.38f9e8"]]},{"id":"95806c13.7cfc4","type":"outcome","name":"DeleteVnfInstance","xml":"<outcome value='DeleteVnfInstance'>\n","comments":"","outputs":1,"x":815.8095321655273,"y":262.69939064979553,"z":"4c9ab6a.7151748","wires":[["510e3baf.6c03d4"]]},{"id":"c0203520.38f9e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":777.809497833252,"y":308.41371846199036,"z":"4c9ab6a.7151748","wires":[["76420941.8dbeb8"]]},{"id":"510e3baf.6c03d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1000.6666603088379,"y":262.69942021369934,"z":"4c9ab6a.7151748","wires":[[]]},{"id":"76420941.8dbeb8","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 'deactivate' then request-action must be 'DeleteVnfInstance'\" />\n","comments":"","x":1017.8095054626465,"y":308.41367650032043,"z":"4c9ab6a.7151748","wires":[]},{"id":"d7bc4779.1eda58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":236.9047622680664,"y":580.0327055454254,"z":"4c9ab6a.7151748","wires":[["57b1a585.c0996c","ef167729.c653b8","242976d0.d2fb7a","f9db2fc6.f607d","e75b1912.e02048","b229bc58.834c5","5f46dba8.c562c4"]]},{"id":"ef167729.c653b8","type":"switchNode","name":"switch vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":548.5714111328125,"y":355.0327351093292,"z":"4c9ab6a.7151748","wires":[["df45106f.9abac"]]},{"id":"df45106f.9abac","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":735.2380905151367,"y":354.3660328388214,"z":"4c9ab6a.7151748","wires":[["3704f169.a2fc9e"]]},{"id":"3704f169.a2fc9e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n","comments":"","x":916.9047164916992,"y":354.3660328388214,"z":"4c9ab6a.7151748","wires":[]},{"id":"f9db2fc6.f607d","type":"for","name":"for each vnf","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":530.2380905151367,"y":403.36605286598206,"z":"4c9ab6a.7151748","wires":[["29131551.89e82a"]]},{"id":"29131551.89e82a","type":"switchNode","name":"switch this vnf-id == input vnf-id","xml":"<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`' >\n","comments":"","outputs":1,"x":785.2381782531738,"y":402.0327208042145,"z":"4c9ab6a.7151748","wires":[["797c5e5.ac056a"]]},{"id":"797c5e5.ac056a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1023.5714645385742,"y":401.0326988697052,"z":"4c9ab6a.7151748","wires":[["68e43d11.eea054"]]},{"id":"68e43d11.eea054","type":"set","name":"set vnf-index","xml":"<set>\n<parameter name='vnf-index' value='`$idx`' />\n","comments":"","x":1191.9046592712402,"y":401.0327208042145,"z":"4c9ab6a.7151748","wires":[]},{"id":"e75b1912.e02048","type":"switchNode","name":"switch vnf-index","xml":"<switch test='`$vnf-index`'>\n","comments":"","outputs":1,"x":541.9047546386719,"y":450.0327227115631,"z":"4c9ab6a.7151748","wires":[["8227e3f6.9aa9a"]]},{"id":"8227e3f6.9aa9a","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":723.5713729858398,"y":449.36605286598206,"z":"4c9ab6a.7151748","wires":[["b4e649ce.eb6988"]]},{"id":"b4e649ce.eb6988","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=\"'Could not find VNF ' + $vnf-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'\" />\n","comments":"","x":890.2380599975586,"y":449.03267884254456,"z":"4c9ab6a.7151748","wires":[]},{"id":"aacab2cf.b24bf","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":1191.698501586914,"y":1084.5562915802002,"z":"4c9ab6a.7151748","wires":[]},{"id":"8a0320db.451c4","type":"for","name":"for each vnf","xml":"<for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":1712.1760787963867,"y":830.112060546875,"z":"4c9ab6a.7151748","wires":[["cefd1cf4.4bf99"]]},{"id":"d25cea27.cb6248","type":"comment","name":"Remove VNF from service data","info":"","comments":"","x":1154.334846496582,"y":788.6837129592896,"z":"4c9ab6a.7151748","wires":[]},{"id":"cefd1cf4.4bf99","type":"set","name":"move vnf to remove one","xml":"<set>\n\t<parameter name=\"$tmpidx\" value=\"`$idx - 1`\"/>\n\t<parameter name=\"service-data.vnfs.vnf[$tmpidx].\" value=\"$service-data.vnfs.vnf[$idx].\" />\n\t\n","comments":"","x":1945.7672119140625,"y":829.1360120773315,"z":"4c9ab6a.7151748","wires":[]},{"id":"7a3c4303.9ec5ec","type":"switchNode","name":"switch vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":1198.4339408874512,"y":831.691689491272,"z":"4c9ab6a.7151748","wires":[["9f19ae27.d107e","b366d422.c1b158"]]},{"id":"9f19ae27.d107e","type":"outcome","name":"1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1375.433982849121,"y":792.3582763671875,"z":"4c9ab6a.7151748","wires":[["68a27479.2c17fc"]]},{"id":"68a27479.2c17fc","type":"set","name":"Remove vnfs","xml":"<set>\n\t<parameter name=\"service-data.vnfs.\" value=\"\"/>\n\n","comments":"","x":1539.1004791259766,"y":792.3583755493164,"z":"4c9ab6a.7151748","wires":[]},{"id":"b366d422.c1b158","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1376.9578742980957,"y":872.834415435791,"z":"4c9ab6a.7151748","wires":[["87575c7b.87768"]]},{"id":"fa8677dd.7dc038","type":"set","name":"set new vnf length","xml":"<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value=\"`$service-data.vnfs.vnf_length - 1`\"/>\n\n\t\n","comments":"","x":1731.730167388916,"y":920.6916341781616,"z":"4c9ab6a.7151748","wires":[]},{"id":"452d1003.58e5f","type":"set","name":"Remove the last vnf in the list","xml":"<set>\n\t<parameter name=\"service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1].\" value=\"\"/>\n\n","comments":"","x":1767.433822631836,"y":875.8026552200317,"z":"4c9ab6a.7151748","wires":[]},{"id":"87575c7b.87768","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1542.7672157287598,"y":876.3581962585449,"z":"4c9ab6a.7151748","wires":[["8a0320db.451c4","452d1003.58e5f","fa8677dd.7dc038"]]},{"id":"75c7b96f.9b29d8","type":"switchNode","name":"switch current vnf-level-oper-status == Created","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status == 'Created'`\">\n","comments":"","outputs":1,"x":641.2380676269531,"y":495.69939255714417,"z":"4c9ab6a.7151748","wires":[["b51a2a52.cee1c8"]]},{"id":"b51a2a52.cee1c8","type":"outcomeFalse","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":945.90478515625,"y":495.3660318851471,"z":"4c9ab6a.7151748","wires":[["4197f006.511ff"]]},{"id":"4197f006.511ff","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=\"Cannot delete a VNF in a Created state\" />\n","comments":"","x":1104.2380599975586,"y":494.69935631752014,"z":"4c9ab6a.7151748","wires":[]},{"id":"242976d0.d2fb7a","type":"switchNode","name":"switch current vf-module_length","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`\">\n","comments":"","outputs":1,"x":591.5714111328125,"y":581.6993582248688,"z":"4c9ab6a.7151748","wires":[["1d4bad90.637232","d3006cf2.7221a","66c6314f.cac37"]]},{"id":"1d4bad90.637232","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":820.2380523681641,"y":538.3659994602203,"z":"4c9ab6a.7151748","wires":[["9c08ffe4.4e1f6"]]},{"id":"d3006cf2.7221a","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":818.8094635009766,"y":579.7946569919586,"z":"4c9ab6a.7151748","wires":[["9c08ffe4.4e1f6"]]},{"id":"9c08ffe4.4e1f6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":967.3809776306152,"y":559.7946579456329,"z":"4c9ab6a.7151748","wires":[[]]},{"id":"66c6314f.cac37","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":818.809513092041,"y":621.2232449054718,"z":"4c9ab6a.7151748","wires":[["e0770e38.daef2"]]},{"id":"e0770e38.daef2","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=\"Cannot delete the VNF because there are VFs defined\" />\n","comments":"","x":985.9524078369141,"y":620.7946331501007,"z":"4c9ab6a.7151748","wires":[]},{"id":"ec129d0c.3da5d","type":"call","name":"call GENERIC-RESOURCE-API:naming-policy-generate-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n","comments":"","outputs":1,"x":1339.8411331176758,"y":1028.3333406448364,"z":"4c9ab6a.7151748","wires":[[]]},{"id":"945a4b25.df5d68","type":"set","name":"set variables for deleting name","xml":"<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n","comments":"","x":1241.2697525024414,"y":981.190411567688,"z":"4c9ab6a.7151748","wires":[]},{"id":"8c9c9812.e2add8","type":"comment","name":"check removed with US622450","info":"","comments":"","x":1311.4284362792969,"y":494.28574204444885,"z":"4c9ab6a.7151748","wires":[]},{"id":"fb7893eb.5d51b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":948.8571472167969,"y":914.2857551574707,"z":"4c9ab6a.7151748","wires":[["7a3c4303.9ec5ec","945a4b25.df5d68","ec129d0c.3da5d","aacab2cf.b24bf"]]},{"id":"b229bc58.834c5","type":"call","name":"call self-serve-vnf-forking-logic","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n","comments":"","outputs":1,"x":574.4286956787109,"y":724.285665512085,"z":"4c9ab6a.7151748","wires":[[]]},{"id":"5f46dba8.c562c4","type":"switchNode","name":"switch ss.self-serve-flag","xml":"<switch test=\"`$ss.self-serve-flag`\">\n","comments":"","outputs":1,"x":555.7143096923828,"y":914.14284324646,"z":"4c9ab6a.7151748","wires":[["ac0b2fd9.2b5cb","afe49b4f.f40a98"]]},{"id":"ac0b2fd9.2b5cb","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":771.7143096923828,"y":914.5714282989502,"z":"4c9ab6a.7151748","wires":[["fb7893eb.5d51b"]]},{"id":"8488e183.5299c","type":"call","name":"call self-serve-vnf-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >\n","comments":"","outputs":1,"x":987.4285736083984,"y":1229.9999895095825,"z":"4c9ab6a.7151748","wires":[["94ec55d8.a11158","fac6e4ae.85d5b8"]]},{"id":"94ec55d8.a11158","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1195.1785583496094,"y":1230.2499780654907,"z":"4c9ab6a.7151748","wires":[["f8e2b999.669308"]]},{"id":"f8e2b999.669308","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error while unassigning self-serve resources with error: '+ $error-message`\" />\n","comments":"","x":1360.749984741211,"y":1229.8928728103638,"z":"4c9ab6a.7151748","wires":[]},{"id":"fac6e4ae.85d5b8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1199.785732269287,"y":1280.8055124282837,"z":"4c9ab6a.7151748","wires":[["941cfed4.1684d"]]},{"id":"941cfed4.1684d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":1368.3571472167969,"y":1280.3769540786743,"z":"4c9ab6a.7151748","wires":[]},{"id":"afe49b4f.f40a98","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":772.9999885559082,"y":1230.4285688400269,"z":"4c9ab6a.7151748","wires":[["8488e183.5299c"]]}] \ No newline at end of file
+[
+ {
+ "id": "8760ee4d.bacba",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 121.25,
+ "y": 101.16365623474121,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "a9ae8cec.2004d"
+ ]
+ ]
+ },
+ {
+ "id": "a9ae8cec.2004d",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+ "outputs": 1,
+ "x": 235.53570556640625,
+ "y": 141.4017677307129,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "3dac1de6.47703a"
+ ]
+ ]
+ },
+ {
+ "id": "3dac1de6.47703a",
+ "type": "method",
+ "name": "method vnf-topology-operation-unassign",
+ "xml": "<method rpc='vnf-topology-operation-unassign' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 217.67862701416016,
+ "y": 181.1636562347412,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "8aa731f2.f78648"
+ ]
+ ]
+ },
+ {
+ "id": "287c593d.cb7aa6",
+ "type": "comment",
+ "name": "vnf-topology-operation-unassign",
+ "info": "",
+ "comments": "",
+ "x": 515.594856262207,
+ "y": 48.75,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "da8ed21c.290538",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 524.773811340332,
+ "y": 280.0207939147949,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "50a65b42.041c0c",
+ "85a5b069.51ff2"
+ ]
+ ]
+ },
+ {
+ "id": "50a65b42.041c0c",
+ "type": "outcome",
+ "name": "DeleteVnfInstance",
+ "xml": "<outcome value='DeleteVnfInstance'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 778.4881057739258,
+ "y": 257.16367530822754,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "93688742.285b9"
+ ]
+ ]
+ },
+ {
+ "id": "85a5b069.51ff2",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 740.4880714416504,
+ "y": 302.87800312042236,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "bfa2ad9d.0bdb1"
+ ]
+ ]
+ },
+ {
+ "id": "93688742.285b9",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 963.3452339172363,
+ "y": 257.16370487213135,
+ "z": "b679ce73.4725c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "bfa2ad9d.0bdb1",
+ "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 'deactivate' then request-action must be 'DeleteVnfInstance'\" />\n",
+ "comments": "",
+ "x": 980.4880790710449,
+ "y": 302.87796115875244,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "8aa731f2.f78648",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 199.58333587646484,
+ "y": 574.4969902038574,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "da8ed21c.290538",
+ "9b073e31.2b9548",
+ "d811a825.e4506",
+ "230a1984.7eb2de",
+ "1570abd0.28319c",
+ "91a3386a.faef3",
+ "12606f3f.12bf41",
+ "a2ededb3.20eb68"
+ ]
+ ]
+ },
+ {
+ "id": "9b073e31.2b9548",
+ "type": "switchNode",
+ "name": "switch vnf_length",
+ "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 511.24998474121094,
+ "y": 349.49701976776123,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "835264a.de01c98"
+ ]
+ ]
+ },
+ {
+ "id": "835264a.de01c98",
+ "type": "other",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 697.9166641235352,
+ "y": 348.8303174972534,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "43688a60.e15ccc"
+ ]
+ ]
+ },
+ {
+ "id": "43688a60.e15ccc",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",
+ "comments": "",
+ "x": 879.5832901000977,
+ "y": 348.8303174972534,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "230a1984.7eb2de",
+ "type": "for",
+ "name": "for each vnf",
+ "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 492.91666412353516,
+ "y": 397.83033752441406,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "11f49056.b848d"
+ ]
+ ]
+ },
+ {
+ "id": "11f49056.b848d",
+ "type": "switchNode",
+ "name": "switch this vnf-id == input vnf-id",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 747.9167518615723,
+ "y": 396.4970054626465,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "2be53867.ef76e8"
+ ]
+ ]
+ },
+ {
+ "id": "2be53867.ef76e8",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 986.2500381469727,
+ "y": 395.4969835281372,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "e4f701ed.1bfb3"
+ ]
+ ]
+ },
+ {
+ "id": "e4f701ed.1bfb3",
+ "type": "set",
+ "name": "set vnf-index",
+ "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
+ "comments": "",
+ "x": 1154.5832328796387,
+ "y": 395.4970054626465,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "1570abd0.28319c",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 504.5833282470703,
+ "y": 444.4970073699951,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "29a81e7f.f25dfa"
+ ]
+ ]
+ },
+ {
+ "id": "29a81e7f.f25dfa",
+ "type": "other",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 686.2499465942383,
+ "y": 443.83033752441406,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "f6710847.bb5d"
+ ]
+ ]
+ },
+ {
+ "id": "f6710847.bb5d",
+ "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=\"'Could not find VNF ' + $vnf-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'\" />\n",
+ "comments": "",
+ "x": 852.916633605957,
+ "y": 443.49696350097656,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "8ffa54f2.b78158",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+ "comments": "",
+ "x": 1154.3770751953125,
+ "y": 1079.0205762386322,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "54c41547.567a8c",
+ "type": "for",
+ "name": "for each vnf",
+ "xml": "<for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1674.8546524047852,
+ "y": 824.576345205307,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "c8a587bb.5748d8"
+ ]
+ ]
+ },
+ {
+ "id": "3f28287f.120ca",
+ "type": "comment",
+ "name": "Remove VNF from service data",
+ "info": "",
+ "comments": "",
+ "x": 1117.0134201049805,
+ "y": 783.1479976177216,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "c8a587bb.5748d8",
+ "type": "set",
+ "name": "move vnf to remove one",
+ "xml": "<set>\n\t<parameter name=\"$tmpidx\" value=\"`$idx - 1`\"/>\n\t<parameter name=\"service-data.vnfs.vnf[$tmpidx].\" value=\"$service-data.vnfs.vnf[$idx].\" />\n\t\n",
+ "comments": "",
+ "x": 1908.445785522461,
+ "y": 823.6002967357635,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "c879ce9c.9d72a",
+ "type": "switchNode",
+ "name": "switch vnf_length",
+ "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1161.1125144958496,
+ "y": 826.155974149704,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "9f8acc10.c48f28",
+ "901a2ab8.48409"
+ ]
+ ]
+ },
+ {
+ "id": "9f8acc10.c48f28",
+ "type": "outcome",
+ "name": "1",
+ "xml": "<outcome value='1'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1338.1125564575195,
+ "y": 786.8225610256195,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "4a1274f6.357d5c"
+ ]
+ ]
+ },
+ {
+ "id": "4a1274f6.357d5c",
+ "type": "set",
+ "name": "Remove vnfs",
+ "xml": "<set>\n\t<parameter name=\"service-data.vnfs.\" value=\"\"/>\n\n",
+ "comments": "",
+ "x": 1501.779052734375,
+ "y": 786.8226602077484,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "901a2ab8.48409",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1339.6364479064941,
+ "y": 867.298700094223,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "209c0646.4c650a"
+ ]
+ ]
+ },
+ {
+ "id": "cd8767d7.87479",
+ "type": "set",
+ "name": "set new vnf length",
+ "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value=\"`$service-data.vnfs.vnf_length - 1`\"/>\n\n\t\n",
+ "comments": "",
+ "x": 1694.4087409973145,
+ "y": 915.1559188365936,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "e2f2c18b.32612",
+ "type": "set",
+ "name": "Remove the last vnf in the list",
+ "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1].\" value=\"\"/>\n\n",
+ "comments": "",
+ "x": 1730.1123962402344,
+ "y": 870.2669398784637,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "209c0646.4c650a",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1505.4457893371582,
+ "y": 870.8224809169769,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "54c41547.567a8c",
+ "e2f2c18b.32612",
+ "cd8767d7.87479"
+ ]
+ ]
+ },
+ {
+ "id": "793a50a1.0d6658",
+ "type": "switchNode",
+ "name": "switch current vnf-level-oper-status == Created",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status == 'Created'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 603.9166412353516,
+ "y": 490.1636772155762,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "33d47343.98cc6c"
+ ]
+ ]
+ },
+ {
+ "id": "33d47343.98cc6c",
+ "type": "outcomeFalse",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 908.5833587646484,
+ "y": 489.8303165435791,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "6c7a81eb.1c4e68"
+ ]
+ ]
+ },
+ {
+ "id": "6c7a81eb.1c4e68",
+ "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=\"Cannot delete a VNF in a Created state\" />\n",
+ "comments": "",
+ "x": 1066.916633605957,
+ "y": 489.16364097595215,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "d811a825.e4506",
+ "type": "switchNode",
+ "name": "switch current vf-module_length",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 554.2499847412109,
+ "y": 576.1636428833008,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "973bc91a.8f52e8",
+ "d0ced9dc.3f8238",
+ "2b82476d.deb568"
+ ]
+ ]
+ },
+ {
+ "id": "973bc91a.8f52e8",
+ "type": "outcome",
+ "name": "0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 782.9166259765625,
+ "y": 532.8302841186523,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "cb334531.9a038"
+ ]
+ ]
+ },
+ {
+ "id": "d0ced9dc.3f8238",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>",
+ "comments": "",
+ "outputs": 1,
+ "x": 781.488037109375,
+ "y": 574.2589416503906,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "cb334531.9a038"
+ ]
+ ]
+ },
+ {
+ "id": "cb334531.9a038",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 930.0595512390137,
+ "y": 554.2589426040649,
+ "z": "b679ce73.4725c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "2b82476d.deb568",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 781.4880867004395,
+ "y": 615.6875295639038,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "7cec3149.76d4d"
+ ]
+ ]
+ },
+ {
+ "id": "7cec3149.76d4d",
+ "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=\"Cannot delete the VNF because there are VFs defined\" />\n",
+ "comments": "",
+ "x": 948.6309814453125,
+ "y": 615.2589178085327,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "88d07f29.c5dc6",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1302.5197067260742,
+ "y": 1022.7976253032684,
+ "z": "b679ce73.4725c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "b74c2ae7.ae87a",
+ "type": "set",
+ "name": "set variables for deleting name",
+ "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
+ "comments": "",
+ "x": 1203.9483261108398,
+ "y": 975.65469622612,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "8a7b5d97.e8b09",
+ "type": "comment",
+ "name": "check removed with US622450",
+ "info": "",
+ "comments": "",
+ "x": 1274.1070098876953,
+ "y": 488.75002670288086,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "484f70af.519a08",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 911.5357208251953,
+ "y": 908.7500398159027,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "c879ce9c.9d72a",
+ "b74c2ae7.ae87a",
+ "88d07f29.c5dc6",
+ "8ffa54f2.b78158"
+ ]
+ ]
+ },
+ {
+ "id": "91a3386a.faef3",
+ "type": "call",
+ "name": "call self-serve-vnf-forking-logic",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 548.3572998046875,
+ "y": 722.4999084472656,
+ "z": "b679ce73.4725c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "12606f3f.12bf41",
+ "type": "switchNode",
+ "name": "switch ss.self-serve-flag",
+ "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 518.3928833007812,
+ "y": 908.607127904892,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "69816793.5f1658",
+ "77171191.032938"
+ ]
+ ]
+ },
+ {
+ "id": "69816793.5f1658",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 734.3928833007812,
+ "y": 909.0357129573822,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "484f70af.519a08"
+ ]
+ ]
+ },
+ {
+ "id": "f6d24b45.0d4258",
+ "type": "call",
+ "name": "call self-serve-vnf-unassign",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 950.1071472167969,
+ "y": 1224.4642741680145,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "b5167dbe.7d8bf8",
+ "a7770dc.3f6cef"
+ ]
+ ]
+ },
+ {
+ "id": "b5167dbe.7d8bf8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1157.8571319580078,
+ "y": 1224.7142627239227,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "9c54474e.6dc798"
+ ]
+ ]
+ },
+ {
+ "id": "9c54474e.6dc798",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error while unassigning self-serve resources with error: '+ $error-message`\" />\n",
+ "comments": "",
+ "x": 1323.4285583496094,
+ "y": 1224.3571574687958,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "a7770dc.3f6cef",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1162.4643058776855,
+ "y": 1275.2697970867157,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "f989b85.ea14548"
+ ]
+ ]
+ },
+ {
+ "id": "f989b85.ea14548",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+ "comments": "",
+ "x": 1331.0357208251953,
+ "y": 1274.8412387371063,
+ "z": "b679ce73.4725c",
+ "wires": []
+ },
+ {
+ "id": "77171191.032938",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 735.6785621643066,
+ "y": 1224.8928534984589,
+ "z": "b679ce73.4725c",
+ "wires": [
+ [
+ "f6d24b45.0d4258"
+ ]
+ ]
+ },
+ {
+ "id": "a2ededb3.20eb68",
+ "type": "get-resource",
+ "name": "get VF_MODEL.sdnc_model_name",
+ "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODEL WHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n pfx='db.vf-model'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 563.75,
+ "y": 655,
+ "z": "b679ce73.4725c",
+ "wires": [
+ []
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
index 3d9d0bb9..85522cf6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
@@ -44,35 +44,35 @@
</set>
<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
<outcome value='true'>
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
- <outcome value='FAILED'>
- <block>
- <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`">
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
- <outcome value='service-instance-id'>
- <set>
- <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='vnf-id'>
- <set>
- <parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='prefix-id'>
- <set>
- <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='external_key'>
- <set>
- <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test='`$ss.capability-action`'>
- <outcome value='assign'>
+ <block>
+ <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`">
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+ <outcome value='service-instance-id'>
+ <set>
+ <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='vnf-id'>
+ <set>
+ <parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='prefix-id'>
+ <set>
+ <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='external_key'>
+ <set>
+ <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$ss.capability-action`'>
+ <outcome value='assign'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+ <outcome value='FAILED'>
<block atomic='true'>
<execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
<parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
@@ -111,85 +111,7 @@
</execute>
</block>
</outcome>
- <outcome value='unassign'>
- <block atomic="true">
- <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
- key='SELECT * from IPAM_IP_ASSIGNEMENT
- WHERE external_key = $tmp.ss.external-key
- AND service_instance_id = $tmp.ss.service-instance-id' >
- <outcome value='not-found'>
- <block></block>
- </outcome>
- <outcome value='success'>
- <block atomic="true">
- <set>
- <parameter name='tmp.status' value="PENDING_DELETE" />
- </set>
- <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
- key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status
- WHERE external_key = $tmp.ss.external-key
- AND service_instance_id = $tmp.ss.service-instance-id" >
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
- </return>
- </outcome>
- </update>
- <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
- <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
- <parameter name="external_key" value="`$tmp.ss.external-key`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
- </return>
- </outcome>
- <outcome value='success'>
- <set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status'
- value='DELETED' />
- </set>
- </outcome>
- </execute>
- </block>
- </outcome>
- </get-resource>
- </block>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value='PENDING'>
- <block>
- <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`">
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
- <outcome value='service-instance-id'>
- <set>
- <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='vnf-id'>
- <set>
- <parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='prefix-id'>
- <set>
- <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='external_key'>
- <set>
- <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test='`$ss.capability-action`'>
- <outcome value='assign'>
+ <outcome value='PENDING'>
<block atomic='true'>
<execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
<parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
@@ -228,7 +150,11 @@
</execute>
</block>
</outcome>
- <outcome value='unassign'>
+ </switch>
+ </outcome>
+ <outcome value='unassign'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+ <outcome value='SUCCESS'>
<block atomic="true">
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT * from IPAM_IP_ASSIGNEMENT
@@ -277,9 +203,9 @@
</block>
</outcome>
</switch>
- </block>
- </outcome>
- </switch>
+ </outcome>
+ </switch>
+ </block>
</outcome>
</switch>
</for>
@@ -305,40 +231,40 @@
</set>
<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
<outcome value='true'>
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>
- <outcome value='FAILED'>
- <block>
- <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
- <outcome value='service-instance-id'>
- <set>
- <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='vf-module-id'>
- <set>
- <parameter name='tmp.ss.vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='prefix-id'>
- <set>
- <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='ip-address-id'>
- <set>
- <parameter name='tmp.ss.ip-address-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='external_key'>
- <set>
- <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test='`$ss.capability-action`'>
- <outcome value='assign'>
+ <block>
+ <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+ <outcome value='service-instance-id'>
+ <set>
+ <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='vf-module-id'>
+ <set>
+ <parameter name='tmp.ss.vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='prefix-id'>
+ <set>
+ <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='ip-address-id'>
+ <set>
+ <parameter name='tmp.ss.ip-address-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ <outcome value='external_key'>
+ <set>
+ <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$ss.capability-action`'>
+ <outcome value='assign'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>
+ <outcome value='FAILED'>
<block atomic='true'>
<execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
<parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
@@ -377,90 +303,7 @@
</execute>
</block>
</outcome>
- <outcome value='unassign'>
- <block atomic="true">
- <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
- key='SELECT * from IPAM_IP_ASSIGNEMENT
- WHERE external_key = $tmp.ss.external-key
- AND service_instance_id = $tmp.ss.service-instance-id' >
- <outcome value='not-found'>
- <block></block>
- </outcome>
- <outcome value='success'>
- <block atomic="true">
- <set>
- <parameter name='tmp.status' value="PENDING_DELETE" />
- </set>
- <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
- key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status
- WHERE external_key = $tmp.ss.external-key
- AND service_instance_id = $tmp.ss.service-instance-id" >
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
- </return>
- </outcome>
- </update>
- <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
- <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
- <parameter name="external_key" value="`$tmp.ss.external-key`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
- </return>
- </outcome>
- <outcome value='success'>
- <set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status'
- value='DELETED' />
- </set>
- </outcome>
- </execute>
- </block>
- </outcome>
- </get-resource>
- </block>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value='PENDING'>
- <block>
- <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`">
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
- <outcome value='service-instance-id'>
- <set>
- <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='vf-module-id'>
- <set>
- <parameter name='tmp.ss.vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='prefix-id'>
- <set>
- <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='ip-address-id'>
- <set>
- <parameter name='tmp.ss.ip-address-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- <outcome value='external_key'>
- <set>
- <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test='`$ss.capability-action`'>
- <outcome value='assign'>
+ <outcome value='PENDING'>
<block atomic='true'>
<execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
<parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
@@ -499,7 +342,11 @@
</execute>
</block>
</outcome>
- <outcome value='unassign'>
+ </switch>
+ </outcome>
+ <outcome value='unassign'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>
+ <outcome value='SUCCESS'>
<block atomic="true">
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT * from IPAM_IP_ASSIGNEMENT
@@ -548,9 +395,9 @@
</block>
</outcome>
</switch>
- </block>
- </outcome>
- </switch>
+ </outcome>
+ </switch>
+ </block>
</outcome>
</switch>
</for>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
index bbec5b34..1c5e0770 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
@@ -50,7 +50,7 @@
<outcome value='success'>
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT vf_module_label from VF_MODULE_MODEL
- WHERE vf_customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid
+ WHERE vf_customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid
AND vf_module_label is not null '
pfx='db.vf-module-label'>
<outcome value='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
index bb60391c..6de5257f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
@@ -39,15 +39,6 @@
</return>
</outcome>
</switch>
- <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="vnf-information.vnf-id is a required input" />
- </return>
- </outcome>
- </switch>
<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
<outcome value='assign'>
<block atomic="true">
@@ -83,4 +74,4 @@
</switch>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
index 1b3ff069..725e64f4 100755..100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
@@ -57,6 +57,9 @@
</return>
</outcome>
</switch>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from VF_MODEL WHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'
+ pfx='db.vf-model'></get-resource>
<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>
<switch test="`$ss.self-serve-flag`">
<outcome value='false'>
diff --git a/platform-logic/lcm/src/main/json/LCM_config-scale-out.json b/platform-logic/lcm/src/main/json/LCM_config-scale-out.json
index 9d37cf13..870997b1 100755
--- a/platform-logic/lcm/src/main/json/LCM_config-scale-out.json
+++ b/platform-logic/lcm/src/main/json/LCM_config-scale-out.json
@@ -302,7 +302,7 @@
"id": "dfe17100.934dc",
"type": "execute",
"name": "execute RestConfAPI",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`\" />\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`\" />\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
"comments": "",
"outputs": 1,
"x": 302,
@@ -335,7 +335,7 @@
"id": "874cba8d.9da118",
"type": "record",
"name": "record",
- "xml": "<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'> \n\t<parameter name='logger' value='message-log'/> \n\t<parameter name='field1' value='`$payloadJson.request-parameters.vnf-host-ip-address`'/>\n\t<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>",
+ "xml": "<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'> \n\t<parameter name='logger' value='message-log'/> \n\t<parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>\n\t<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>",
"comments": "",
"outputs": 1,
"x": 678,
diff --git a/platform-logic/lcm/src/main/json/LCM_health-check.json b/platform-logic/lcm/src/main/json/LCM_health-check.json
index 075da772..60e65b68 100755
--- a/platform-logic/lcm/src/main/json/LCM_health-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_health-check.json
@@ -96,7 +96,7 @@
"id": "a0daec6.f75351",
"type": "execute",
"name": "execute RestConfAPI",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
"comments": "",
"outputs": 1,
"x": 465,
@@ -129,7 +129,7 @@
"id": "289cee6b.89c1d2",
"type": "record",
"name": "record",
- "xml": "<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'> \n\t<parameter name='logger' value='message-log'/> \n\t<parameter name='field1' value='`$payloadJson.request-parameters.vnf-host-ip-address`'/>",
+ "xml": "<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'> \n\t<parameter name='logger' value='message-log'/> \n\t<parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>",
"comments": "",
"outputs": 1,
"x": 845,
diff --git a/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml b/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml
index 6f5163fa..ce836e21 100755
--- a/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml
@@ -18,14 +18,14 @@
<outcome value='success'>
<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>
<parameter name='logger' value='message-log'/>
- <parameter name='field1' value='`$payloadJson.request-parameters.vnf-host-ip-address`'/>
+ <parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>
<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>
</record>
</outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`" />
- <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`" />
+ <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`" />
<parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />
<parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />
<parameter name='format' value='json' />
diff --git a/platform-logic/lcm/src/main/xml/LCM_health-check.xml b/platform-logic/lcm/src/main/xml/LCM_health-check.xml
index 90b1cdea..d706aac6 100755
--- a/platform-logic/lcm/src/main/xml/LCM_health-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_health-check.xml
@@ -18,12 +18,12 @@
<outcome value='success'>
<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>
<parameter name='logger' value='message-log'/>
- <parameter name='field1' value='`$payloadJson.request-parameters.vnf-host-ip-address`'/>
+ <parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>
</record>
</outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`" />
+ <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`" />
<parameter name='restapiUser' value='`$prop.lcm.restconf.user`' />
<parameter name='restapiPassword' value='`$prop.lcm.restconf.password`' />
<parameter name='format' value='json' />