summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2017-11-13 19:32:20 +0530
committershashikanth.vh <shashikanth.vh@huawei.com>2017-11-13 19:32:29 +0530
commit65870ccb13d9e0f9d9f78604dea45abc014f56be (patch)
treec78b27ae2eabe42f010841bb1bca248ab659ef81 /platform-logic/generic-resource-api
parent923760e351b66e980cef9547cd8cb2934265e0cc (diff)
Fix Overlay DG testing issue
After executing DeActivateDCINetworkInstance, DeleteNetworkInstance node is executed as atomic block is not present, added new block, also fixed required parameter issue where value is not passed. https://jira.onap.org/browse/SDNC-191 Issue-Id: SDNC-191 Change-Id: Ia3009882fd7c2320a333ba04f726d57079f2d509 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 6b6ccfc2d1702eaae39a7e4877e51d274e17b07f
Diffstat (limited to 'platform-logic/generic-resource-api')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json1159
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml2
-rwxr-xr-xplatform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml4
4 files changed, 593 insertions, 574 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
index e2ffbf73..e649dd76 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -1089,7 +1089,7 @@
"id": "1fbe8bfb.465ce4",
"type": "execute",
"name": "execute requiredParameters",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"network-topology-operation-input.network-information.network-id\" value=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
"comments": "",
"outputs": 1,
"x": 1378.714256286621,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
index bab171ae..44b1a41b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
@@ -1,20 +1,20 @@
[
{
- "id": "1b413dc8.b9ae22",
+ "id": "5f3f5b7a.41ac74",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 173.03125,
- "y": 147.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 134.03125,
+ "y": 59.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "b9c51506.cb42b8"
+ "f0f3a318.27bb3"
]
]
},
{
- "id": "b9c51506.cb42b8",
+ "id": "f0f3a318.27bb3",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
"module": "GENERIC-RESOURCE-API",
@@ -22,1687 +22,1704 @@
"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='1.2.0-SNAPSHOT'>",
"outputs": 1,
- "x": 245.31695556640625,
- "y": 200.23811149597168,
- "z": "ea83c234.74a66",
+ "x": 206.31695556640625,
+ "y": 112.23811149597168,
+ "z": "8893d0be.32531",
"wires": [
[
- "26567304.810b8c"
+ "f248e777.889178"
]
]
},
{
- "id": "26567304.810b8c",
+ "id": "f248e777.889178",
"type": "method",
"name": "validate-network-input",
"xml": "<method rpc='validate-network-input' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 245.45987701416016,
- "y": 261.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 206.45987701416016,
+ "y": 173.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "c056e8e0.d5aa98"
+ "18b797ed.89fef8"
]
]
},
{
- "id": "c056e8e0.d5aa98",
+ "id": "18b797ed.89fef8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 258.7812957763672,
- "y": 544.4434928894043,
- "z": "ea83c234.74a66",
+ "x": 219.7812957763672,
+ "y": 456.4434928894043,
+ "z": "8893d0be.32531",
"wires": [
[
- "f7738247.2ad73",
- "4183fe1d.93134",
- "6e7ed959.ee8ae8",
- "294ce137.4036fe",
- "32c347e7.e10498",
- "40653e81.a79c4"
+ "5cd1db9.aa83c24",
+ "8d16602e.7c349",
+ "768a7c7d.821fd4",
+ "73298f6d.494ec",
+ "d214794.53eb788",
+ "f3d5b1ea.9645e"
]
]
},
{
- "id": "f7738247.2ad73",
+ "id": "5cd1db9.aa83c24",
"type": "switchNode",
"name": "switch svc-request-id",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 575.1741104125977,
- "y": 270.4285888671875,
- "z": "ea83c234.74a66",
+ "x": 536.1741104125977,
+ "y": 182.4285888671875,
+ "z": "8893d0be.32531",
"wires": [
[
- "62ae03a5.3e50bc"
+ "ab4d4682.0682b8"
]
]
},
{
- "id": "62ae03a5.3e50bc",
+ "id": "ab4d4682.0682b8",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 800.8884146554128,
- "y": 270.4285913194926,
- "z": "ea83c234.74a66",
+ "x": 761.8884146554128,
+ "y": 182.42859131949263,
+ "z": "8893d0be.32531",
"wires": [
[
- "35b6a58f.f29d5a"
+ "11d5bd20.05ddf3"
]
]
},
{
- "id": "35b6a58f.f29d5a",
+ "id": "11d5bd20.05ddf3",
"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": 952.3169806344167,
- "y": 270.428589412144,
- "z": "ea83c234.74a66",
+ "x": 913.3169806344167,
+ "y": 182.428589412144,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "4183fe1d.93134",
+ "id": "8d16602e.7c349",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 563.7454833984375,
- "y": 229.00001907348633,
- "z": "ea83c234.74a66",
+ "x": 524.7454833984375,
+ "y": 141.00001907348633,
+ "z": "8893d0be.32531",
"wires": [
[
- "5e116676.70e288"
+ "4b6601a6.daaba"
]
]
},
{
- "id": "5e116676.70e288",
+ "id": "4b6601a6.daaba",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 799.4598350524902,
- "y": 227.5714168548584,
- "z": "ea83c234.74a66",
+ "x": 760.4598350524902,
+ "y": 139.5714168548584,
+ "z": "8893d0be.32531",
"wires": [
[
- "21d9a530.c1c2ca"
+ "887d1db4.9d597"
]
]
},
{
- "id": "21d9a530.c1c2ca",
+ "id": "887d1db4.9d597",
"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": 949.4598083496094,
- "y": 227.57142639160156,
- "z": "ea83c234.74a66",
+ "x": 910.4598083496094,
+ "y": 139.57142639160156,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "6e7ed959.ee8ae8",
+ "id": "768a7c7d.821fd4",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 573.7455215454102,
- "y": 313.2857360839844,
- "z": "ea83c234.74a66",
+ "x": 534.7455215454102,
+ "y": 225.28573608398438,
+ "z": "8893d0be.32531",
"wires": [
[
- "fd83a78d.66a948"
+ "cae90e43.102ff"
]
]
},
{
- "id": "fd83a78d.66a948",
+ "id": "cae90e43.102ff",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 800.8884102957591,
- "y": 313.28574507577105,
- "z": "ea83c234.74a66",
+ "x": 761.8884102957591,
+ "y": 225.28574507577105,
+ "z": "8893d0be.32531",
"wires": [
[
- "886e4c02.7a3e6"
+ "4e414a1c.e00d24"
]
]
},
{
- "id": "886e4c02.7a3e6",
+ "id": "4e414a1c.e00d24",
"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": 952.316976274763,
- "y": 313.2857431684224,
- "z": "ea83c234.74a66",
+ "x": 913.316976274763,
+ "y": 225.2857431684224,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "294ce137.4036fe",
+ "id": "73298f6d.494ec",
"type": "switchNode",
"name": "switch service-instance-id",
"xml": "<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 582.888427734375,
- "y": 355.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 535.8884429931641,
+ "y": 282.00001335144043,
+ "z": "8893d0be.32531",
"wires": [
[
- "2378998c.934706"
+ "df674f5c.d1532"
]
]
},
{
- "id": "2378998c.934706",
+ "id": "df674f5c.d1532",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 799.3170166015625,
- "y": 356.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 760.3170166015625,
+ "y": 268.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "4f908320.d4841c"
+ "3065439b.14d65c"
]
]
},
{
- "id": "4f908320.d4841c",
+ "id": "3065439b.14d65c",
"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": 957.7455444335938,
- "y": 355.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 918.7455444335938,
+ "y": 267.99999809265137,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "7fe681cf.07fdd",
+ "id": "f4d14344.0e5f4",
"type": "comment",
"name": "validate-network-input - CHANGELOG",
"info": "12/8: Initial release 1.0.0",
"comments": "",
- "x": 458.03125,
- "y": 111.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 419.03125,
+ "y": 23.999998092651367,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "32c347e7.e10498",
+ "id": "d214794.53eb788",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 560.03125,
- "y": 442.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 493.03126525878906,
+ "y": 456.00001525878906,
+ "z": "8893d0be.32531",
"wires": [
[
- "fc7d6a84.f93168",
- "7959dc9f.1bdd34",
- "94f36a2f.0904d8",
- "d8141396.7d6f"
+ "54861d88.081944",
+ "2eb0e84d.0d9948",
+ "8ffdd9e.5892828",
+ "8b85a1e9.e5cbc"
]
]
},
{
- "id": "fc7d6a84.f93168",
+ "id": "54861d88.081944",
"type": "other",
"name": "assign",
"xml": "<outcome value='assign'>",
"comments": "",
"outputs": 1,
- "x": 792.74560546875,
- "y": 448.57140922546387,
- "z": "ea83c234.74a66",
+ "x": 753.74560546875,
+ "y": 360.57140922546387,
+ "z": "8893d0be.32531",
"wires": [
[
- "5fad1b65.6cf5f4"
+ "a0ba5094.34089"
]
]
},
{
- "id": "7959dc9f.1bdd34",
+ "id": "2eb0e84d.0d9948",
"type": "other",
"name": "activate",
"xml": "<outcome value='activate'>",
"comments": "",
"outputs": 1,
- "x": 788.0313568115234,
- "y": 578.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 749.0313568115234,
+ "y": 490.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "ad4e82b5.19db9"
+ "5513e34e.18308c"
]
]
},
{
- "id": "94f36a2f.0904d8",
+ "id": "8ffdd9e.5892828",
"type": "other",
"name": "deactivate",
"xml": "<outcome value='deactivate'>",
"comments": "",
"outputs": 1,
- "x": 791.0313186645508,
- "y": 745.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 752.0313186645508,
+ "y": 657.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "c0070c2.94b94f"
+ "b5960321.a2acd"
]
]
},
{
- "id": "5fad1b65.6cf5f4",
+ "id": "a0ba5094.34089",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 955.03125,
- "y": 447.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 916.03125,
+ "y": 359.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "df6549d7.184d68"
+ "9bad05fb.b569a8"
]
]
},
{
- "id": "df6549d7.184d68",
+ "id": "9bad05fb.b569a8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1175.03125,
- "y": 447.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 1136.03125,
+ "y": 359.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "ecdd6aae.5dce98",
- "d4e2188a.cfa358"
+ "69ced2d8.9588fc",
+ "616c725f.66f59c"
]
]
},
{
- "id": "ecdd6aae.5dce98",
+ "id": "69ced2d8.9588fc",
"type": "other",
"name": "CreateNetworkInstance",
"xml": "<outcome value='CreateNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1455.03125,
- "y": 412.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 1416.03125,
+ "y": 324.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "da59191b.907b08"
+ "8d01ace0.92a79"
]
]
},
{
- "id": "d4e2188a.cfa358",
+ "id": "616c725f.66f59c",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1404.03125,
- "y": 456.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 1365.03125,
+ "y": 368.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "5cd6e955.998228"
+ "5fb52cac.0eb654"
]
]
},
{
- "id": "5cd6e955.998228",
+ "id": "5fb52cac.0eb654",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=assign\" />\n",
"comments": "",
- "x": 1573.03125,
- "y": 456.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 1534.03125,
+ "y": 368.99999809265137,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "ad4e82b5.19db9",
+ "id": "5513e34e.18308c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 962.0313568115234,
- "y": 578.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 923.0313568115234,
+ "y": 490.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "fdddb74f.c28e98"
+ "2378c65e.073eba"
]
]
},
{
- "id": "fdddb74f.c28e98",
+ "id": "2378c65e.073eba",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1179.0313568115234,
- "y": 578.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 1140.0313568115234,
+ "y": 490.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "67405a30.66b624",
- "f789090b.e09ab8",
- "a629f7e0.27dc18"
+ "8de45679.3b3c18",
+ "6955c602.6a6528",
+ "96152f20.469f"
]
]
},
{
- "id": "67405a30.66b624",
+ "id": "8de45679.3b3c18",
"type": "other",
"name": "CreateNetworkInstance",
"xml": "<outcome value='CreateNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1460.0313568115234,
- "y": 579.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 1421.0313568115234,
+ "y": 491.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "c1306bc.3cbcc98"
+ "94518ad8.741728"
]
]
},
{
- "id": "f789090b.e09ab8",
+ "id": "6955c602.6a6528",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1403.0313568115234,
- "y": 619.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 1364.0313568115234,
+ "y": 531.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "5d963b8c.378d74"
+ "8b16105d.d10c5"
]
]
},
{
- "id": "5d963b8c.378d74",
+ "id": "8b16105d.d10c5",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=activate\" />\n",
"comments": "",
- "x": 1574.8886528015137,
- "y": 621.4285945892334,
- "z": "ea83c234.74a66",
+ "x": 1535.8886528015137,
+ "y": 533.4285945892334,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "c0070c2.94b94f",
+ "id": "b5960321.a2acd",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 973.0313186645508,
- "y": 744.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 934.0313186645508,
+ "y": 656.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "22f63122.42e05e"
+ "413c7adb.c15c44"
]
]
},
{
- "id": "22f63122.42e05e",
+ "id": "413c7adb.c15c44",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1190.0313186645508,
- "y": 744.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1151.0313186645508,
+ "y": 656.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "6d2db562.ba9bfc",
- "3b6ddfe1.7bf99",
- "b80bf0eb.dad37"
+ "366873bb.05934c",
+ "2e293ab5.08c366",
+ "b2644153.2a067"
]
]
},
{
- "id": "6d2db562.ba9bfc",
+ "id": "366873bb.05934c",
"type": "other",
"name": "DeleteNetworkInstance",
"xml": "<outcome value='DeleteNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1471.0313186645508,
- "y": 745.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1432.0313186645508,
+ "y": 657.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "998324c.2692bd8"
+ "7a6470e0.53a19"
]
]
},
{
- "id": "3b6ddfe1.7bf99",
+ "id": "2e293ab5.08c366",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1414.0313186645508,
- "y": 785.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1375.0313186645508,
+ "y": 697.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "c74085f9.cc0278"
+ "c463df98.ea3ee"
]
]
},
{
- "id": "c74085f9.cc0278",
+ "id": "c463df98.ea3ee",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=deactivate\" />\n",
"comments": "",
- "x": 1583.0313835144043,
- "y": 787.8571729660034,
- "z": "ea83c234.74a66",
+ "x": 1544.0313835144043,
+ "y": 699.8571729660034,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "d8141396.7d6f",
+ "id": "8b85a1e9.e5cbc",
"type": "other",
"name": "unassign",
"xml": "<outcome value='unassign'>",
"comments": "",
"outputs": 1,
- "x": 787.0312881469727,
- "y": 838.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 748.0312881469727,
+ "y": 750.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "e1d20fe4.24b0a"
+ "c3a2fdfb.7fd72"
]
]
},
{
- "id": "e1d20fe4.24b0a",
+ "id": "c3a2fdfb.7fd72",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 969.0313186645508,
- "y": 835.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 930.0313186645508,
+ "y": 747.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "6bf4f4c3.27a5ec"
+ "4f8159c.6d86fa8"
]
]
},
{
- "id": "6bf4f4c3.27a5ec",
+ "id": "4f8159c.6d86fa8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1186.0313186645508,
- "y": 835.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1147.0313186645508,
+ "y": 747.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "344ada0a.a73ad6",
- "e3edfc03.190b4"
+ "550fb1ae.b9c5c",
+ "8c9d3f7f.4516f"
]
]
},
{
- "id": "344ada0a.a73ad6",
+ "id": "550fb1ae.b9c5c",
"type": "other",
"name": "DeleteNetworkInstance",
"xml": "<outcome value='DeleteNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1467.0313186645508,
- "y": 836.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1428.0313186645508,
+ "y": 748.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "af6f68e4.16d7c8"
+ "8347def4.e8f43"
]
]
},
{
- "id": "e3edfc03.190b4",
+ "id": "8c9d3f7f.4516f",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1410.0313186645508,
- "y": 876.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1371.0313186645508,
+ "y": 788.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "2f09eef8.729d22"
+ "895e5aa8.c214e8"
]
]
},
{
- "id": "2f09eef8.729d22",
+ "id": "895e5aa8.c214e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=unassign\" />\n",
"comments": "",
- "x": 1579.0313186645508,
- "y": 876.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1540.0313186645508,
+ "y": 788.0000114440918,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "da59191b.907b08",
+ "id": "8d01ace0.92a79",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1691.03125,
- "y": 411.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 1652.03125,
+ "y": 323.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "6e0de85f.52ae38",
- "f1bdb760.a39f58",
- "93644671.27ab38",
- "f574bbf5.e2c0a8",
- "522e4061.48e94",
- "3e035fc2.b3924",
- "3aacf235.e8f50e"
+ "1bfbd5a6.718d3a",
+ "e6612016.3e4c5",
+ "b1a90522.c6b958",
+ "6352e03d.22eed",
+ "a58d7ad5.945658",
+ "6492fa8d.a3f754",
+ "dbf6cbd2.03c8d8"
]
]
},
{
- "id": "c1306bc.3cbcc98",
+ "id": "94518ad8.741728",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1685.0313568115234,
- "y": 579.9999885559082,
- "z": "ea83c234.74a66",
+ "x": 1646.0313568115234,
+ "y": 491.9999885559082,
+ "z": "8893d0be.32531",
"wires": [
[
- "6e0de85f.52ae38",
- "f1bdb760.a39f58",
- "93644671.27ab38",
- "f574bbf5.e2c0a8",
- "522e4061.48e94",
- "3e035fc2.b3924",
- "ad0c00ef.1fb7b"
+ "1bfbd5a6.718d3a",
+ "e6612016.3e4c5",
+ "b1a90522.c6b958",
+ "6352e03d.22eed",
+ "a58d7ad5.945658",
+ "6492fa8d.a3f754",
+ "de4bc965.10a9a8"
]
]
},
{
- "id": "998324c.2692bd8",
+ "id": "7a6470e0.53a19",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1727.0313186645508,
- "y": 746.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1688.0313186645508,
+ "y": 658.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "ad0c00ef.1fb7b"
+ "de4bc965.10a9a8"
]
]
},
{
- "id": "af6f68e4.16d7c8",
+ "id": "8347def4.e8f43",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1726.0313186645508,
- "y": 837.0000114440918,
- "z": "ea83c234.74a66",
+ "x": 1687.0313186645508,
+ "y": 749.0000114440918,
+ "z": "8893d0be.32531",
"wires": [
[
- "ad0c00ef.1fb7b"
+ "de4bc965.10a9a8"
]
]
},
{
- "id": "522e4061.48e94",
+ "id": "a58d7ad5.945658",
"type": "switchNode",
"name": "switch onap-model-information.model-uuid",
"xml": "<switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>\n",
"comments": "",
"outputs": 1,
- "x": 2327.697914123535,
- "y": 1135.9999494552612,
- "z": "ea83c234.74a66",
+ "x": 2288.697914123535,
+ "y": 1047.9999494552612,
+ "z": "8893d0be.32531",
"wires": [
[
- "acd91e81.cd0da",
- "a6bf8d05.347a4"
+ "a2089e7a.ac5b1",
+ "42b6c1fc.c06a7"
]
]
},
{
- "id": "99c35b5e.7ad5b8",
+ "id": "8ba860ac.98ed2",
"type": "comment",
"name": "validations - required for all",
"info": "",
"comments": "",
- "x": 591.03125,
- "y": 185.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 552.03125,
+ "y": 97.99999809265137,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "bb3aaf61.12982",
+ "id": "7f1548ab.76a718",
"type": "comment",
"name": "validations specific per svc-action",
"info": "",
"comments": "",
- "x": 603.03125,
- "y": 400.99999809265137,
- "z": "ea83c234.74a66",
+ "x": 564.03125,
+ "y": 312.99999809265137,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "f39e6aa2.09d888",
+ "id": "a63772a0.90d1",
"type": "comment",
"name": "network-request-information block validations",
"info": "",
"comments": "",
- "x": 2331.03125,
- "y": 987.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2292.03125,
+ "y": 899.9999980926514,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "6e0de85f.52ae38",
+ "id": "1bfbd5a6.718d3a",
"type": "switchNode",
"name": "switch network-request-information.tenant",
"xml": "<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n",
"comments": "",
"outputs": 1,
- "x": 2328.03125,
- "y": 1037.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2289.03125,
+ "y": 949.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "4ae37797.bed6c8"
+ "cf16e334.e3d85"
]
]
},
{
- "id": "4ae37797.bed6c8",
+ "id": "cf16e334.e3d85",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2569.74560546875,
- "y": 1039.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2530.74560546875,
+ "y": 951.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "47dce650.0f6df8"
+ "ad280e32.435b6"
]
]
},
{
- "id": "47dce650.0f6df8",
+ "id": "ad280e32.435b6",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-request-input.tenant is a required input\" />\n",
"comments": "",
- "x": 2721.1741943359375,
- "y": 1037.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2682.1741943359375,
+ "y": 949.9999980926514,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "f1bdb760.a39f58",
+ "id": "e6612016.3e4c5",
"type": "switchNode",
"name": "switch network-request-information.aic-cloud-region",
"xml": "<switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>\n",
"comments": "",
"outputs": 1,
- "x": 2357.03125,
- "y": 1080.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2318.03125,
+ "y": 992.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "500a2d6f.01c354"
+ "2e6c842b.3d3bfc"
]
]
},
{
- "id": "500a2d6f.01c354",
+ "id": "2e6c842b.3d3bfc",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2618.74560546875,
- "y": 1080.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2579.74560546875,
+ "y": 992.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "9ab40c85.dc8f9"
+ "4f8437fb.4ebe28"
]
]
},
{
- "id": "9ab40c85.dc8f9",
+ "id": "4f8437fb.4ebe28",
"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.network-request-information.aic-cloud-region is a required input\" />\n",
"comments": "",
- "x": 2783.174072265625,
- "y": 1079.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2744.174072265625,
+ "y": 991.9999980926514,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "93644671.27ab38",
+ "id": "b1a90522.c6b958",
"type": "switchNode",
"name": "switch onap-model-information.model-uuid",
"xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>\n",
"comments": "",
"outputs": 1,
- "x": 2320.1741943359375,
- "y": 907.8571147918701,
- "z": "ea83c234.74a66",
+ "x": 2281.1741943359375,
+ "y": 819.8571147918701,
+ "z": "8893d0be.32531",
"wires": [
[
- "5adb46d1.78a9b8"
+ "662ea3fd.3a569c"
]
]
},
{
- "id": "5adb46d1.78a9b8",
+ "id": "662ea3fd.3a569c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2560.1741943359375,
- "y": 908.8571147918701,
- "z": "ea83c234.74a66",
+ "x": 2521.1741943359375,
+ "y": 820.8571147918701,
+ "z": "8893d0be.32531",
"wires": [
[
- "b5f06625.cfdca8"
+ "a27bb01c.4d33c"
]
]
},
{
- "id": "b5f06625.cfdca8",
+ "id": "a27bb01c.4d33c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-information.onap-model-information.model-uuid is a required input\" />\n",
"comments": "",
- "x": 2725.6026611328125,
- "y": 906.857084274292,
- "z": "ea83c234.74a66",
+ "x": 2686.6026611328125,
+ "y": 818.857084274292,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "f574bbf5.e2c0a8",
+ "id": "6352e03d.22eed",
"type": "switchNode",
"name": "switch onap-model-information.model-customization-uuid",
"xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>\n",
"comments": "",
"outputs": 1,
- "x": 2365.03125,
- "y": 866.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2326.03125,
+ "y": 778.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "126e3258.9c32ee"
+ "8f05ec67.db021"
]
]
},
{
- "id": "126e3258.9c32ee",
+ "id": "8f05ec67.db021",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2661.03125,
- "y": 867.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2622.03125,
+ "y": 779.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
[
- "109a29dd.e914a6"
+ "68925179.7127d"
]
]
},
{
- "id": "109a29dd.e914a6",
+ "id": "68925179.7127d",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-information.onap-model-information.model-customization-uuid is a required input\" />\n",
"comments": "",
- "x": 2808.459716796875,
- "y": 867.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 2769.459716796875,
+ "y": 779.9999980926514,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "40653e81.a79c4",
+ "id": "f3d5b1ea.9645e",
"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": 565.3883247375488,
- "y": 764.6428327560425,
- "z": "ea83c234.74a66",
+ "x": 526.3883247375488,
+ "y": 676.6428327560425,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "84b45f59.b66f9",
+ "id": "96895c09.a6753",
"type": "get-resource",
"name": "get-resource NETWORK_MODEL",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n pfx='network-model'>\n\n",
"comments": "",
"outputs": 1,
- "x": 3043.2143173217773,
- "y": 1351.1784744262695,
- "z": "ea83c234.74a66",
+ "x": 3004.2143173217773,
+ "y": 1263.1784744262695,
+ "z": "8893d0be.32531",
"wires": [
[
- "a0253c48.a500d",
- "8b8eb621.59ec18"
+ "f9258daf.8b602",
+ "5c25b9d9.438728"
]
]
},
{
- "id": "c49e6503.c07498",
+ "id": "ac3d2a23.2dc468",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
"comments": "",
- "x": 3502.6785202026367,
- "y": 1342.225890159607,
- "z": "ea83c234.74a66",
+ "x": 3463.6785202026367,
+ "y": 1254.225890159607,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "a0253c48.a500d",
+ "id": "f9258daf.8b602",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3303.9285316467285,
- "y": 1335.5830965042114,
- "z": "ea83c234.74a66",
+ "x": 3264.9285316467285,
+ "y": 1247.5830965042114,
+ "z": "8893d0be.32531",
"wires": [
[
- "c49e6503.c07498"
+ "ac3d2a23.2dc468"
]
]
},
{
- "id": "8b8eb621.59ec18",
+ "id": "5c25b9d9.438728",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3297.6785316467285,
- "y": 1368.0830965042114,
- "z": "ea83c234.74a66",
+ "x": 3258.6785316467285,
+ "y": 1280.0830965042114,
+ "z": "8893d0be.32531",
"wires": [
[
- "c49e6503.c07498"
+ "ac3d2a23.2dc468"
]
]
},
{
- "id": "acd91e81.cd0da",
+ "id": "a2089e7a.ac5b1",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2592.845993041992,
- "y": 1135.5925884246826,
- "z": "ea83c234.74a66",
+ "x": 2553.845993041992,
+ "y": 1047.5925884246826,
+ "z": "8893d0be.32531",
"wires": [
[
- "b13bfecc.d0f64"
+ "620a39e0.d0cdb8"
]
]
},
{
- "id": "a6bf8d05.347a4",
+ "id": "42b6c1fc.c06a7",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 2599.0959281921387,
- "y": 1274.7591934204102,
- "z": "ea83c234.74a66",
+ "x": 2560.0959281921387,
+ "y": 1186.7591934204102,
+ "z": "8893d0be.32531",
"wires": [
[
- "468997da.29ae18"
+ "8a643c02.96779"
]
]
},
{
- "id": "9d1f773f.56bf68",
+ "id": "4b09caaf.8b4044",
"type": "get-resource",
"name": "get-resource SERVICE_MODEL",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n pfx='service-model'>\n\n",
"comments": "",
"outputs": 1,
- "x": 3045.7143020629883,
- "y": 1274.2432470321655,
- "z": "ea83c234.74a66",
+ "x": 3006.7143020629883,
+ "y": 1186.2432470321655,
+ "z": "8893d0be.32531",
"wires": [
[
- "84dd27a2.97bda8",
- "3c927e02.744bb2"
+ "c368ca47.7ac378",
+ "c422bd25.160ed"
]
]
},
{
- "id": "40f84f26.9dfa6",
+ "id": "f0c9c755.52a178",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
"comments": "",
- "x": 3492.7976684570312,
- "y": 1274.2432775497437,
- "z": "ea83c234.74a66",
+ "x": 3453.7976684570312,
+ "y": 1186.2432775497437,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "84dd27a2.97bda8",
+ "id": "c368ca47.7ac378",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3294.047748565674,
- "y": 1269.6004934310913,
- "z": "ea83c234.74a66",
+ "x": 3255.047748565674,
+ "y": 1181.6004934310913,
+ "z": "8893d0be.32531",
"wires": [
[
- "40f84f26.9dfa6"
+ "f0c9c755.52a178"
]
]
},
{
- "id": "3c927e02.744bb2",
+ "id": "c422bd25.160ed",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3287.797748565674,
- "y": 1302.1004934310913,
- "z": "ea83c234.74a66",
+ "x": 3248.797748565674,
+ "y": 1214.1004934310913,
+ "z": "8893d0be.32531",
"wires": [
[
- "40f84f26.9dfa6"
+ "f0c9c755.52a178"
]
]
},
{
- "id": "911ff56e.c82ef8",
+ "id": "b60ce6b6.6e55c8",
"type": "get-resource",
"name": "get-resource NETWORK_MODEL",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n and service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n pfx='network-model'>\n\n",
"comments": "",
"outputs": 1,
- "x": 3039.400505065918,
- "y": 1210.4007968902588,
- "z": "ea83c234.74a66",
+ "x": 3000.400505065918,
+ "y": 1122.4007968902588,
+ "z": "8893d0be.32531",
"wires": [
[
- "9b7c8a4e.698078",
- "375e7edf.448442"
+ "53ee50da.92c",
+ "302de1ee.96625e"
]
]
},
{
- "id": "cc1f0aec.867828",
+ "id": "508d66c6.0a5cd8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
"comments": "",
- "x": 3498.8647079467773,
- "y": 1201.4482126235962,
- "z": "ea83c234.74a66",
+ "x": 3459.8647079467773,
+ "y": 1113.4482126235962,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "9b7c8a4e.698078",
+ "id": "53ee50da.92c",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3300.114719390869,
- "y": 1194.8054189682007,
- "z": "ea83c234.74a66",
+ "x": 3261.114719390869,
+ "y": 1106.8054189682007,
+ "z": "8893d0be.32531",
"wires": [
[
- "cc1f0aec.867828"
+ "508d66c6.0a5cd8"
]
]
},
{
- "id": "375e7edf.448442",
+ "id": "302de1ee.96625e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3295.1146965026855,
- "y": 1226.0554180145264,
- "z": "ea83c234.74a66",
+ "x": 3256.1146965026855,
+ "y": 1138.0554180145264,
+ "z": "8893d0be.32531",
"wires": [
[
- "cc1f0aec.867828"
+ "508d66c6.0a5cd8"
]
]
},
{
- "id": "6cb11322.a53b0c",
+ "id": "3336f7e.5de1408",
"type": "get-resource",
"name": "get-resource SERVICE_MODEL",
"xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n pfx='service-model'>",
"comments": "",
"outputs": 1,
- "x": 3038.1504287719727,
- "y": 1135.9654626846313,
- "z": "ea83c234.74a66",
+ "x": 2999.1504287719727,
+ "y": 1047.9654626846313,
+ "z": "8893d0be.32531",
"wires": [
[
- "4e95e1fd.41641",
- "9df2f9b2.794ca8"
+ "97b21fe.ac0ede",
+ "a706b0a7.379b8"
]
]
},
{
- "id": "b9ac34e6.4bbe58",
+ "id": "d796bf5.a742d4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
"comments": "",
- "x": 3488.983856201172,
- "y": 1133.465600013733,
- "z": "ea83c234.74a66",
+ "x": 3449.983856201172,
+ "y": 1045.465600013733,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "4e95e1fd.41641",
+ "id": "97b21fe.ac0ede",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3290.2339363098145,
- "y": 1128.8228158950806,
- "z": "ea83c234.74a66",
+ "x": 3251.2339363098145,
+ "y": 1040.8228158950806,
+ "z": "8893d0be.32531",
"wires": [
[
- "b9ac34e6.4bbe58"
+ "d796bf5.a742d4"
]
]
},
{
- "id": "9df2f9b2.794ca8",
+ "id": "a706b0a7.379b8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3283.9839363098145,
- "y": 1161.3228158950806,
- "z": "ea83c234.74a66",
+ "x": 3244.9839363098145,
+ "y": 1073.3228158950806,
+ "z": "8893d0be.32531",
"wires": [
[
- "b9ac34e6.4bbe58"
+ "d796bf5.a742d4"
]
]
},
{
- "id": "b13bfecc.d0f64",
+ "id": "620a39e0.d0cdb8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2768.1702423095703,
- "y": 1134.805416584015,
- "z": "ea83c234.74a66",
+ "x": 2729.1702423095703,
+ "y": 1046.805416584015,
+ "z": "8893d0be.32531",
"wires": [
[
- "6cb11322.a53b0c",
- "911ff56e.c82ef8"
+ "3336f7e.5de1408",
+ "b60ce6b6.6e55c8"
]
]
},
{
- "id": "468997da.29ae18",
+ "id": "8a643c02.96779",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2760.6702423095703,
- "y": 1273.555419921875,
- "z": "ea83c234.74a66",
+ "x": 2721.6702423095703,
+ "y": 1185.555419921875,
+ "z": "8893d0be.32531",
"wires": [
[
- "9d1f773f.56bf68",
- "84b45f59.b66f9"
+ "4b09caaf.8b4044",
+ "96895c09.a6753"
]
]
},
{
- "id": "a629f7e0.27dc18",
+ "id": "96152f20.469f",
"type": "outcome",
"name": "ActivateDCINetworkInstance",
"xml": "<outcome value='ActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1474.6978378295898,
- "y": 532.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 1435.6978378295898,
+ "y": 444.99999809265137,
+ "z": "8893d0be.32531",
"wires": [
[
- "ffd7a509.990f28"
+ "4b2f8e37.5461c"
]
]
},
{
- "id": "b80bf0eb.dad37",
+ "id": "b2644153.2a067",
"type": "outcome",
"name": "DeActivateDCINetworkInstance",
"xml": "<outcome value='DeActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1496.0312118530273,
- "y": 695.9999980926514,
- "z": "ea83c234.74a66",
+ "x": 1457.0312118530273,
+ "y": 607.9999980926514,
+ "z": "8893d0be.32531",
"wires": [
- []
+ [
+ "31bb2eb9.4b2df2"
+ ]
]
},
{
- "id": "3e035fc2.b3924",
+ "id": "6492fa8d.a3f754",
"type": "switchNode",
"name": "switch onap-model-information.model-invariant-uuid",
"xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>\n",
"comments": "",
"outputs": 1,
- "x": 2347.0313110351562,
- "y": 832.0000343322754,
- "z": "ea83c234.74a66",
+ "x": 2308.0313110351562,
+ "y": 744.0000343322754,
+ "z": "8893d0be.32531",
"wires": [
[
- "83d207ff.7bd648"
+ "d0898bc.4da8178"
]
]
},
{
- "id": "83d207ff.7bd648",
+ "id": "d0898bc.4da8178",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2632.0313720703125,
- "y": 831.0000286102295,
- "z": "ea83c234.74a66",
+ "x": 2593.0313720703125,
+ "y": 743.0000286102295,
+ "z": "8893d0be.32531",
"wires": [
[
- "f82300ac.a06c3"
+ "1ca0e8c8.26dc17"
]
]
},
{
- "id": "f82300ac.a06c3",
+ "id": "1ca0e8c8.26dc17",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-information.onap-model-information.model-invariant-uuid is a required input\" />\n",
"comments": "",
- "x": 2783.4598388671875,
- "y": 830.0000286102295,
- "z": "ea83c234.74a66",
+ "x": 2744.4598388671875,
+ "y": 742.0000286102295,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "97f835cb.91c378",
+ "id": "158231ee.a3fc1e",
"type": "comment",
"name": "network-information.onap-model-information block validations",
"info": "",
"comments": "",
- "x": 2366.1741943359375,
- "y": 792.8571147918701,
- "z": "ea83c234.74a66",
+ "x": 2327.1741943359375,
+ "y": 704.8571147918701,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "3aacf235.e8f50e",
+ "id": "dbf6cbd2.03c8d8",
"type": "switchNode",
"name": "switch network-information.network-id",
"xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 2302.0311737060547,
- "y": 701.3333549499512,
- "z": "ea83c234.74a66",
+ "x": 2263.0311737060547,
+ "y": 613.3333549499512,
+ "z": "8893d0be.32531",
"wires": [
[
- "9159921b.1a874",
- "e6a3fc73.bccb"
+ "6175843f.314bac",
+ "6cf19d4d.69d604"
]
]
},
{
- "id": "9159921b.1a874",
+ "id": "6175843f.314bac",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 2598.0311241149902,
- "y": 734.0000667572021,
- "z": "ea83c234.74a66",
+ "x": 2559.0311241149902,
+ "y": 646.0000667572021,
+ "z": "8893d0be.32531",
"wires": [
[
- "6dac7c4c.02e324"
+ "c1d6e588.8008f8"
]
]
},
{
- "id": "6dac7c4c.02e324",
+ "id": "c1d6e588.8008f8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2732.142379760742,
- "y": 734.4444713592529,
- "z": "ea83c234.74a66",
+ "x": 2693.142379760742,
+ "y": 646.4444713592529,
+ "z": "8893d0be.32531",
"wires": [
[
- "ad3bc41e.68ce58"
+ "71346c27.04b7d4"
]
]
},
{
- "id": "ad3bc41e.68ce58",
+ "id": "71346c27.04b7d4",
"type": "switchNode",
"name": "switch service-data.networks.network_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 3005.856491088867,
- "y": 736.0158214569092,
- "z": "ea83c234.74a66",
+ "x": 2966.856491088867,
+ "y": 648.0158214569092,
+ "z": "8893d0be.32531",
"wires": [
[
- "581b248a.42826c",
- "cc92e437.07d7d8"
+ "34df5d30.93d862",
+ "b53e3219.4661d"
]
]
},
{
- "id": "581b248a.42826c",
+ "id": "34df5d30.93d862",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 3294.856491088867,
- "y": 738.0158824920654,
- "z": "ea83c234.74a66",
+ "x": 3255.856491088867,
+ "y": 650.0158824920654,
+ "z": "8893d0be.32531",
"wires": [
[
- "488942f3.44f17c"
+ "dd967162.ba1ae"
]
]
},
{
- "id": "cc92e437.07d7d8",
+ "id": "b53e3219.4661d",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 3274.856491088867,
- "y": 773.0158824920654,
- "z": "ea83c234.74a66",
+ "x": 3235.856491088867,
+ "y": 685.0158824920654,
+ "z": "8893d0be.32531",
"wires": [
[
- "b5588c72.ba5fc"
+ "ad38a9d8.149638"
]
]
},
{
- "id": "b5588c72.ba5fc",
+ "id": "ad38a9d8.149638",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 3476.126510620117,
- "y": 774.5704479217529,
- "z": "ea83c234.74a66",
+ "x": 3437.126510620117,
+ "y": 686.5704479217529,
+ "z": "8893d0be.32531",
"wires": [
[
- "54588ea6.fb302",
- "8ffdffe5.986cf"
+ "aa0170e3.5679c",
+ "2465dbb6.c0a6e4"
]
]
},
{
- "id": "54588ea6.fb302",
+ "id": "aa0170e3.5679c",
"type": "for",
"name": "for nidx..service-data.networks.network[]",
"xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 3746.142547607422,
- "y": 773.4444637298584,
- "z": "ea83c234.74a66",
+ "x": 3707.142547607422,
+ "y": 685.4444637298584,
+ "z": "8893d0be.32531",
"wires": [
[
- "1beda453.597b5c"
+ "1fbf0f94.4056a"
]
]
},
{
- "id": "1beda453.597b5c",
+ "id": "1fbf0f94.4056a",
"type": "switchNode",
"name": "switch networkid found",
"xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 4036.5710983276367,
- "y": 772.6945476531982,
- "z": "ea83c234.74a66",
+ "x": 3997.5710983276367,
+ "y": 684.6945476531982,
+ "z": "8893d0be.32531",
"wires": [
[
- "6de598a.75bad68"
+ "3de6966a.9e173a"
]
]
},
{
- "id": "6de598a.75bad68",
+ "id": "3de6966a.9e173a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 4225.523452758789,
- "y": 773.5872859954834,
- "z": "ea83c234.74a66",
+ "x": 4186.523452758789,
+ "y": 685.5872859954834,
+ "z": "8893d0be.32531",
"wires": [
[
- "d5f294f4.1bcec8"
+ "4f5a1354.1233dc"
]
]
},
{
- "id": "82ed9efc.d01f3",
+ "id": "4acc4fac.09f96",
"type": "set",
"name": "set tmp.nidx and ctx.network-data",
"xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
"comments": "",
- "x": 4669.055221557617,
- "y": 782.337308883667,
- "z": "ea83c234.74a66",
+ "x": 4630.055221557617,
+ "y": 694.337308883667,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "8ffdffe5.986cf",
+ "id": "2465dbb6.c0a6e4",
"type": "switchNode",
"name": "switch tmp.nidx ",
"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 3664.443977355957,
- "y": 815.4276704788208,
- "z": "ea83c234.74a66",
+ "x": 3625.443977355957,
+ "y": 727.4276704788208,
+ "z": "8893d0be.32531",
"wires": [
[
- "a08270b4.5a0dc"
+ "dea84216.b653a"
]
]
},
{
- "id": "7a3310df.c618f",
+ "id": "ecca41ce.fcb55",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
"comments": "",
- "x": 4017.3009605407715,
- "y": 811.1419124603271,
- "z": "ea83c234.74a66",
+ "x": 3978.3009605407715,
+ "y": 723.1419124603271,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "a08270b4.5a0dc",
+ "id": "dea84216.b653a",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 3835.872512817383,
- "y": 813.9990558624268,
- "z": "ea83c234.74a66",
+ "x": 3796.872512817383,
+ "y": 725.9990558624268,
+ "z": "8893d0be.32531",
"wires": [
[
- "7a3310df.c618f"
+ "ecca41ce.fcb55"
]
]
},
{
- "id": "6dea9d77.04a2a4",
+ "id": "9ff8451b.0ce6b8",
"type": "switchNode",
"name": "switch order-status",
"xml": "<switch test='`$ctx.network-data.network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 4627.475631713867,
- "y": 819.444486618042,
- "z": "ea83c234.74a66",
+ "x": 4588.475631713867,
+ "y": 731.444486618042,
+ "z": "8893d0be.32531",
"wires": [
[
- "47aee516.d8463c"
+ "1c527fbe.e34b3"
]
]
},
{
- "id": "47aee516.d8463c",
+ "id": "1c527fbe.e34b3",
"type": "other",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 4841.475631713867,
- "y": 819.444486618042,
- "z": "ea83c234.74a66",
+ "x": 4802.475631713867,
+ "y": 731.444486618042,
+ "z": "8893d0be.32531",
"wires": [
[
- "b5ba6fb5.02e0e"
+ "1ed56338.a1e19d"
]
]
},
{
- "id": "b5ba6fb5.02e0e",
+ "id": "1ed56338.a1e19d",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Network aready exists in Created state matching network-id ' + $network-topology-operation-input.network-information.network-id`\" />\n",
"comments": "",
- "x": 5045.475631713867,
- "y": 815.4444713592529,
- "z": "ea83c234.74a66",
+ "x": 5006.475631713867,
+ "y": 727.4444713592529,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "d5f294f4.1bcec8",
+ "id": "4f5a1354.1233dc",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 4374.141891479492,
- "y": 773.4444713592529,
- "z": "ea83c234.74a66",
+ "x": 4335.141891479492,
+ "y": 685.4444713592529,
+ "z": "8893d0be.32531",
"wires": [
[
- "82ed9efc.d01f3"
+ "4acc4fac.09f96"
]
]
},
{
- "id": "488942f3.44f17c",
+ "id": "dd967162.ba1ae",
"type": "record",
"name": "record",
"xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network id proveded but no network exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-id`\"/>\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 3456.142379760742,
- "y": 737.4444713592529,
- "z": "ea83c234.74a66",
+ "x": 3417.142379760742,
+ "y": 649.4444713592529,
+ "z": "8893d0be.32531",
"wires": [
[]
]
},
{
- "id": "ad0c00ef.1fb7b",
+ "id": "de4bc965.10a9a8",
"type": "switchNode",
"name": "switch network-information.network-id",
"xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 2300.0310974121094,
- "y": 654.6666717529297,
- "z": "ea83c234.74a66",
+ "x": 2261.0310974121094,
+ "y": 566.6666717529297,
+ "z": "8893d0be.32531",
"wires": [
[
- "d99ce0de.0aa67"
+ "515a1b60.a2b844"
]
]
},
{
- "id": "d99ce0de.0aa67",
+ "id": "515a1b60.a2b844",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2528.7454223632812,
- "y": 656.6666717529297,
- "z": "ea83c234.74a66",
+ "x": 2489.7454223632812,
+ "y": 568.6666717529297,
+ "z": "8893d0be.32531",
"wires": [
[
- "68028a81.7e4cf4"
+ "5c3c2c39.9ce264"
]
]
},
{
- "id": "68028a81.7e4cf4",
+ "id": "5c3c2c39.9ce264",
"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.network-information.network-id is a required input\" />\n",
"comments": "",
- "x": 2693.174041748047,
- "y": 654.6666717529297,
- "z": "ea83c234.74a66",
+ "x": 2654.174041748047,
+ "y": 566.6666717529297,
+ "z": "8893d0be.32531",
"wires": []
},
{
- "id": "e6a3fc73.bccb",
+ "id": "6cf19d4d.69d604",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2595.6980209350586,
- "y": 700.9999408721924,
- "z": "ea83c234.74a66",
+ "x": 2556.6980209350586,
+ "y": 612.9999408721924,
+ "z": "8893d0be.32531",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "4b2f8e37.5461c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1662.00390625,
+ "y": 419.00390625,
+ "z": "8893d0be.32531",
"wires": [
[]
]
},
{
- "id": "ffd7a509.990f28",
+ "id": "31bb2eb9.4b2df2",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1701.00390625,
- "y": 507.00390625,
- "z": "ea83c234.74a66",
+ "x": 1713.0312957763672,
+ "y": 597.0312662124634,
+ "z": "8893d0be.32531",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 19e61710..0987a773 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -247,7 +247,7 @@
<outcome value="DeActivateDCINetworkInstance">
<block atomic="true">
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
- <parameter name="$network-topology-operation-input.network-information.network-id" value="" />
+ <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />
</execute>
<switch test="`$network-topology-operation-input.network-information.network-id`">
<outcome value="">
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
index 1f70a4b7..c0dc8f14 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -370,7 +370,9 @@
<outcome value="deactivate">
<block atomic="true">
<switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeActivateDCINetworkInstance" />
+ <outcome value="DeActivateDCINetworkInstance">
+ <block atomic="true" />
+ </outcome>
<outcome value="DeleteNetworkInstance">
<block atomic="true">
<switch test="`$network-topology-operation-input.network-information.network-id`">