aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgaurav <gaurav.agrawal@huawei.com>2018-07-25 17:35:50 +0530
committergaurav <gaurav.agrawal@huawei.com>2018-07-25 17:35:50 +0530
commit103b76b64d93dbbbe0b9f84176fe78546b39d787 (patch)
treed2fbf503adb17832a5b9662c61c400806b5e75b9
parenta5304e219bd29c881ab6c50be7a5a6463ef7afa8 (diff)
Connecting SOTN sub DGs to network DG
Changes include: 1. Connected SOTN sub DG with network DG 2. Removed hardcoding of version Change-Id: Iabdbc267434bcef0ce125d166d1c2252fa49ce97 Issue-ID: SDNC-356 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com> Former-commit-id: c972410c1bb1faa06155e1aa8126c0849990879a
Diffstat
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json2312
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json132
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json777
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json132
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json116
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json1348
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json828
-rw-r--r--[-rwxr-xr-x]platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml241
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml83
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml416
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml83
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml61
-rw-r--r--[-rwxr-xr-x]platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml425
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml589
14 files changed, 4037 insertions, 3506 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
index ffa24576..4e2c7d5f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
@@ -1,1010 +1,1306 @@
[
- {
- "id":"f7054ab9.c750e8",
- "type":"dgstart",
- "name":"DGSTART",
- "outputs":1,
- "x":120.66666412353516,
- "y":100.41365557909012,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "c424c6c5.ae02a8"
- ]
- ]
- },
- {
- "id":"c424c6c5.ae02a8",
- "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":202.61902618408203,
- "y":140.65176802873611,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "293d1a40.e88a76"
- ]
- ]
- },
- {
- "id":"293d1a40.e88a76",
- "type":"method",
- "name":"network-topology-operation",
- "xml":"<method rpc='network-topology-operation' mode='sync'>\n",
- "comments":"",
- "outputs":1,
- "x":199.0952911376953,
- "y":180.41364985704422,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "6c71864c.68b0b8"
- ]
- ]
- },
- {
- "id":"6808a800.72f6b8",
- "type":"comment",
- "name":" NETWORK-TOPOLOGY-OPERATION ",
- "info":"",
- "comments":"",
- "x":515.0115203857422,
- "y":47.99999934434891,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"6c71864c.68b0b8",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":234.66669464111328,
- "y":263.85713893175125,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "a683a74d.bbfcd8",
- "ec781a98.809e88",
- "d4adb7b5.a74888",
- "a12d09b7.6dc858"
- ]
- ]
- },
- {
- "id":"a683a74d.bbfcd8",
- "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":464.7500534057617,
- "y":887.6997750401497,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"ec781a98.809e88",
- "type":"switchNode",
- "name":"switch svc-action",
- "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
- "comments":"",
- "outputs":1,
- "x":461.3809280395508,
- "y":494.2708333134651,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "4dfadbed.777bc4",
- "55daa54f.4836ec",
- "5c025596.ae8c5c",
- "67e93f6e.2c897",
- "24132a9d.396786",
- "29d750bd.02a64",
- "e6eca3d3.abe59"
- ]
- ]
- },
- {
- "id":"4dfadbed.777bc4",
- "type":"other",
- "name":"assign",
- "xml":"<outcome value='assign'>\n",
- "comments":"",
- "outputs":1,
- "x":681.8571243286133,
- "y":270.556483566761,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "fc28dd4a.e1c57"
- ]
- ]
- },
- {
- "id":"fc28dd4a.e1c57",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":863.0952835083008,
- "y":271.5566056370735,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "82d45ba2.1d8bc8"
- ]
- ]
- },
- {
- "id":"d4adb7b5.a74888",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:validate-network-input",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":593.6666793823242,
- "y":206.41373187303543,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"82d45ba2.1d8bc8",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-assign",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":1234.666633605957,
- "y":268.413661301136,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"55daa54f.4836ec",
- "type":"other",
- "name":"activate",
- "xml":"<outcome value='activate'>\n",
- "comments":"",
- "outputs":1,
- "x":683.6666641235352,
- "y":444.4136555790901,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "67566173.45c4c"
- ]
- ]
- },
- {
- "id":"627cdb56.3b7234",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":1220.9048233032227,
- "y":441.4138920903206,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "2132e234.e510ce",
- "a3ddfe15.bee34"
- ]
- ]
- },
- {
- "id":"6e5c6d24.81c194",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-activate",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":2266.476234436035,
- "y":570.2708275914192,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"5c025596.ae8c5c",
- "type":"other",
- "name":"deactivate",
- "xml":"<outcome value='deactivate'>\n",
- "comments":"",
- "outputs":1,
- "x":672.6666641235352,
- "y":604.4136803746223,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "2deb4375.385a5c"
- ]
- ]
- },
- {
- "id":"2deb4375.385a5c",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":860.9050216674805,
- "y":603.4140033721924,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "2132e234.e510ce",
- "1d159242.42217e"
- ]
- ]
- },
- {
- "id":"d02489f7.8cbe58",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-deactivate",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":2458.9762954711914,
- "y":734.0208568572998,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"67e93f6e.2c897",
- "type":"other",
- "name":"unassign",
- "xml":"<outcome value='unassign'>\n",
- "comments":"",
- "outputs":1,
- "x":680.6666641235352,
- "y":669.4136803746223,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "a5a4cbe4.928108"
- ]
- ]
- },
- {
- "id":"a5a4cbe4.928108",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":861.9048233032227,
- "y":670.4138024449348,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "2132e234.e510ce",
- "8cb9d01a.01cbb"
- ]
- ]
- },
- {
- "id":"76ad4a39.0cc194",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-unassign",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":2013.7261428833008,
- "y":835.7708275914192,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"24132a9d.396786",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":671.6666679382324,
- "y":729.4136708378792,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "e05b3a0e.6b2cf8"
- ]
- ]
- },
- {
- "id":"e05b3a0e.6b2cf8",
- "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":853.6666641235352,
- "y":728.4136803746223,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"a12d09b7.6dc858",
- "type":"set",
- "name":"Set final indicator to Y",
- "xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
- "comments":"",
- "x":483.77774810791016,
- "y":846.8581135869026,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"9acad2b9.f0834",
- "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":2220.3970260620117,
- "y":480.1755822300911,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "329c7937.b6a136"
- ]
- ]
- },
- {
- "id":"2132e234.e510ce",
- "type":"switchNode",
- "name":"switch service-data.networks.network_length",
- "xml":"<switch test='`$service-data.networks.network_length`'>\n",
- "comments":"",
- "outputs":1,
- "x":1527.1111221313477,
- "y":439.74696284532547,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "4172c482.3f5a6c",
- "d4b9b393.99ada"
- ]
- ]
- },
- {
- "id":"4172c482.3f5a6c",
- "type":"other",
- "name":"outcome Null",
- "xml":"<outcome value=''>\n",
- "comments":"",
- "outputs":1,
- "x":1800.1111602783203,
- "y":438.747027695179,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "29641469.ee90fc"
- ]
- ]
- },
- {
- "id":"d4b9b393.99ada",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":1780.111484527588,
- "y":478.74703246355057,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "1bb6dea1.ed18f1"
- ]
- ]
- },
- {
- "id":"329c7937.b6a136",
- "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":2510.8255767822266,
- "y":479.42566615343094,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "af5c385d.aaa198"
- ]
- ]
- },
- {
- "id":"af5c385d.aaa198",
- "type":"outcomeTrue",
- "name":"true",
- "xml":"<outcome value='true'>\n",
- "comments":"",
- "outputs":1,
- "x":2699.777931213379,
- "y":480.3184044957161,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "7a7e1001.3b10e"
- ]
- ]
- },
- {
- "id":"7a7e1001.3b10e",
- "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":2933.309700012207,
- "y":479.0684121251106,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"a849a7c.367a458",
- "type":"comment",
- "name":"Find the index to service data for this network - save id in tmp.nidx, save service-data",
- "info":"",
- "comments":"",
- "x":1473.2224578857422,
- "y":403.7470243573189,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"be0b87cc.facda8",
- "type":"comment",
- "name":"service-data will not be stored until we have a network-id",
- "info":"",
- "comments":"",
- "x":1202.3332595825195,
- "y":236.63589030504227,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"29641469.ee90fc",
- "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":1961.8886184692383,
- "y":439.63597041368484,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"1bb6dea1.ed18f1",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":1918.3810577392578,
- "y":479.3015702366829,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "9acad2b9.f0834",
- "cf1a68d3.1547a8"
- ]
- ]
- },
- {
- "id":"cf1a68d3.1547a8",
- "type":"switchNode",
- "name":"switch tmp.nidx ",
- "xml":"<switch test=\"`$tmp.nidx`\">\n\n",
- "comments":"",
- "outputs":1,
- "x":2138.698455810547,
- "y":522.1587889790535,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "5e666501.228a8c"
- ]
- ]
- },
- {
- "id":"b312a9fc.605418",
- "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":2491.5554389953613,
- "y":517.8730309605598,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"5e666501.228a8c",
- "type":"outcome",
- "name":"NULL",
- "xml":"<outcome value=''>\n",
- "comments":"",
- "outputs":1,
- "x":2310.1269912719727,
- "y":520.7301743626595,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "b312a9fc.605418"
- ]
- ]
- },
- {
- "id":"a3ddfe15.bee34",
- "type":"switchNode",
- "name":"switch network-level-oper-status",
- "xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
- "comments":"",
- "outputs":1,
- "x":1479.444465637207,
- "y":570.2222283482552,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "671fe44a.883fcc",
- "619f5c4e.da9664"
- ]
- ]
- },
- {
- "id":"671fe44a.883fcc",
- "type":"outcome",
- "name":"outcome PendingCreate",
- "xml":"<outcome value='PendingCreate'>\n",
- "comments":"",
- "outputs":1,
- "x":1844.4444452921543,
- "y":570.222213089466,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "6e5c6d24.81c194"
- ]
- ]
- },
- {
- "id":"619f5c4e.da9664",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":1794.444492340088,
- "y":610.2222436070442,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "ddaa51b4.1a3e6"
- ]
- ]
- },
- {
- "id":"ddaa51b4.1a3e6",
- "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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
- "comments":"",
- "x":1964.444492340088,
- "y":610.2222436070442,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"1d159242.42217e",
- "type":"switchNode",
- "name":"switch network-level-oper-status",
- "xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
- "comments":"",
- "outputs":1,
- "x":1225.7460136413574,
- "y":670.1736888885498,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "666ae4b6.332edc",
- "a7398342.dc0f5"
- ]
- ]
- },
- {
- "id":"666ae4b6.332edc",
- "type":"outcome",
- "name":"outcome Created",
- "xml":"<outcome value='Created'>\n",
- "comments":"",
- "outputs":1,
- "x":1588.7459831237793,
- "y":670.1737194061279,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "fc61673.76cb698"
- ]
- ]
- },
- {
- "id":"a7398342.dc0f5",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":1558.7459831237793,
- "y":710.1737194061279,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "6900f252.7fffdc"
- ]
- ]
- },
- {
- "id":"6900f252.7fffdc",
- "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 is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
- "comments":"",
- "x":1724.7459831237793,
- "y":712.1737194061279,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"8cb9d01a.01cbb",
- "type":"switchNode",
- "name":"switch network-level-oper-status",
- "xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
- "comments":"",
- "outputs":1,
- "x":1220.5475234985352,
- "y":837.375029861927,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "c260be3c.787a4",
- "3745164.07306ea",
- "aa12305c.9840f"
- ]
- ]
- },
- {
- "id":"c260be3c.787a4",
- "type":"outcome",
- "name":"outcome PendingCreate",
- "xml":"<outcome value='PendingCreate'>\n",
- "comments":"",
- "outputs":1,
- "x":1580.547492980957,
- "y":837.3750603795052,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "76ad4a39.0cc194"
- ]
- ]
- },
- {
- "id":"3745164.07306ea",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":1537.5474319458008,
- "y":921.3750756382942,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "609493c3.1dc45c"
- ]
- ]
- },
- {
- "id":"609493c3.1dc45c",
- "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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
- "comments":"",
- "x":1728.8808517456055,
- "y":920.0417044758797,
- "z":"d739160d.215ac8",
- "wires":[
-
- ]
- },
- {
- "id":"aa12305c.9840f",
- "type":"outcome",
- "name":"outcome PendingDelete",
- "xml":"<outcome value='PendingDelete'>\n",
- "comments":"",
- "outputs":1,
- "x":1583.777717590332,
- "y":875.2222283482552,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "76ad4a39.0cc194"
- ]
- ]
- },
- {
- "id":"29d750bd.02a64",
- "type":"other",
- "name":"create",
- "xml":"<outcome value='create'>\n",
- "comments":"",
- "outputs":1,
- "x":669.119026184082,
- "y":788.9999993443489,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "8872f98e.6acb58"
- ]
- ]
- },
- {
- "id":"e6eca3d3.abe59",
- "type":"other",
- "name":"delete",
- "xml":"<outcome value='delete'>\n",
- "comments":"",
- "outputs":1,
- "x":672.119026184082,
- "y":841.9999993443489,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "9bd83beb.090958"
- ]
- ]
- },
- {
- "id":"8872f98e.6acb58",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":858.119026184082,
- "y":794.9999993443489,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "1974de99.132ea1"
- ]
- ]
- },
- {
- "id":"9bd83beb.090958",
- "type":"block",
- "name":"block : atomic",
- "xml":"<block atomic=\"true\">",
- "atomic":"true",
- "outputs":1,
- "x":857.119026184082,
- "y":853.9999993443489,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "bedc898b.68ec58"
- ]
- ]
- },
- {
- "id":"1974de99.132ea1",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-create",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":1266.119026184082,
- "y":979.9999993443489,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"bedc898b.68ec58",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:network-topology-operation-delete",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":1272.119026184082,
- "y":1062.999999344349,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"67566173.45c4c",
- "type":"switchNode",
- "name":"switch request-action",
- "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
- "comments":"",
- "outputs":1,
- "x":868.3178939819336,
- "y":424.7314217686653,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "18ffc8df.333407",
- "4f680131.8475e"
- ]
- ]
- },
- {
- "id":"18ffc8df.333407",
- "type":"outcome",
- "name":"ActivateDCINetworkInstance",
- "xml":"<outcome value='ActivateDCINetworkInstance'>",
- "comments":"",
- "outputs":1,
- "x":1110.6511611938477,
- "y":346.7312348484993,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "73585281.0c5d0c"
- ]
- ]
- },
- {
- "id":"4f680131.8475e",
- "type":"outcome",
- "name":"other",
- "xml":"<outcome value='other'>",
- "comments":"",
- "outputs":1,
- "x":1040.6511535644531,
- "y":472.3979313969612,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "627cdb56.3b7234"
- ]
- ]
- },
- {
- "id":"73585281.0c5d0c",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":1534.6511764526367,
- "y":346.3981040120125,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"fc61673.76cb698",
- "type":"switchNode",
- "name":"switch request-action",
- "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
- "comments":"",
- "outputs":1,
- "x":1863.333251953125,
- "y":668.3333129882812,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "96fbac31.d3f4f",
- "3bd184d4.cd8cbc"
- ]
- ]
- },
- {
- "id":"96fbac31.d3f4f",
- "type":"outcome",
- "name":"DeActivateDCINetworkInstance",
- "xml":"<outcome value='DeActivateDCINetworkInstance'>",
- "comments":"",
- "outputs":1,
- "x":2133.66650390625,
- "y":678.3332042694092,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "5f435227.66b5dc"
- ]
- ]
- },
- {
- "id":"5f435227.66b5dc",
- "type":"call",
- "name":"call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n",
- "comments":"",
- "outputs":1,
- "x":2608.6667251586914,
- "y":677.0000224113464,
- "z":"d739160d.215ac8",
- "wires":[
- [
-
- ]
- ]
- },
- {
- "id":"3bd184d4.cd8cbc",
- "type":"other",
- "name":"other",
- "xml":"<outcome value='Other'>\n",
- "comments":"",
- "outputs":1,
- "x":2056.3333435058594,
- "y":736.3333549499512,
- "z":"d739160d.215ac8",
- "wires":[
- [
- "d02489f7.8cbe58"
- ]
- ]
- }
+ {
+ "id": "22447bb.ca1b884",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 152.00390625,
+ "y": 98.41365623474121,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "466f0033.35cb7"
+ ]
+ ]
+ },
+ {
+ "id": "466f0033.35cb7",
+ "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": 233.95626831054688,
+ "y": 138.6517686843872,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "72c0d062.bcd76"
+ ]
+ ]
+ },
+ {
+ "id": "72c0d062.bcd76",
+ "type": "method",
+ "name": "network-topology-operation",
+ "xml": "<method rpc='network-topology-operation' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 230.43253326416016,
+ "y": 178.4136505126953,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "eb6b1875.0a05c8"
+ ]
+ ]
+ },
+ {
+ "id": "5bad23a2.6ab6cc",
+ "type": "comment",
+ "name": " NETWORK-TOPOLOGY-OPERATION ",
+ "info": "",
+ "comments": "",
+ "x": 546.348762512207,
+ "y": 46,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "eb6b1875.0a05c8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 266.0039367675781,
+ "y": 261.85713958740234,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "800f4458.13e0e8",
+ "69a90e48.698e4",
+ "5d15a28a.f8b28c",
+ "1c731b73.ad5485"
+ ]
+ ]
+ },
+ {
+ "id": "800f4458.13e0e8",
+ "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": 496.08729553222656,
+ "y": 885.6997756958008,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "69a90e48.698e4",
+ "type": "switchNode",
+ "name": "switch svc-action",
+ "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 492.7181701660156,
+ "y": 492.2708339691162,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "7c51d92d.ac3558",
+ "c0f563da.45066",
+ "bcd7f689.e68068",
+ "a339fa13.cef888",
+ "f32b6746.ab2ac8",
+ "65bec383.089c6c",
+ "13d33f80.29ff51"
+ ]
+ ]
+ },
+ {
+ "id": "7c51d92d.ac3558",
+ "type": "other",
+ "name": "assign",
+ "xml": "<outcome value='assign'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 713.1943664550781,
+ "y": 268.5564842224121,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "9275b2f9.0f7e1"
+ ]
+ ]
+ },
+ {
+ "id": "9275b2f9.0f7e1",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 894.4325256347656,
+ "y": 269.5566062927246,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "325fdcb1.4a6014"
+ ]
+ ]
+ },
+ {
+ "id": "5d15a28a.f8b28c",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:validate-network-input",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 625.0039215087891,
+ "y": 204.41373252868652,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "325fdcb1.4a6014",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-assign",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1253.7816772460938,
+ "y": 189.7470084587112,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "c0f563da.45066",
+ "type": "other",
+ "name": "activate",
+ "xml": "<outcome value='activate'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 715.00390625,
+ "y": 442.4136562347412,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "61d3baaf.004a44"
+ ]
+ ]
+ },
+ {
+ "id": "7e513616.123088",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1252.2420654296875,
+ "y": 439.4138927459717,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "ae258a82.33a2e8",
+ "8bbc4549.c2c348"
+ ]
+ ]
+ },
+ {
+ "id": "7dc76c81.46ae84",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-activate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2297.8134765625,
+ "y": 568.2708282470703,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "bcd7f689.e68068",
+ "type": "other",
+ "name": "deactivate",
+ "xml": "<outcome value='deactivate'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 704.00390625,
+ "y": 602.4136810302734,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "a90bb735.783aa8"
+ ]
+ ]
+ },
+ {
+ "id": "a90bb735.783aa8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 892.2422637939453,
+ "y": 601.4140040278435,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "b5b1cc7d.0a9d8"
+ ]
+ ]
+ },
+ {
+ "id": "483724bf.a7dffc",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-deactivate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2465.8691635131836,
+ "y": 853.131984368898,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "a339fa13.cef888",
+ "type": "other",
+ "name": "unassign",
+ "xml": "<outcome value='unassign'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 712.00390625,
+ "y": 667.4136810302734,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "c4bb456b.36d518"
+ ]
+ ]
+ },
+ {
+ "id": "c4bb456b.36d518",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 893.2420654296875,
+ "y": 668.4138031005859,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "ae258a82.33a2e8",
+ "b9288b8f.f7a128"
+ ]
+ ]
+ },
+ {
+ "id": "545822dc.aecafc",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-unassign",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2040.618911743164,
+ "y": 890.4374882141128,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "f32b6746.ab2ac8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 703.0039100646973,
+ "y": 727.4136714935303,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "43654f47.8db24"
+ ]
+ ]
+ },
+ {
+ "id": "43654f47.8db24",
+ "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": 885.00390625,
+ "y": 726.4136810302734,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "1c731b73.ad5485",
+ "type": "set",
+ "name": "Set final indicator to Y",
+ "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
+ "comments": "",
+ "x": 515.114990234375,
+ "y": 844.8581142425537,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "5f07f64.621f908",
+ "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": 2251.7342681884766,
+ "y": 478.1755828857422,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "bcc0c33e.bd395"
+ ]
+ ]
+ },
+ {
+ "id": "ae258a82.33a2e8",
+ "type": "switchNode",
+ "name": "switch service-data.networks.network_length",
+ "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1558.4483642578125,
+ "y": 437.74696350097656,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "a9e39ffc.d6d6e",
+ "881da1f.33e4b6"
+ ]
+ ]
+ },
+ {
+ "id": "a9e39ffc.d6d6e",
+ "type": "other",
+ "name": "outcome Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1831.4484024047852,
+ "y": 436.7470283508301,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "77cc77c5.b2f928"
+ ]
+ ]
+ },
+ {
+ "id": "881da1f.33e4b6",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1811.4487266540527,
+ "y": 476.74703311920166,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "86bde218.2b981"
+ ]
+ ]
+ },
+ {
+ "id": "bcc0c33e.bd395",
+ "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": 2542.1628189086914,
+ "y": 477.42566680908203,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "7c46a173.c9d7a"
+ ]
+ ]
+ },
+ {
+ "id": "7c46a173.c9d7a",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2731.1151733398438,
+ "y": 478.3184051513672,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "82887486.a7b018"
+ ]
+ ]
+ },
+ {
+ "id": "82887486.a7b018",
+ "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": 2964.646942138672,
+ "y": 477.0684127807617,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "a24ee0c5.d21c5",
+ "type": "comment",
+ "name": "Find the index to service data for this network - save id in tmp.nidx, save service-data",
+ "info": "",
+ "comments": "",
+ "x": 1504.559700012207,
+ "y": 401.74702501296997,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "5e45bf.f8a18a4",
+ "type": "comment",
+ "name": "service-data will not be stored until we have a network-id",
+ "info": "",
+ "comments": "",
+ "x": 1221.4483032226562,
+ "y": 157.96923746261746,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "77cc77c5.b2f928",
+ "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": 1993.2258605957031,
+ "y": 437.63597106933594,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "86bde218.2b981",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1949.7182998657227,
+ "y": 477.301570892334,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "5f07f64.621f908",
+ "385983c7.9f2b7c"
+ ]
+ ]
+ },
+ {
+ "id": "385983c7.9f2b7c",
+ "type": "switchNode",
+ "name": "switch tmp.nidx ",
+ "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2170.0356979370117,
+ "y": 520.1587896347046,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "f85ca643.8fb898"
+ ]
+ ]
+ },
+ {
+ "id": "cdb52735.90dc68",
+ "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": 2522.892681121826,
+ "y": 515.8730316162109,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "f85ca643.8fb898",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2341.4642333984375,
+ "y": 518.7301750183105,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "cdb52735.90dc68"
+ ]
+ ]
+ },
+ {
+ "id": "8bbc4549.c2c348",
+ "type": "switchNode",
+ "name": "switch network-level-oper-status",
+ "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1510.7817077636719,
+ "y": 568.2222290039062,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "6e122dc8.532934",
+ "22b32187.96be8e"
+ ]
+ ]
+ },
+ {
+ "id": "6e122dc8.532934",
+ "type": "outcome",
+ "name": "outcome PendingCreate",
+ "xml": "<outcome value='PendingCreate'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1875.7816874186192,
+ "y": 568.2222137451171,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "7dc76c81.46ae84"
+ ]
+ ]
+ },
+ {
+ "id": "22b32187.96be8e",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1825.7817344665527,
+ "y": 608.2222442626953,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "c7f8345d.b6f678"
+ ]
+ ]
+ },
+ {
+ "id": "c7f8345d.b6f678",
+ "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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+ "comments": "",
+ "x": 1995.7817344665527,
+ "y": 608.2222442626953,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "634dd574.9447fc",
+ "type": "switchNode",
+ "name": "switch network-level-oper-status",
+ "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1243.7500381469727,
+ "y": 794.8403650242835,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "7b4cd5b5.65915c",
+ "e12f8291.e5f2d"
+ ]
+ ]
+ },
+ {
+ "id": "7b4cd5b5.65915c",
+ "type": "outcome",
+ "name": "outcome Created",
+ "xml": "<outcome value='Created'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1595.6388511657715,
+ "y": 789.2848469177261,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "8d2e1f53.0a094"
+ ]
+ ]
+ },
+ {
+ "id": "e12f8291.e5f2d",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1565.6388511657715,
+ "y": 829.2848469177261,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "5b7b9e1a.0f623"
+ ]
+ ]
+ },
+ {
+ "id": "5b7b9e1a.0f623",
+ "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 is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+ "comments": "",
+ "x": 1731.6388511657715,
+ "y": 831.2848469177261,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "b9288b8f.f7a128",
+ "type": "switchNode",
+ "name": "switch network-level-oper-status",
+ "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1247.4402923583984,
+ "y": 892.0416904846206,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "83977ad2.652058",
+ "4164bd1d.d21fe4",
+ "9708ceab.b495d"
+ ]
+ ]
+ },
+ {
+ "id": "83977ad2.652058",
+ "type": "outcome",
+ "name": "outcome PendingCreate",
+ "xml": "<outcome value='PendingCreate'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1607.4402618408203,
+ "y": 892.0417210021988,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "545822dc.aecafc"
+ ]
+ ]
+ },
+ {
+ "id": "4164bd1d.d21fe4",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1564.440200805664,
+ "y": 976.0417362609878,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "73868aa3.1c8774"
+ ]
+ ]
+ },
+ {
+ "id": "73868aa3.1c8774",
+ "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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+ "comments": "",
+ "x": 1755.7736206054688,
+ "y": 974.7083650985733,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "9708ceab.b495d",
+ "type": "outcome",
+ "name": "outcome PendingDelete",
+ "xml": "<outcome value='PendingDelete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1610.6704864501953,
+ "y": 929.8888889709488,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "545822dc.aecafc"
+ ]
+ ]
+ },
+ {
+ "id": "65bec383.089c6c",
+ "type": "other",
+ "name": "create",
+ "xml": "<outcome value='create'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 700.4562683105469,
+ "y": 787,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "854868fb.692c98"
+ ]
+ ]
+ },
+ {
+ "id": "13d33f80.29ff51",
+ "type": "other",
+ "name": "delete",
+ "xml": "<outcome value='delete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 703.4562683105469,
+ "y": 840,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "eefbd503.989fd8"
+ ]
+ ]
+ },
+ {
+ "id": "509a1330.098dbc",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1340.567497253418,
+ "y": 1081.8888937393203,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "fc73b84f.5d78c8"
+ ]
+ ]
+ },
+ {
+ "id": "8263c76f.199698",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1314.0119552612305,
+ "y": 1236.4444319168106,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "bd3a896d.c04468"
+ ]
+ ]
+ },
+ {
+ "id": "fc73b84f.5d78c8",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-create",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1705.2339935302734,
+ "y": 1081.3335157791153,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "bd3a896d.c04468",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:network-topology-operation-delete",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1679.0118789672852,
+ "y": 1235.4443603912368,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "61d3baaf.004a44",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 899.6551361083984,
+ "y": 422.7314224243164,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "a1424008.31d3d",
+ "9be2b7c3.9aa0b8",
+ "9d7d6a23.ac4a28"
+ ]
+ ]
+ },
+ {
+ "id": "a1424008.31d3d",
+ "type": "outcome",
+ "name": "ActivateDCINetworkInstance",
+ "xml": "<outcome value='ActivateDCINetworkInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1141.9884033203125,
+ "y": 344.7312355041504,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "3098b58e.59145a"
+ ]
+ ]
+ },
+ {
+ "id": "9be2b7c3.9aa0b8",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='other'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1071.988395690918,
+ "y": 470.3979320526123,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "7e513616.123088"
+ ]
+ ]
+ },
+ {
+ "id": "3098b58e.59145a",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1565.9884185791016,
+ "y": 342.3981046676636,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "8d2e1f53.0a094",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1870.2261199951172,
+ "y": 787.4444404998794,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "aaaa0d61.3eb52",
+ "65bd4c29.44c284"
+ ]
+ ]
+ },
+ {
+ "id": "aaaa0d61.3eb52",
+ "type": "outcome",
+ "name": "DeActivateDCINetworkInstance",
+ "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 2140.559371948242,
+ "y": 797.4443317810073,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "db97de83.50799"
+ ]
+ ]
+ },
+ {
+ "id": "db97de83.50799",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2615.5595932006836,
+ "y": 796.1111499229446,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "65bd4c29.44c284",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2063.2262115478516,
+ "y": 855.4444824615493,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "483724bf.a7dffc"
+ ]
+ ]
+ },
+ {
+ "id": "9d7d6a23.ac4a28",
+ "type": "outcome",
+ "name": "ActivateSOTNConnectivityInstance",
+ "xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1141.2261047363281,
+ "y": 276.3202238082886,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "a046f39e.31874"
+ ]
+ ]
+ },
+ {
+ "id": "a046f39e.31874",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-activate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1566.4482612609863,
+ "y": 272.5547663131729,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "854868fb.692c98",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 899.7700729370117,
+ "y": 793.7777611175552,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "52fa6311.1fcbbc",
+ "873a6681.0ace38"
+ ]
+ ]
+ },
+ {
+ "id": "52fa6311.1fcbbc",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='other'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1158.7700309753418,
+ "y": 1083.6665073791519,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "509a1330.098dbc"
+ ]
+ ]
+ },
+ {
+ "id": "873a6681.0ace38",
+ "type": "outcome",
+ "name": "CreateSOTNConnectivityInstance",
+ "xml": "<outcome value='CreateSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1226.4368057250977,
+ "y": 1020.4444471755996,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "2beb5ff2.5f47"
+ ]
+ ]
+ },
+ {
+ "id": "2beb5ff2.5f47",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-create",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1705.3256225585938,
+ "y": 1022.6666294494644,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "99f01de7.cef63",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1136.1036529541016,
+ "y": 680.913647309877,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "d8572f1b.9bba2"
+ ]
+ ]
+ },
+ {
+ "id": "eefbd503.989fd8",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 902.7446212768555,
+ "y": 1002.060903207399,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "939da72d.b0ff98",
+ "bda71ad3.e6fc18"
+ ]
+ ]
+ },
+ {
+ "id": "bda71ad3.e6fc18",
+ "type": "outcome",
+ "name": "DeleteSOTNConnectivityInstance",
+ "xml": "<outcome value='DeleteSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1223.855857849121,
+ "y": 1177.6164580741897,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "b6f5f0d5.a2a9f"
+ ]
+ ]
+ },
+ {
+ "id": "b6f5f0d5.a2a9f",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-delete",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1702.7446746826172,
+ "y": 1179.8386403480545,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "939da72d.b0ff98",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='other'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1156.1890830993652,
+ "y": 1240.838518277742,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "8263c76f.199698"
+ ]
+ ]
+ },
+ {
+ "id": "3a846b42.3e5f44",
+ "type": "comment",
+ "name": "SOTN: Activate VPN Instance",
+ "info": "",
+ "comments": "",
+ "x": 1137.1890716552734,
+ "y": 239.22145618591458,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "8bda633.fc2eba",
+ "type": "comment",
+ "name": "SOTN: DeActivate VPN Instance",
+ "info": "",
+ "comments": "",
+ "x": 1676.0778427124023,
+ "y": 653.6658955970779,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "249eb98b.1011c6",
+ "type": "comment",
+ "name": "SOTN: Create VPN Instance",
+ "info": "",
+ "comments": "",
+ "x": 1234.9667892456055,
+ "y": 985.7645775238052,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "1f1ad24f.997f4e",
+ "type": "comment",
+ "name": "SOTN: Delete VPN Instance",
+ "info": "",
+ "comments": "",
+ "x": 1226.0778732299805,
+ "y": 1142.1843162933365,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "b5b1cc7d.0a9d8",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1110.8812065124512,
+ "y": 605.9999634185806,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "a4048448.f587c8",
+ "99f01de7.cef63"
+ ]
+ ]
+ },
+ {
+ "id": "f7556427.fd2d08",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-deactivate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1811.0160217285156,
+ "y": 686.5053612152115,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "a4048448.f587c8",
+ "type": "outcome",
+ "name": "DeactivateSOTNConnectivityInstance",
+ "xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1385.6588706970215,
+ "y": 608.2220562854782,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "f7556427.fd2d08"
+ ]
+ ]
+ },
+ {
+ "id": "d8572f1b.9bba2",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1300.8811264038086,
+ "y": 682.6666122833267,
+ "z": "9e6cde1a.0ef11",
+ "wires": [
+ [
+ "634dd574.9447fc",
+ "ae258a82.33a2e8"
+ ]
+ ]
+ }
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
index 8fa5b0f0..657287ef 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
@@ -1,86 +1,86 @@
[
{
- "id": "c91e9b10.259838",
+ "id": "4ff24108.9f0b9",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 96,
- "y": 42.99996852874756,
- "z": "ea913b4d.eb8638",
+ "x": 110.01040649414062,
+ "y": 84,
+ "z": "7e44475f.b60658",
"wires": [
[
- "38533cf9.2a1214"
+ "49314d16.951114"
]
]
},
{
- "id": "38533cf9.2a1214",
+ "id": "49314d16.951114",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.1-SNAPSHOT",
+ "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='1.2.1-SNAPSHOT'>",
+ "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": 282.00000381469727,
- "y": 114.99998569488525,
- "z": "ea913b4d.eb8638",
+ "x": 296.0104103088379,
+ "y": 156.0000171661377,
+ "z": "7e44475f.b60658",
"wires": [
[
- "39d16e55.9c1d22"
+ "cacaf9a3.ed2eb8"
]
]
},
{
- "id": "39d16e55.9c1d22",
+ "id": "cacaf9a3.ed2eb8",
"type": "method",
"name": "method sotn-network-topology-operation-activate",
"xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 270.0001220703125,
- "y": 202.99996852874756,
- "z": "ea913b4d.eb8638",
+ "x": 284.0105285644531,
+ "y": 244,
+ "z": "7e44475f.b60658",
"wires": [
[
- "4519115b.490c9"
+ "6fc16268.2c373c"
]
]
},
{
- "id": "4519115b.490c9",
+ "id": "6fc16268.2c373c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 444.00001525878906,
- "y": 311.0000276565552,
- "z": "ea913b4d.eb8638",
+ "x": 458.0104217529297,
+ "y": 352.0000591278076,
+ "z": "7e44475f.b60658",
"wires": [
[
- "dfb7f2ca.a1635",
- "d89e17e8.bd1698",
- "d5e8e338.ac641",
- "604990bf.defe7",
- "b18a2025.dcb34",
- "9bb8612f.5c571",
- "c3e1900f.1a37e",
- "18e80a8f.69f565"
+ "f31091a3.27362",
+ "15ed0f21.483631",
+ "b7e9a733.12c248",
+ "739286aa.7b5518",
+ "fc03b474.733c48",
+ "8ec0cdeb.99354",
+ "4aa12b59.10e594",
+ "cdb930eb.4db64"
]
]
},
{
- "id": "dfb7f2ca.a1635",
+ "id": "f31091a3.27362",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 902.3889007568359,
- "y": 59.99996852874756,
- "z": "ea913b4d.eb8638",
+ "x": 916.3993072509766,
+ "y": 101,
+ "z": "7e44475f.b60658",
"wires": [
[
@@ -88,15 +88,15 @@
]
},
{
- "id": "d89e17e8.bd1698",
+ "id": "15ed0f21.483631",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Activate\"/>\n",
"comments": "",
"outputs": 1,
- "x": 702.5555992126465,
- "y": 113.77782154083252,
- "z": "ea913b4d.eb8638",
+ "x": 716.5660057067871,
+ "y": 154.77785301208496,
+ "z": "7e44475f.b60658",
"wires": [
[
@@ -104,54 +104,54 @@
]
},
{
- "id": "d5e8e338.ac641",
+ "id": "b7e9a733.12c248",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` \" />",
"comments": "",
- "x": 793.5556488037109,
- "y": 302.3132629394531,
- "z": "ea913b4d.eb8638",
+ "x": 807.5660552978516,
+ "y": 343.31329441070557,
+ "z": "7e44475f.b60658",
"wires": [
]
},
{
- "id": "604990bf.defe7",
+ "id": "739286aa.7b5518",
"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": 715.3334503173828,
- "y": 491.8686828613281,
- "z": "ea913b4d.eb8638",
+ "x": 729.3438568115234,
+ "y": 532.8687143325806,
+ "z": "7e44475f.b60658",
"wires": [
]
},
{
- "id": "b18a2025.dcb34",
+ "id": "fc03b474.733c48",
"type": "set",
"name": "set network-level-oper-status",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
"comments": "",
- "x": 760.4445648193359,
- "y": 363.53543758392334,
- "z": "ea913b4d.eb8638",
+ "x": 774.4549713134766,
+ "y": 404.5354690551758,
+ "z": "7e44475f.b60658",
"wires": [
]
},
{
- "id": "9bb8612f.5c571",
+ "id": "8ec0cdeb.99354",
"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": 734.8577041625977,
- "y": 166.77785778045654,
- "z": "ea913b4d.eb8638",
+ "x": 748.8681106567383,
+ "y": 207.77788925170898,
+ "z": "7e44475f.b60658",
"wires": [
[
@@ -159,15 +159,15 @@
]
},
{
- "id": "c3e1900f.1a37e",
+ "id": "4aa12b59.10e594",
"type": "update",
"name": "update SOTN Connectivity status to AAI",
"xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />",
"comments": "",
"outputs": 1,
- "x": 794.6631469726562,
- "y": 423.23862648010254,
- "z": "ea913b4d.eb8638",
+ "x": 808.6735534667969,
+ "y": 464.238657951355,
+ "z": "7e44475f.b60658",
"wires": [
[
@@ -175,27 +175,27 @@
]
},
{
- "id": "18e80a8f.69f565",
+ "id": "cdb930eb.4db64",
"type": "set",
"name": "set network in service-data",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
"comments": "",
- "x": 757.0001220703125,
- "y": 234.09102249145508,
- "z": "ea913b4d.eb8638",
+ "x": 771.0105285644531,
+ "y": 275.0910539627075,
+ "z": "7e44475f.b60658",
"wires": [
]
},
{
- "id": "bd8b5b43.6b8768",
+ "id": "c713ecf7.ea914",
"type": "comment",
"name": "TODO MP2MP",
"info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
"comments": "",
- "x": 982.03125,
- "y": 157.03124904632568,
- "z": "ea913b4d.eb8638",
+ "x": 996.0416564941406,
+ "y": 198.03128051757812,
+ "z": "7e44475f.b60658",
"wires": [
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 9559f36f..3c9c95ff 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,91 +1,90 @@
[
{
- "id": "11760114.ffa53f",
+ "id": "139a6e7f.35f132",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 109,
- "y": 68.88888743473217,
- "z": "f3682574.cde048",
+ "x": 103.01040649414062,
+ "y": 78.2888806159608,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "387ea19.1ea525e"
+ "5165cd92.df7bd4"
]
]
},
{
- "id": "387ea19.1ea525e",
+ "id": "5165cd92.df7bd4",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.1-SNAPSHOT",
+ "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='1.2.1-SNAPSHOT'>",
+ "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": 363.5,
- "y": 68.88888743473217,
- "z": "f3682574.cde048",
+ "x": 357.5104064941406,
+ "y": 78.2888806159608,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "acc8b788.ec53d8"
+ "a7444b33.7d1f48"
]
]
},
{
- "id": "acc8b788.ec53d8",
+ "id": "a7444b33.7d1f48",
"type": "method",
"name": "sotn-network-topology-operation-create",
"xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 362.5,
- "y": 168.88888743473217,
- "z": "f3682574.cde048",
+ "x": 356.5104064941406,
+ "y": 178.2888806159608,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "34953ba0.309594"
+ "a19a8247.a1622"
]
]
},
{
- "id": "34953ba0.309594",
+ "id": "a19a8247.a1622",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 502.5,
- "y": 268.88888743473217,
- "z": "f3682574.cde048",
+ "x": 496.5104064941406,
+ "y": 278.2888806159608,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "7388dbd6.e4b144",
- "eb46e056.51069",
- "27c87a61.1820b6",
- "1c8ab342.be0a1d",
- "f72cb383.b1b6",
- "a36220a4.22926",
- "a70fe000.5399c",
- "47a1000.3ac09",
- "edce49a.1c028b8",
- "1f8a7b8b.e596a4",
- "68c583ec.0ea75c",
- "1522718b.801dfe",
- "e184926f.0ad08"
+ "9690673f.c35c38",
+ "9090896d.431318",
+ "1b9ab03d.d8994",
+ "611901b5.6b6e9",
+ "64f0eb98.ddb424",
+ "22fd42de.86c53e",
+ "cc42b05c.ab9b4",
+ "b37c9027.58eb3",
+ "3085f08f.eacbb",
+ "27379959.fccb76",
+ "2ad70cde.edce44",
+ "3e882683.7d50ea"
]
]
},
{
- "id": "7388dbd6.e4b144",
+ "id": "9690673f.c35c38",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 932.5000114440918,
- "y": 86.66663935733959,
- "z": "f3682574.cde048",
+ "x": 926.5104179382324,
+ "y": 96.06663253856823,
+ "z": "13b9846a.014e4c",
"wires": [
[
@@ -93,15 +92,15 @@
]
},
{
- "id": "eb46e056.51069",
+ "id": "9090896d.431318",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
"comments": "",
"outputs": 1,
- "x": 726.0556564331055,
- "y": 264.11109924316406,
- "z": "f3682574.cde048",
+ "x": 720.0660629272461,
+ "y": 273.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
[
@@ -109,15 +108,15 @@
]
},
{
- "id": "27c87a61.1820b6",
+ "id": "1b9ab03d.d8994",
"type": "execute",
"name": "execute generate-sotn-vpn-network-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 826.5000114440918,
- "y": 126.66663935733959,
- "z": "f3682574.cde048",
+ "x": 820.5104179382324,
+ "y": 136.06663253856823,
+ "z": "13b9846a.014e4c",
"wires": [
[
@@ -125,142 +124,142 @@
]
},
{
- "id": "1c8ab342.be0a1d",
+ "id": "611901b5.6b6e9",
"type": "switchNode",
"name": "switch service-data.networks_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 817.0556564331055,
- "y": 224.11109924316406,
- "z": "f3682574.cde048",
+ "x": 811.0660629272461,
+ "y": 233.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "c1b6935.5afba7",
- "33b11f83.270c2"
+ "6504f13e.cb942",
+ "f06b01d1.5ae64"
]
]
},
{
- "id": "c1b6935.5afba7",
+ "id": "6504f13e.cb942",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1046.0556564331055,
- "y": 204.11109924316406,
- "z": "f3682574.cde048",
+ "x": 1040.066062927246,
+ "y": 213.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "50a80e72.5fa1f"
+ "80cc460d.6062a8"
]
]
},
{
- "id": "33b11f83.270c2",
+ "id": "f06b01d1.5ae64",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1046.0556564331055,
- "y": 244.11109924316406,
- "z": "f3682574.cde048",
+ "x": 1040.066062927246,
+ "y": 253.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "683104fc.0cc2bc"
+ "cc9b4b29.340cf8"
]
]
},
{
- "id": "50a80e72.5fa1f",
+ "id": "80cc460d.6062a8",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='0' />\n",
"comments": "",
- "x": 1188.5556564331055,
- "y": 204.11109924316406,
- "z": "f3682574.cde048",
+ "x": 1182.566062927246,
+ "y": 213.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "4bd2e74.8492e18",
+ "id": "8ea707fc.e9fc98",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
"comments": "",
- "x": 1322.1111755371094,
- "y": 205.66670894622803,
- "z": "f3682574.cde048",
+ "x": 1316.12158203125,
+ "y": 215.06670212745667,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "f72cb383.b1b6",
+ "id": "64f0eb98.ddb424",
"type": "set",
"name": "set network in service-data",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name='service-data.networks.network_length' value='`$nidx+1`' />\n\n",
"comments": "",
- "x": 787.5556564331055,
- "y": 304.11109924316406,
- "z": "f3682574.cde048",
+ "x": 781.5660629272461,
+ "y": 313.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "a36220a4.22926",
+ "id": "22fd42de.86c53e",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />",
"comments": "",
- "x": 823.0556564331055,
- "y": 344.11109924316406,
- "z": "f3682574.cde048",
+ "x": 817.0660629272461,
+ "y": 353.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "a70fe000.5399c",
+ "id": "cc42b05c.ab9b4",
"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": 749.7224502563477,
- "y": 596.7778205871582,
- "z": "f3682574.cde048",
+ "x": 743.7329025268555,
+ "y": 580.1777954101562,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "47a1000.3ac09",
+ "id": "b37c9027.58eb3",
"type": "set",
"name": "set network-level-oper-status",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
"comments": "",
- "x": 794.5556564331055,
- "y": 384.11109924316406,
- "z": "f3682574.cde048",
+ "x": 788.5660629272461,
+ "y": 393.5110924243927,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "edce49a.1c028b8",
+ "id": "3085f08f.eacbb",
"type": "save",
"name": "save SOTN connectivity resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $prop.sotn.network-id' >\n<parameter name='configuration-id' value='`$prop.sotn.network-id`' />\n<parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />\n<parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />\n<parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />\n<parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />\n<parameter name='management-option' value='`$prop.sotn.cir`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />",
"comments": "",
"outputs": 1,
- "x": 827.0556564331055,
- "y": 430.77778816223145,
- "z": "f3682574.cde048",
+ "x": 821.0660629272461,
+ "y": 440.1777813434601,
+ "z": "13b9846a.014e4c",
"wires": [
[
@@ -268,15 +267,15 @@
]
},
{
- "id": "1f8a7b8b.e596a4",
+ "id": "27379959.fccb76",
"type": "save",
"name": "save service relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 802.0556678771973,
- "y": 468.55554008483887,
- "z": "f3682574.cde048",
+ "x": 796.0660743713379,
+ "y": 477.9555332660675,
+ "z": "13b9846a.014e4c",
"wires": [
[
@@ -284,903 +283,887 @@
]
},
{
- "id": "b85378f.1752188",
+ "id": "56dd0abe.1511b4",
"type": "for",
"name": "for each existing network",
"xml": "<for index='idx' start='0' end='`$nidx`' >\n",
"comments": "",
"outputs": 1,
- "x": 1191.5397186279297,
- "y": 348.8888511364348,
- "z": "f3682574.cde048",
+ "x": 1185.5501251220703,
+ "y": 358.28884431766346,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "ad3781e0.62cbe"
+ "a637d096.3728c"
]
]
},
{
- "id": "683104fc.0cc2bc",
+ "id": "cc9b4b29.340cf8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1190.4127006530762,
- "y": 244.04761123657227,
- "z": "f3682574.cde048",
+ "x": 1184.4231071472168,
+ "y": 253.4476044178009,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "b85378f.1752188",
- "4bd2e74.8492e18"
+ "56dd0abe.1511b4",
+ "8ea707fc.e9fc98"
]
]
},
{
- "id": "ad3781e0.62cbe",
+ "id": "a637d096.3728c",
"type": "switchNode",
"name": "switch networkid found",
"xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1466.825439453125,
- "y": 348.4603538219817,
- "z": "f3682574.cde048",
+ "x": 1460.8358459472656,
+ "y": 357.86034700321034,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "30f1f431.08877c"
+ "29edb34.33bc74c"
]
]
},
{
- "id": "30f1f431.08877c",
+ "id": "29edb34.33bc74c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1367.5556373596191,
- "y": 407.03178498195484,
- "z": "f3682574.cde048",
+ "x": 1361.5660438537598,
+ "y": 416.4317781631835,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "1df899ae.3b8026"
+ "fb222058.5489a"
]
]
},
{
- "id": "3a07954a.fda22a",
+ "id": "e2502908.30a4f8",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1415.1904487609863,
- "y": 307.142908543814,
- "z": "f3682574.cde048",
+ "x": 1409.200855255127,
+ "y": 316.5429017250426,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "1df899ae.3b8026",
+ "id": "fb222058.5489a",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id already found in service-data\" />\n",
"comments": "",
- "x": 1515.3057403564453,
- "y": 406.88897705078125,
- "z": "f3682574.cde048",
+ "x": 1509.316146850586,
+ "y": 416.2889702320099,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "1eccb58d.49bd0a",
+ "id": "5c98a39b.1a248c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1481.957233428955,
- "y": 176.6666965484619,
- "z": "f3682574.cde048",
+ "x": 1475.9676399230957,
+ "y": 186.06668972969055,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "39c25585.35095a",
- "f63e13ae.1ca36",
- "b990d7b7.d50db8",
- "84319a02.cc83c8",
- "fd903008.4e1c6",
- "64b1c8e5.3ad178",
- "c55257d1.2dce08",
- "70e3ab9b.3b6ef4",
- "f11487f.1a2d778",
- "f273d999.226da8",
- "e251bd6c.23dfe",
- "f51170c3.6db7",
- "ba516d92.f632",
- "fe52bad5.770908",
- "b3759567.fa1fc8",
- "a9128726.ee25b8"
+ "eb10737a.973ea",
+ "20241118.87993e",
+ "8f9a601f.f6c31",
+ "2f4693cf.5c48bc",
+ "a92d3efb.9a862",
+ "8921689e.0cc458",
+ "23d4de8a.cdb1a2",
+ "c9294e5e.af421",
+ "f05d31ef.6d9f2",
+ "3ac5e719.7cdd08",
+ "36127ed4.d4df92",
+ "f5195bd8.3c84a8",
+ "ef3f5059.2d4ea",
+ "cd1b68b3.245ce8",
+ "43611249.362dac",
+ "c4de2cef.1053e"
]
]
},
{
- "id": "39c25585.35095a",
+ "id": "eb10737a.973ea",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1740.1789779663086,
- "y": 34,
- "z": "f3682574.cde048",
+ "x": 1734.1893844604492,
+ "y": 43.39999318122864,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "be03b2cc.d65d1"
+ "d0562182.0b394"
]
]
},
{
- "id": "be03b2cc.d65d1",
+ "id": "d0562182.0b394",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1927.1789779663086,
- "y": 30,
- "z": "f3682574.cde048",
+ "x": 1921.1893844604492,
+ "y": 39.39999318122864,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "904307f9.4f4248"
+ "85ea5b3a.80fc78"
]
]
},
{
- "id": "904307f9.4f4248",
+ "id": "85ea5b3a.80fc78",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2077.1791076660156,
- "y": 28.600006580352783,
- "z": "f3682574.cde048",
+ "x": 2071.1895141601562,
+ "y": 37.99999976158142,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "f63e13ae.1ca36",
+ "id": "20241118.87993e",
"type": "switchNode",
"name": "switch description",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1751.0186386108398,
- "y": 73.99999809265137,
- "z": "f3682574.cde048",
+ "x": 1745.0290451049805,
+ "y": 83.39999127388,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "2d5d0686.3b5eba"
+ "aec8775b.d30d08"
]
]
},
{
- "id": "2d5d0686.3b5eba",
+ "id": "aec8775b.d30d08",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1921.0186386108398,
- "y": 69.99999809265137,
- "z": "f3682574.cde048",
+ "x": 1915.0290451049805,
+ "y": 79.39999127388,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "8eefd68e.fffed8"
+ "6a968958.282fd8"
]
]
},
{
- "id": "8eefd68e.fffed8",
+ "id": "6a968958.282fd8",
"type": "set",
"name": "set etht-svc-descr",
"xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2108.3520793914795,
- "y": 68.46115493774414,
- "z": "f3682574.cde048",
+ "x": 2102.36248588562,
+ "y": 77.86114811897278,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "68c583ec.0ea75c",
+ "id": "2ad70cde.edce44",
"type": "for",
"name": "for loop i - Network input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 819.7343978881836,
- "y": 174.44442749023438,
- "z": "f3682574.cde048",
+ "x": 813.7448043823242,
+ "y": 183.844420671463,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "1eccb58d.49bd0a"
+ "5c98a39b.1a248c"
]
]
},
{
- "id": "b990d7b7.d50db8",
+ "id": "8f9a601f.f6c31",
"type": "switchNode",
"name": "switch tenantId",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1741.4010200500488,
- "y": 117.33332538604736,
- "z": "f3682574.cde048",
+ "x": 1735.4114265441895,
+ "y": 126.733318567276,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "d96e6910.7c5ce8"
+ "bc2214ce.6d70f8"
]
]
},
{
- "id": "d96e6910.7c5ce8",
+ "id": "bc2214ce.6d70f8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1928.4010200500488,
- "y": 113.33332538604736,
- "z": "f3682574.cde048",
+ "x": 1922.4114265441895,
+ "y": 122.733318567276,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "5b48eb71.3d5864"
+ "46fa1cce.7d92e4"
]
]
},
{
- "id": "5b48eb71.3d5864",
+ "id": "46fa1cce.7d92e4",
"type": "set",
"name": "set tenantId",
"xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2096.401020050049,
- "y": 113.93333148956299,
- "z": "f3682574.cde048",
+ "x": 2090.4114265441895,
+ "y": 123.33332467079163,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "84319a02.cc83c8",
+ "id": "2f4693cf.5c48bc",
"type": "switchNode",
"name": "switch CIR",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1723.2406768798828,
- "y": 207.33338356018066,
- "z": "f3682574.cde048",
+ "x": 1717.2510833740234,
+ "y": 216.7333767414093,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "c1cdced0.80842"
+ "6dc3af21.b1bfa"
]
]
},
{
- "id": "c1cdced0.80842",
+ "id": "6dc3af21.b1bfa",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1931.2407455444336,
- "y": 203.3333969116211,
- "z": "f3682574.cde048",
+ "x": 1925.2511520385742,
+ "y": 212.73339009284973,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "bcbc8704.d57d08"
+ "8bfeab9d.acab98"
]
]
},
{
- "id": "bcbc8704.d57d08",
+ "id": "8bfeab9d.acab98",
"type": "set",
"name": "set cir",
"xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2080.5740661621094,
- "y": 201.7945442199707,
- "z": "f3682574.cde048",
+ "x": 2074.58447265625,
+ "y": 211.19453740119934,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "fd903008.4e1c6",
+ "id": "a92d3efb.9a862",
"type": "switchNode",
"name": "switch vpnType",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1742.5491485595703,
- "y": 161.11110258102417,
- "z": "f3682574.cde048",
+ "x": 1736.559555053711,
+ "y": 170.5110957622528,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "25a34a38.dcc406"
+ "4f2e612c.866ed"
]
]
},
{
- "id": "25a34a38.dcc406",
+ "id": "4f2e612c.866ed",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1929.5491485595703,
- "y": 157.11110258102417,
- "z": "f3682574.cde048",
+ "x": 1923.559555053711,
+ "y": 166.5110957622528,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "fc6be9bd.f8dd28"
+ "a5f469fe.1f7fb8"
]
]
},
{
- "id": "fc6be9bd.f8dd28",
+ "id": "a5f469fe.1f7fb8",
"type": "set",
"name": "set vpnType",
"xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2098.882781982422,
- "y": 154.57226753234863,
- "z": "f3682574.cde048",
+ "x": 2092.8931884765625,
+ "y": 163.97226071357727,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "64b1c8e5.3ad178",
+ "id": "8921689e.0cc458",
"type": "switchNode",
"name": "switch access-provider-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1764.0307846069336,
- "y": 483.55562114715576,
- "z": "f3682574.cde048",
+ "x": 1758.0411911010742,
+ "y": 492.9556143283844,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "d7282d61.ab2dc"
+ "db262e87.3b64a"
]
]
},
{
- "id": "c55257d1.2dce08",
+ "id": "23d4de8a.cdb1a2",
"type": "switchNode",
"name": "switch access-client-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1756.5862655639648,
- "y": 528.8889503479004,
- "z": "f3682574.cde048",
+ "x": 1750.5966720581055,
+ "y": 538.288943529129,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "3e5c147b.b1e80c"
+ "fd7a8c1c.3cc36"
]
]
},
{
- "id": "70e3ab9b.3b6ef4",
+ "id": "c9294e5e.af421",
"type": "switchNode",
"name": "switch access-topology-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1761.0307235717773,
- "y": 567.7778358459473,
- "z": "f3682574.cde048",
+ "x": 1755.041130065918,
+ "y": 577.1778290271759,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "733a89f7.791ab8"
+ "131fe813.7d7c68"
]
]
},
{
- "id": "d7282d61.ab2dc",
+ "id": "db262e87.3b64a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1948.0307846069336,
- "y": 482.5556364059448,
- "z": "f3682574.cde048",
+ "x": 1942.0411911010742,
+ "y": 491.95562958717346,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "bf6a3d1f.8cbc"
+ "34d62c4c.27c844"
]
]
},
{
- "id": "3e5c147b.b1e80c",
+ "id": "fd7a8c1c.3cc36",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1943.5862655639648,
- "y": 524.8889503479004,
- "z": "f3682574.cde048",
+ "x": 1937.5966720581055,
+ "y": 534.288943529129,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "eae17cc1.2b92b"
+ "98f0aeff.0649d"
]
]
},
{
- "id": "733a89f7.791ab8",
+ "id": "131fe813.7d7c68",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1948.0307235717773,
- "y": 563.7778358459473,
- "z": "f3682574.cde048",
+ "x": 1942.041130065918,
+ "y": 573.1778290271759,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "bf2ad720.26e6f8"
+ "7da4534a.aa3dbc"
]
]
},
{
- "id": "bf6a3d1f.8cbc",
+ "id": "34d62c4c.27c844",
"type": "set",
"name": "set access-provider-id",
"xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2131.253143310547,
- "y": 481.66682052612305,
- "z": "f3682574.cde048",
+ "x": 2125.2635498046875,
+ "y": 491.0668137073517,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "eae17cc1.2b92b",
+ "id": "98f0aeff.0649d",
"type": "set",
"name": "set access-client-id",
"xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2120.1421813964844,
- "y": 522.8994269371033,
- "z": "f3682574.cde048",
+ "x": 2114.152587890625,
+ "y": 532.2994201183319,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "bf2ad720.26e6f8",
+ "id": "7da4534a.aa3dbc",
"type": "set",
"name": "set access-topology-id",
"xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2130.0310974121094,
- "y": 561.7882833480835,
- "z": "f3682574.cde048",
+ "x": 2124.04150390625,
+ "y": 571.1882765293121,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "f11487f.1a2d778",
+ "id": "f05d31ef.6d9f2",
"type": "switchNode",
"name": "switch access-node-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1761.8454818725586,
- "y": 614.4444794654846,
- "z": "f3682574.cde048",
+ "x": 1755.8558883666992,
+ "y": 623.8444726467133,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "3f7939dd.f6bad6"
+ "b31c7b7f.9ced68"
]
]
},
{
- "id": "3f7939dd.f6bad6",
+ "id": "b31c7b7f.9ced68",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1948.8454818725586,
- "y": 610.4444794654846,
- "z": "f3682574.cde048",
+ "x": 1942.8558883666992,
+ "y": 619.8444726467133,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "36806cf5.900574"
+ "76abc59c.8e0adc"
]
]
},
{
- "id": "f273d999.226da8",
+ "id": "3ac5e719.7cdd08",
"type": "switchNode",
"name": "switch access-ltp-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1758.6232528686523,
- "y": 656.8889560699463,
- "z": "f3682574.cde048",
+ "x": 1752.633659362793,
+ "y": 666.2889492511749,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "dd2b85b9.e6ec48"
+ "848bd038.a1fd2"
]
]
},
{
- "id": "dd2b85b9.e6ec48",
+ "id": "848bd038.a1fd2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1945.6232528686523,
- "y": 652.8889560699463,
- "z": "f3682574.cde048",
+ "x": 1939.633659362793,
+ "y": 662.2889492511749,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "7e4475d7.79ec8c"
+ "33b13d79.1d69b2"
]
]
},
{
- "id": "36806cf5.900574",
+ "id": "76abc59c.8e0adc",
"type": "set",
"name": "set access-node-id",
"xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2120.8457946777344,
- "y": 609.1216135025024,
- "z": "f3682574.cde048",
+ "x": 2114.856201171875,
+ "y": 618.5216066837311,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "7e4475d7.79ec8c",
+ "id": "33b13d79.1d69b2",
"type": "set",
"name": "set access-ltp-id",
"xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2111.2899475097656,
- "y": 651.8993854522705,
- "z": "f3682574.cde048",
+ "x": 2105.3003540039062,
+ "y": 661.2993786334991,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "1522718b.801dfe",
- "type": "save",
- "name": "save srcLTP relationship in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration:relationship-list' \n key='configuration.configuration-id = $prop.sotn.network-id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-src-ltpId`\" />",
- "comments": "",
- "outputs": 1,
- "x": 800.1047744750977,
- "y": 553.5184006690979,
- "z": "f3682574.cde048",
- "wires": [
- [
-
- ]
- ]
- },
- {
- "id": "e184926f.0ad08",
+ "id": "3e882683.7d50ea",
"type": "set",
"name": "set unique-src-ltpId",
"xml": "<set>\n<parameter name='unique-src-ltpId' value=\"`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`\" />",
"comments": "",
- "x": 764.6603622436523,
- "y": 515.9999980926514,
- "z": "f3682574.cde048",
+ "x": 758.670768737793,
+ "y": 525.39999127388,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "e251bd6c.23dfe",
+ "id": "36127ed4.d4df92",
"type": "switchNode",
"name": "switch EIR",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1724.5311279296875,
- "y": 250.03125,
- "z": "f3682574.cde048",
+ "x": 1718.5415344238281,
+ "y": 259.43124318122864,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "8810ee0c.a4e38"
+ "f8180ca.c5aedf"
]
]
},
{
- "id": "8810ee0c.a4e38",
+ "id": "f8180ca.c5aedf",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1926.5310897827148,
- "y": 245.03127002716064,
- "z": "f3682574.cde048",
+ "x": 1920.5414962768555,
+ "y": 254.43126320838928,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "1e197aec.8afff5"
+ "5b0895e4.66408c"
]
]
},
{
- "id": "1e197aec.8afff5",
+ "id": "5b0895e4.66408c",
"type": "set",
"name": "set eir",
"xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2082.8645935058594,
- "y": 244.49240589141846,
- "z": "f3682574.cde048",
+ "x": 2076.875,
+ "y": 253.8923990726471,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "f51170c3.6db7",
+ "id": "f5195bd8.3c84a8",
"type": "switchNode",
"name": "switch CBS",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1724.5311279296875,
- "y": 299.03125,
- "z": "f3682574.cde048",
+ "x": 1718.5415344238281,
+ "y": 308.43124318122864,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "49df64ea.07087c"
+ "c725a9a8.031f88"
]
]
},
{
- "id": "49df64ea.07087c",
+ "id": "c725a9a8.031f88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1923.5310897827148,
- "y": 295.0312566757202,
- "z": "f3682574.cde048",
+ "x": 1917.5414962768555,
+ "y": 304.43124985694885,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "386c9243.097e5e"
+ "9ce1ba29.f6ec68"
]
]
},
{
- "id": "386c9243.097e5e",
+ "id": "9ce1ba29.f6ec68",
"type": "set",
"name": "set cbs",
"xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2081.8646545410156,
- "y": 293.49241638183594,
- "z": "f3682574.cde048",
+ "x": 2075.8750610351562,
+ "y": 302.8924095630646,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "ba516d92.f632",
+ "id": "ef3f5059.2d4ea",
"type": "switchNode",
"name": "switch PBS",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1724.5311279296875,
- "y": 344.03125,
- "z": "f3682574.cde048",
+ "x": 1718.5415344238281,
+ "y": 353.43124318122864,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "9ac50dab.4fbde"
+ "205ee4a2.b994ec"
]
]
},
{
- "id": "9ac50dab.4fbde",
+ "id": "205ee4a2.b994ec",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1923.5310897827148,
- "y": 337.03125762939453,
- "z": "f3682574.cde048",
+ "x": 1917.5414962768555,
+ "y": 346.43125081062317,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "fcfbd737.d83c58"
+ "547b372e.cb4fb8"
]
]
},
{
- "id": "fcfbd737.d83c58",
+ "id": "547b372e.cb4fb8",
"type": "set",
"name": "set pbs",
"xml": "<set>\n<parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2084.8646545410156,
- "y": 338.49241638183594,
- "z": "f3682574.cde048",
+ "x": 2078.8750610351562,
+ "y": 347.8924095630646,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "fe52bad5.770908",
+ "id": "cd1b68b3.245ce8",
"type": "switchNode",
"name": "switch color-aware",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1746.5312118530273,
- "y": 391.0312671661377,
- "z": "f3682574.cde048",
+ "x": 1740.541618347168,
+ "y": 400.43126034736633,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "bccb8e92.0b5c7"
+ "5d9f9f32.e6f9f"
]
]
},
{
- "id": "bccb8e92.0b5c7",
+ "id": "5d9f9f32.e6f9f",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1924.5312156677246,
- "y": 385.03125953674316,
- "z": "f3682574.cde048",
+ "x": 1918.5416221618652,
+ "y": 394.4312527179718,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "e228c0d1.eaf54"
+ "38ebf92a.f170a6"
]
]
},
{
- "id": "e228c0d1.eaf54",
+ "id": "38ebf92a.f170a6",
"type": "set",
"name": "set colorAware",
"xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2105.8645935058594,
- "y": 384.49241828918457,
- "z": "f3682574.cde048",
+ "x": 2099.875,
+ "y": 393.8924114704132,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "b3759567.fa1fc8",
+ "id": "43611249.362dac",
"type": "switchNode",
"name": "switch coupling-flag",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1746.5312194824219,
- "y": 437.0312919616699,
- "z": "f3682574.cde048",
+ "x": 1740.5416259765625,
+ "y": 446.43128514289856,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "a4cdcb3.5f83638"
+ "bd25ef93.0d4f4"
]
]
},
{
- "id": "a4cdcb3.5f83638",
+ "id": "bd25ef93.0d4f4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1924.5312118530273,
- "y": 429.0312604904175,
- "z": "f3682574.cde048",
+ "x": 1918.541618347168,
+ "y": 438.4312536716461,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "6e47434b.16603c"
+ "fd007702.45b298"
]
]
},
{
- "id": "6e47434b.16603c",
+ "id": "fd007702.45b298",
"type": "set",
"name": "set couplingFlag",
"xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2109.8645935058594,
- "y": 429.4924430847168,
- "z": "f3682574.cde048",
+ "x": 2103.875,
+ "y": 438.89243626594543,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "a9128726.ee25b8",
+ "id": "c4de2cef.1053e",
"type": "switchNode",
"name": "switch cVLAN",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1737.5311584472656,
- "y": 702.0312995910645,
- "z": "f3682574.cde048",
+ "x": 1731.5415649414062,
+ "y": 711.4312927722931,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "1ad6eb3c.320b35"
+ "2a41f958.80fe56"
]
]
},
{
- "id": "1ad6eb3c.320b35",
+ "id": "2a41f958.80fe56",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1942.5311279296875,
- "y": 703.03125,
- "z": "f3682574.cde048",
+ "x": 1936.5415344238281,
+ "y": 712.4312431812286,
+ "z": "13b9846a.014e4c",
"wires": [
[
- "9dd46589.0d0a48"
+ "3e76d5dc.97935a"
]
]
},
{
- "id": "9dd46589.0d0a48",
+ "id": "3e76d5dc.97935a",
"type": "set",
"name": "set cVLAN",
"xml": "<set>\n<parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2096.197967529297,
- "y": 702.0417213439941,
- "z": "f3682574.cde048",
+ "x": 2090.2083740234375,
+ "y": 711.4417145252228,
+ "z": "13b9846a.014e4c",
"wires": [
]
},
{
- "id": "b152e598.bced08",
+ "id": "97828cf6.96e35",
"type": "comment",
"name": "TODO: Recheck AAI schemas",
"info": "",
"comments": "",
- "x": 791.0312805175781,
- "y": 33.03132629394531,
- "z": "f3682574.cde048",
+ "x": 785.0416870117188,
+ "y": 42.43131947517395,
+ "z": "13b9846a.014e4c",
"wires": [
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
index 4751238e..7c4dec42 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
@@ -1,86 +1,86 @@
[
{
- "id": "e417c255.55168",
+ "id": "dbfbe99b.e9cbe8",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 97,
- "y": 58.666653633117676,
- "z": "a60e1b2.0e00ee8",
+ "x": 116.01040649414062,
+ "y": 44.666656255722046,
+ "z": "25c39c60.9e5894",
"wires": [
[
- "7ab6ef86.3029d"
+ "23197697.79faaa"
]
]
},
{
- "id": "7ab6ef86.3029d",
+ "id": "23197697.79faaa",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.1-SNAPSHOT",
+ "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='1.2.1-SNAPSHOT'>",
+ "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": 253.00000381469727,
- "y": 149.66667556762695,
- "z": "a60e1b2.0e00ee8",
+ "x": 272.0104103088379,
+ "y": 135.66667819023132,
+ "z": "25c39c60.9e5894",
"wires": [
[
- "2feb52d2.f795ee"
+ "f4094d1c.b6791"
]
]
},
{
- "id": "2feb52d2.f795ee",
+ "id": "f4094d1c.b6791",
"type": "method",
"name": "method sotn-network-topology-operation-deactivate",
"xml": "<method rpc='sotn-network-topology-operation-deactivate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 241.0001220703125,
- "y": 237.66665840148926,
- "z": "a60e1b2.0e00ee8",
+ "x": 260.0105285644531,
+ "y": 223.66666102409363,
+ "z": "25c39c60.9e5894",
"wires": [
[
- "3f213c21.d34564"
+ "8b588587.07d838"
]
]
},
{
- "id": "3f213c21.d34564",
+ "id": "8b588587.07d838",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 464.0000762939453,
- "y": 309.6667318344116,
- "z": "a60e1b2.0e00ee8",
+ "x": 483.01048278808594,
+ "y": 295.666734457016,
+ "z": "25c39c60.9e5894",
"wires": [
[
- "9aa8fa45.2b1e08",
- "f32a24c6.dffed8",
- "27480d76.5a34a2",
- "ca91a3af.46939",
- "616e31bd.918fb",
- "5b600577.38704c",
- "37e02aa8.77f506",
- "ef74970a.886bc8"
+ "37ee3ec1.d168c2",
+ "84f57d66.de4e4",
+ "54ed7f5.2ee008",
+ "642b70ce.9a12c",
+ "26a09247.15d9ee",
+ "d068035a.95625",
+ "453b73b2.972dac",
+ "c7d360a9.620ce"
]
]
},
{
- "id": "9aa8fa45.2b1e08",
+ "id": "37ee3ec1.d168c2",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 895.6111450195312,
- "y": 57.99999713897705,
- "z": "a60e1b2.0e00ee8",
+ "x": 914.6215515136719,
+ "y": 43.99999976158142,
+ "z": "25c39c60.9e5894",
"wires": [
[
@@ -88,15 +88,15 @@
]
},
{
- "id": "f32a24c6.dffed8",
+ "id": "84f57d66.de4e4",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Deactivate\"/>\n",
"comments": "",
"outputs": 1,
- "x": 700.03125,
- "y": 101.03125,
- "z": "a60e1b2.0e00ee8",
+ "x": 719.0416564941406,
+ "y": 87.03125262260437,
+ "z": "25c39c60.9e5894",
"wires": [
[
@@ -104,54 +104,54 @@
]
},
{
- "id": "616e31bd.918fb",
+ "id": "26a09247.15d9ee",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` \" />",
"comments": "",
- "x": 791.0312995910645,
- "y": 289.5666913986206,
- "z": "a60e1b2.0e00ee8",
+ "x": 810.0417060852051,
+ "y": 275.566694021225,
+ "z": "25c39c60.9e5894",
"wires": [
]
},
{
- "id": "ef74970a.886bc8",
+ "id": "c7d360a9.620ce",
"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": 712.8091011047363,
- "y": 479.1221113204956,
- "z": "a60e1b2.0e00ee8",
+ "x": 731.819507598877,
+ "y": 465.1221139431,
+ "z": "25c39c60.9e5894",
"wires": [
]
},
{
- "id": "5b600577.38704c",
+ "id": "d068035a.95625",
"type": "set",
"name": "set network-level-oper-status",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
"comments": "",
- "x": 757.9202156066895,
- "y": 350.7888660430908,
- "z": "a60e1b2.0e00ee8",
+ "x": 776.9306221008301,
+ "y": 336.7888686656952,
+ "z": "25c39c60.9e5894",
"wires": [
]
},
{
- "id": "27480d76.5a34a2",
+ "id": "54ed7f5.2ee008",
"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": 732.3333549499512,
- "y": 154.03128623962402,
- "z": "a60e1b2.0e00ee8",
+ "x": 751.3437614440918,
+ "y": 140.0312888622284,
+ "z": "25c39c60.9e5894",
"wires": [
[
@@ -159,15 +159,15 @@
]
},
{
- "id": "37e02aa8.77f506",
+ "id": "453b73b2.972dac",
"type": "update",
"name": "update SOTN Connectivity status to AAI",
"xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
"comments": "",
"outputs": 1,
- "x": 792.1387977600098,
- "y": 410.49205493927,
- "z": "a60e1b2.0e00ee8",
+ "x": 811.1492042541504,
+ "y": 396.4920575618744,
+ "z": "25c39c60.9e5894",
"wires": [
[
@@ -175,27 +175,27 @@
]
},
{
- "id": "ca91a3af.46939",
+ "id": "642b70ce.9a12c",
"type": "set",
"name": "set network in service-data",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
"comments": "",
- "x": 754.475772857666,
- "y": 221.34445095062256,
- "z": "a60e1b2.0e00ee8",
+ "x": 773.4861793518066,
+ "y": 207.34445357322693,
+ "z": "25c39c60.9e5894",
"wires": [
]
},
{
- "id": "80bfe5ee.a7ea98",
+ "id": "e7e26097.3b8df",
"type": "comment",
"name": "TODO MP2MP",
"info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
"comments": "",
- "x": 979.5069007873535,
- "y": 144.28467750549316,
- "z": "a60e1b2.0e00ee8",
+ "x": 998.5173072814941,
+ "y": 130.28468012809753,
+ "z": "25c39c60.9e5894",
"wires": [
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
index 8b953708..923f1e85 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
@@ -1,85 +1,85 @@
[
{
- "id": "6fceaf50.2ca8a",
+ "id": "dade7d5.3be378",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 97.03125762939453,
- "y": 60.531246185302734,
- "z": "4279d5d.f45972c",
+ "x": 116.01040649414062,
+ "y": 55.999999734573066,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
- "cff1a431.d9d948"
+ "88d1057.ae444f8"
]
]
},
{
- "id": "cff1a431.d9d948",
+ "id": "88d1057.ae444f8",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.1-SNAPSHOT",
+ "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='1.2.1-SNAPSHOT'>",
+ "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": 309.0312614440918,
- "y": 132.53126335144043,
- "z": "4279d5d.f45972c",
+ "x": 328.0104103088379,
+ "y": 128.00001690071076,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
- "f4a2f725.1d7778"
+ "1b879646.8c5f2a"
]
]
},
{
- "id": "f4a2f725.1d7778",
+ "id": "1b879646.8c5f2a",
"type": "method",
"name": "method sotn-network-topology-operation-delete",
"xml": "<method rpc='sotn-network-topology-operation-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 297.03137969970703,
- "y": 220.53124618530273,
- "z": "4279d5d.f45972c",
+ "x": 316.0105285644531,
+ "y": 215.99999973457307,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
- "977562d1.fa7af"
+ "84422522.f0dfe8"
]
]
},
{
- "id": "977562d1.fa7af",
+ "id": "84422522.f0dfe8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 467.47571182250977,
- "y": 282.9757022857666,
- "z": "4279d5d.f45972c",
+ "x": 486.45486068725586,
+ "y": 278.44445583503693,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
- "6af1abf.a866354",
- "18eeced4.574d91",
- "406c5f6.7e479a",
- "10a58dd4.391ce2",
- "60c54ca0.bb3fb4",
- "47c1a26c.4cd8ec",
- "a482b966.7af068"
+ "8bc679c2.d2e228",
+ "3dd9c771.f2d768",
+ "81f00f63.ec84b",
+ "a13b30bd.b7628",
+ "a4092a94.cd0c48",
+ "2768fcc.58a2004",
+ "8b28cfea.bd23e"
]
]
},
{
- "id": "6af1abf.a866354",
+ "id": "8bc679c2.d2e228",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 929.4201583862305,
- "y": 77.53124618530273,
- "z": "4279d5d.f45972c",
+ "x": 948.3993072509766,
+ "y": 72.99999973457307,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
@@ -87,15 +87,15 @@
]
},
{
- "id": "18eeced4.574d91",
+ "id": "3dd9c771.f2d768",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-delete\"/>\n<parameter name=\"field3\" value=\"SOTN-Delete\"/>\n",
"comments": "",
"outputs": 1,
- "x": 742.8089828491211,
- "y": 143.8646183013916,
- "z": "4279d5d.f45972c",
+ "x": 761.7881317138672,
+ "y": 139.33337185066193,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
@@ -103,67 +103,67 @@
]
},
{
- "id": "406c5f6.7e479a",
+ "id": "81f00f63.ec84b",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
"comments": "",
- "x": 827.4756660461426,
- "y": 391.9555377960205,
- "z": "4279d5d.f45972c",
+ "x": 846.4548149108887,
+ "y": 387.42429134529084,
+ "z": "1ff7724b.6a5b2e",
"wires": [
]
},
{
- "id": "10a58dd4.391ce2",
+ "id": "a13b30bd.b7628",
"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": 756.5869140625,
- "y": 455.5109257698059,
- "z": "4279d5d.f45972c",
+ "x": 775.5660629272461,
+ "y": 450.97967931907624,
+ "z": "1ff7724b.6a5b2e",
"wires": [
]
},
{
- "id": "47c1a26c.4cd8ec",
+ "id": "2768fcc.58a2004",
"type": "set",
"name": "set new network length",
"xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\n\t\n",
"comments": "",
- "x": 786.1083374023438,
- "y": 269.42644786834717,
- "z": "4279d5d.f45972c",
+ "x": 805.0874862670898,
+ "y": 264.8952014176175,
+ "z": "1ff7724b.6a5b2e",
"wires": [
]
},
{
- "id": "60c54ca0.bb3fb4",
+ "id": "a4092a94.cd0c48",
"type": "set",
"name": "Remove networks from ServiceData",
- "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$nidx].\" value=\"\"/>\n\n",
+ "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.nidx].\" value=\"\"/>\n\n",
"comments": "",
- "x": 826.732494354248,
- "y": 317.394389629364,
- "z": "4279d5d.f45972c",
+ "x": 845.7116432189941,
+ "y": 312.86314317863435,
+ "z": "1ff7724b.6a5b2e",
"wires": [
]
},
{
- "id": "a482b966.7af068",
+ "id": "8b28cfea.bd23e",
"type": "delete",
"name": "delete SOTN VPNInstance configuration in AAI",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
"comments": "",
"outputs": 1,
- "x": 864.6638374328613,
- "y": 210.53753185272217,
- "z": "4279d5d.f45972c",
+ "x": 883.6429862976074,
+ "y": 206.0062854019925,
+ "z": "1ff7724b.6a5b2e",
"wires": [
[
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 4a147523..11ad7043 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,1727 +1,1857 @@
[
{
- "id": "5f3f5b7a.41ac74",
+ "id": "d10892d8.d1d04",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 134.03125,
- "y": 59.99999809265137,
- "z": "8893d0be.32531",
+ "x": 119.00390625,
+ "y": 89.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "f0f3a318.27bb3"
+ "cc6fb669.27adb8"
]
]
},
{
- "id": "f0f3a318.27bb3",
+ "id": "cc6fb669.27adb8",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.0-SNAPSHOT",
+ "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='1.2.0-SNAPSHOT'>",
+ "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": 206.31695556640625,
- "y": 112.23811149597168,
- "z": "8893d0be.32531",
+ "x": 191.28961181640625,
+ "y": 142.23811221122742,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "f248e777.889178"
+ "5c46313a.cc52b"
]
]
},
{
- "id": "f248e777.889178",
+ "id": "5c46313a.cc52b",
"type": "method",
"name": "validate-network-input",
"xml": "<method rpc='validate-network-input' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 206.45987701416016,
- "y": 173.99999809265137,
- "z": "8893d0be.32531",
+ "x": 191.43253326416016,
+ "y": 203.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "18b797ed.89fef8"
+ "589f6d93.3cb684"
]
]
},
{
- "id": "18b797ed.89fef8",
+ "id": "589f6d93.3cb684",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 219.7812957763672,
- "y": 456.4434928894043,
- "z": "8893d0be.32531",
+ "x": 204.7539520263672,
+ "y": 486.44349360466003,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "5cd1db9.aa83c24",
- "8d16602e.7c349",
- "768a7c7d.821fd4",
- "73298f6d.494ec",
- "d214794.53eb788",
- "f3d5b1ea.9645e"
+ "63545e47.56cdf",
+ "3b9c61c8.ee403e",
+ "38cd8ee0.dfeaa2",
+ "e55ef36.fecc71",
+ "ab9b3245.3b163",
+ "cf4a32b5.6699"
]
]
},
{
- "id": "5cd1db9.aa83c24",
+ "id": "63545e47.56cdf",
"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": 536.1741104125977,
- "y": 182.4285888671875,
- "z": "8893d0be.32531",
+ "x": 521.1467666625977,
+ "y": 212.42858958244324,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ab4d4682.0682b8"
+ "e01f3b58.5084b8"
]
]
},
{
- "id": "ab4d4682.0682b8",
+ "id": "e01f3b58.5084b8",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 761.8884146554128,
- "y": 182.42859131949263,
- "z": "8893d0be.32531",
+ "x": 746.8610709054128,
+ "y": 212.42859203474836,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "11d5bd20.05ddf3"
+ "fe964aff.bb00b8"
]
]
},
{
- "id": "11d5bd20.05ddf3",
+ "id": "fe964aff.bb00b8",
"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": 913.3169806344167,
- "y": 182.428589412144,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 898.2896368844167,
+ "y": 212.42859012739973,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "8d16602e.7c349",
+ "id": "3b9c61c8.ee403e",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 524.7454833984375,
- "y": 141.00001907348633,
- "z": "8893d0be.32531",
+ "x": 509.7181396484375,
+ "y": 171.00001978874207,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4b6601a6.daaba"
+ "438a3c10.6a7244"
]
]
},
{
- "id": "4b6601a6.daaba",
+ "id": "438a3c10.6a7244",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 760.4598350524902,
- "y": 139.5714168548584,
- "z": "8893d0be.32531",
+ "x": 745.4324913024902,
+ "y": 169.57141757011414,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "887d1db4.9d597"
+ "eafc9a3d.67efc8"
]
]
},
{
- "id": "887d1db4.9d597",
+ "id": "eafc9a3d.67efc8",
"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": 910.4598083496094,
- "y": 139.57142639160156,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 895.4324645996094,
+ "y": 169.5714271068573,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "768a7c7d.821fd4",
+ "id": "38cd8ee0.dfeaa2",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 534.7455215454102,
- "y": 225.28573608398438,
- "z": "8893d0be.32531",
+ "x": 519.7181777954102,
+ "y": 255.2857367992401,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "cae90e43.102ff"
+ "4c7ee001.df1f4"
]
]
},
{
- "id": "cae90e43.102ff",
+ "id": "4c7ee001.df1f4",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 761.8884102957591,
- "y": 225.28574507577105,
- "z": "8893d0be.32531",
+ "x": 746.8610665457591,
+ "y": 255.28574579102678,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4e414a1c.e00d24"
+ "c0c0e1df.937f8"
]
]
},
{
- "id": "4e414a1c.e00d24",
+ "id": "c0c0e1df.937f8",
"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": 913.316976274763,
- "y": 225.2857431684224,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 898.289632524763,
+ "y": 255.28574388367815,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "73298f6d.494ec",
+ "id": "e55ef36.fecc71",
"type": "switchNode",
"name": "switch service-instance-id",
"xml": "<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 535.8884429931641,
- "y": 282.00001335144043,
- "z": "8893d0be.32531",
+ "x": 520.8610992431641,
+ "y": 312.00001406669617,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "df674f5c.d1532"
+ "41b98218.67710c"
]
]
},
{
- "id": "df674f5c.d1532",
+ "id": "41b98218.67710c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 760.3170166015625,
- "y": 268.99999809265137,
- "z": "8893d0be.32531",
+ "x": 745.2896728515625,
+ "y": 298.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "3065439b.14d65c"
+ "4a5f94d4.e9a16c"
]
]
},
{
- "id": "3065439b.14d65c",
+ "id": "4a5f94d4.e9a16c",
"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": 918.7455444335938,
- "y": 267.99999809265137,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 903.7182006835938,
+ "y": 297.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "f4d14344.0e5f4",
+ "id": "577e7fa3.209ba",
"type": "comment",
"name": "validate-network-input - CHANGELOG",
"info": "12/8: Initial release 1.0.0",
"comments": "",
- "x": 419.03125,
- "y": 23.999998092651367,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 404.00390625,
+ "y": 53.999998807907104,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "d214794.53eb788",
+ "id": "ab9b3245.3b163",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 493.03126525878906,
- "y": 456.00001525878906,
- "z": "8893d0be.32531",
+ "x": 478.00392150878906,
+ "y": 486.0000159740448,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "54861d88.081944",
- "2eb0e84d.0d9948",
- "8ffdd9e.5892828",
- "8b85a1e9.e5cbc"
+ "c25cbef0.24b67",
+ "ffa0841e.8dfeb8",
+ "ec8a549d.c2d768",
+ "79b3c9cf.7c9a88"
]
]
},
{
- "id": "54861d88.081944",
+ "id": "c25cbef0.24b67",
"type": "other",
"name": "assign",
"xml": "<outcome value='assign'>",
"comments": "",
"outputs": 1,
- "x": 753.74560546875,
- "y": 360.57140922546387,
- "z": "8893d0be.32531",
+ "x": 738.71826171875,
+ "y": 390.5714099407196,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "a0ba5094.34089"
+ "4f0ebdbc.56efe4"
]
]
},
{
- "id": "2eb0e84d.0d9948",
+ "id": "ffa0841e.8dfeb8",
"type": "other",
"name": "activate",
"xml": "<outcome value='activate'>",
"comments": "",
"outputs": 1,
- "x": 749.0313568115234,
- "y": 490.9999885559082,
- "z": "8893d0be.32531",
+ "x": 734.0040130615234,
+ "y": 520.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "5513e34e.18308c"
+ "5ebeaa8b.6f2ad4"
]
]
},
{
- "id": "8ffdd9e.5892828",
+ "id": "ec8a549d.c2d768",
"type": "other",
"name": "deactivate",
"xml": "<outcome value='deactivate'>",
"comments": "",
"outputs": 1,
- "x": 752.0313186645508,
- "y": 657.0000114440918,
- "z": "8893d0be.32531",
+ "x": 737.0039749145508,
+ "y": 687.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "b5960321.a2acd"
+ "bb3fcaae.e4ad38"
]
]
},
{
- "id": "a0ba5094.34089",
+ "id": "4f0ebdbc.56efe4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 916.03125,
- "y": 359.99999809265137,
- "z": "8893d0be.32531",
+ "x": 901.00390625,
+ "y": 389.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "9bad05fb.b569a8"
+ "74260e08.eb326"
]
]
},
{
- "id": "9bad05fb.b569a8",
+ "id": "74260e08.eb326",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1136.03125,
- "y": 359.99999809265137,
- "z": "8893d0be.32531",
+ "x": 1121.00390625,
+ "y": 389.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "69ced2d8.9588fc",
- "616c725f.66f59c"
+ "8fe022cd.91c96",
+ "dea0b675.d14408"
]
]
},
{
- "id": "69ced2d8.9588fc",
+ "id": "8fe022cd.91c96",
"type": "other",
"name": "CreateNetworkInstance",
"xml": "<outcome value='CreateNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1416.03125,
- "y": 324.99999809265137,
- "z": "8893d0be.32531",
+ "x": 1401.00390625,
+ "y": 354.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8d01ace0.92a79"
+ "c969e857.f1a468"
]
]
},
{
- "id": "616c725f.66f59c",
+ "id": "dea0b675.d14408",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1365.03125,
- "y": 368.99999809265137,
- "z": "8893d0be.32531",
+ "x": 1350.00390625,
+ "y": 398.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "5fb52cac.0eb654"
+ "75ab9633.6c0538"
]
]
},
{
- "id": "5fb52cac.0eb654",
+ "id": "75ab9633.6c0538",
"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": 1534.03125,
- "y": 368.99999809265137,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 1519.00390625,
+ "y": 398.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "5513e34e.18308c",
+ "id": "5ebeaa8b.6f2ad4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 923.0313568115234,
- "y": 490.9999885559082,
- "z": "8893d0be.32531",
+ "x": 908.0040130615234,
+ "y": 520.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "2378c65e.073eba"
+ "eeee19ec.1dddd8"
]
]
},
{
- "id": "2378c65e.073eba",
+ "id": "eeee19ec.1dddd8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1140.0313568115234,
- "y": 490.9999885559082,
- "z": "8893d0be.32531",
+ "x": 1125.0040130615234,
+ "y": 520.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8de45679.3b3c18",
- "6955c602.6a6528",
- "96152f20.469f"
+ "19ab9af4.959125",
+ "267e33ff.fa91ec",
+ "3c8e6628.d91a7a",
+ "631913c6.522e9c"
]
]
},
{
- "id": "8de45679.3b3c18",
+ "id": "19ab9af4.959125",
"type": "other",
"name": "CreateNetworkInstance",
"xml": "<outcome value='CreateNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1421.0313568115234,
- "y": 491.9999885559082,
- "z": "8893d0be.32531",
+ "x": 1406.0040130615234,
+ "y": 521.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "94518ad8.741728"
+ "5bbb66dc.aa9cd8"
]
]
},
{
- "id": "6955c602.6a6528",
+ "id": "267e33ff.fa91ec",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1364.0313568115234,
- "y": 531.9999885559082,
- "z": "8893d0be.32531",
+ "x": 1349.0040130615234,
+ "y": 561.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8b16105d.d10c5"
+ "bc137916.f46628"
]
]
},
{
- "id": "8b16105d.d10c5",
+ "id": "bc137916.f46628",
"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": 1535.8886528015137,
- "y": 533.4285945892334,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 1520.8613090515137,
+ "y": 563.4285953044891,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "b5960321.a2acd",
+ "id": "bb3fcaae.e4ad38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 934.0313186645508,
- "y": 656.0000114440918,
- "z": "8893d0be.32531",
+ "x": 919.0039749145508,
+ "y": 686.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "413c7adb.c15c44"
+ "55160352.39b04c"
]
]
},
{
- "id": "413c7adb.c15c44",
+ "id": "55160352.39b04c",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1151.0313186645508,
- "y": 656.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1136.0039749145508,
+ "y": 686.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "366873bb.05934c",
- "2e293ab5.08c366",
- "b2644153.2a067"
+ "5cc0d485.64c92c",
+ "7d1ae710.c4ae68",
+ "6fed75a2.decf0c",
+ "1da958a1.745b77"
]
]
},
{
- "id": "366873bb.05934c",
+ "id": "5cc0d485.64c92c",
"type": "other",
"name": "DeleteNetworkInstance",
"xml": "<outcome value='DeleteNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1432.0313186645508,
- "y": 657.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1417.0039749145508,
+ "y": 687.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "7a6470e0.53a19"
+ "109f2b9.d4078d4"
]
]
},
{
- "id": "2e293ab5.08c366",
+ "id": "7d1ae710.c4ae68",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1375.0313186645508,
- "y": 697.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1360.0039749145508,
+ "y": 727.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "c463df98.ea3ee"
+ "20482a05.f565a6"
]
]
},
{
- "id": "c463df98.ea3ee",
+ "id": "20482a05.f565a6",
"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": 1544.0313835144043,
- "y": 699.8571729660034,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 1529.0040397644043,
+ "y": 729.8571736812592,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "8b85a1e9.e5cbc",
+ "id": "79b3c9cf.7c9a88",
"type": "other",
"name": "unassign",
"xml": "<outcome value='unassign'>",
"comments": "",
"outputs": 1,
- "x": 748.0312881469727,
- "y": 750.9999885559082,
- "z": "8893d0be.32531",
+ "x": 733.0039443969727,
+ "y": 780.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "c3a2fdfb.7fd72"
+ "45974a1d.441444"
]
]
},
{
- "id": "c3a2fdfb.7fd72",
+ "id": "45974a1d.441444",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 930.0313186645508,
- "y": 747.0000114440918,
- "z": "8893d0be.32531",
+ "x": 915.0039749145508,
+ "y": 777.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4f8159c.6d86fa8"
+ "e8367231.5b793"
]
]
},
{
- "id": "4f8159c.6d86fa8",
+ "id": "e8367231.5b793",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1147.0313186645508,
- "y": 747.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1132.0039749145508,
+ "y": 777.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "550fb1ae.b9c5c",
- "8c9d3f7f.4516f"
+ "2783d45.3ac4c2c",
+ "dc9b366d.05d508"
]
]
},
{
- "id": "550fb1ae.b9c5c",
+ "id": "2783d45.3ac4c2c",
"type": "other",
"name": "DeleteNetworkInstance",
"xml": "<outcome value='DeleteNetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1428.0313186645508,
- "y": 748.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1413.0039749145508,
+ "y": 778.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8347def4.e8f43"
+ "5f15529a.e2031c"
]
]
},
{
- "id": "8c9d3f7f.4516f",
+ "id": "dc9b366d.05d508",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1371.0313186645508,
- "y": 788.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1356.0039749145508,
+ "y": 818.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "895e5aa8.c214e8"
+ "d903000c.e9d17"
]
]
},
{
- "id": "895e5aa8.c214e8",
+ "id": "d903000c.e9d17",
"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": 1540.0313186645508,
- "y": 788.0000114440918,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 1525.0039749145508,
+ "y": 818.0000121593475,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "8d01ace0.92a79",
+ "id": "c969e857.f1a468",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1652.03125,
- "y": 323.99999809265137,
- "z": "8893d0be.32531",
+ "x": 1637.00390625,
+ "y": 353.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1bfbd5a6.718d3a",
- "e6612016.3e4c5",
- "b1a90522.c6b958",
- "6352e03d.22eed",
- "a58d7ad5.945658",
- "6492fa8d.a3f754",
- "dbf6cbd2.03c8d8"
+ "c9238c13.c3f79",
+ "a449f5ae.312af8",
+ "fd80c464.68ff68",
+ "416cb672.740808",
+ "c16bbddb.dcdad",
+ "f8366874.128af8",
+ "d7a16e1b.af209"
]
]
},
{
- "id": "94518ad8.741728",
+ "id": "5bbb66dc.aa9cd8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1646.0313568115234,
- "y": 491.9999885559082,
- "z": "8893d0be.32531",
+ "x": 1631.0040130615234,
+ "y": 521.9999892711639,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1bfbd5a6.718d3a",
- "e6612016.3e4c5",
- "b1a90522.c6b958",
- "6352e03d.22eed",
- "a58d7ad5.945658",
- "6492fa8d.a3f754",
- "de4bc965.10a9a8"
+ "c9238c13.c3f79",
+ "a449f5ae.312af8",
+ "fd80c464.68ff68",
+ "416cb672.740808",
+ "c16bbddb.dcdad",
+ "f8366874.128af8",
+ "56dfe279.93c1fc"
]
]
},
{
- "id": "7a6470e0.53a19",
+ "id": "109f2b9.d4078d4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1688.0313186645508,
- "y": 658.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1673.0039749145508,
+ "y": 688.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "de4bc965.10a9a8"
+ "56dfe279.93c1fc"
]
]
},
{
- "id": "8347def4.e8f43",
+ "id": "5f15529a.e2031c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1687.0313186645508,
- "y": 749.0000114440918,
- "z": "8893d0be.32531",
+ "x": 1672.0039749145508,
+ "y": 779.0000121593475,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "de4bc965.10a9a8"
+ "56dfe279.93c1fc"
]
]
},
{
- "id": "a58d7ad5.945658",
+ "id": "c16bbddb.dcdad",
"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": 2288.697914123535,
- "y": 1047.9999494552612,
- "z": "8893d0be.32531",
+ "x": 2273.670570373535,
+ "y": 1077.999950170517,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "a2089e7a.ac5b1",
- "42b6c1fc.c06a7"
+ "78f46224.bc9d9c",
+ "178e4db8.c59b02"
]
]
},
{
- "id": "8ba860ac.98ed2",
+ "id": "5358502c.4d84d",
"type": "comment",
"name": "validations - required for all",
"info": "",
"comments": "",
- "x": 552.03125,
- "y": 97.99999809265137,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 537.00390625,
+ "y": 127.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "7f1548ab.76a718",
+ "id": "e29df723.fb6ab8",
"type": "comment",
"name": "validations specific per svc-action",
"info": "",
"comments": "",
- "x": 564.03125,
- "y": 312.99999809265137,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 549.00390625,
+ "y": 342.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "a63772a0.90d1",
+ "id": "be93f819.8db9c8",
"type": "comment",
"name": "network-request-information block validations",
"info": "",
"comments": "",
- "x": 2292.03125,
- "y": 899.9999980926514,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2277.00390625,
+ "y": 929.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "1bfbd5a6.718d3a",
+ "id": "c9238c13.c3f79",
"type": "switchNode",
"name": "switch network-request-information.tenant",
"xml": "<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n",
"comments": "",
"outputs": 1,
- "x": 2289.03125,
- "y": 949.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2274.00390625,
+ "y": 979.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "cf16e334.e3d85"
+ "6b327341.d34c9c"
]
]
},
{
- "id": "cf16e334.e3d85",
+ "id": "6b327341.d34c9c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2530.74560546875,
- "y": 951.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2515.71826171875,
+ "y": 981.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ad280e32.435b6"
+ "f7cc75bc.fb7508"
]
]
},
{
- "id": "ad280e32.435b6",
+ "id": "f7cc75bc.fb7508",
"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": 2682.1741943359375,
- "y": 949.9999980926514,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2667.1468505859375,
+ "y": 979.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "e6612016.3e4c5",
+ "id": "a449f5ae.312af8",
"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": 2318.03125,
- "y": 992.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2303.00390625,
+ "y": 1022.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "2e6c842b.3d3bfc"
+ "12e07938.eebd67"
]
]
},
{
- "id": "2e6c842b.3d3bfc",
+ "id": "12e07938.eebd67",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2579.74560546875,
- "y": 992.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2564.71826171875,
+ "y": 1022.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4f8437fb.4ebe28"
+ "411017cd.e8e7d8"
]
]
},
{
- "id": "4f8437fb.4ebe28",
+ "id": "411017cd.e8e7d8",
"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": 2744.174072265625,
- "y": 991.9999980926514,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2729.146728515625,
+ "y": 1021.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "b1a90522.c6b958",
+ "id": "fd80c464.68ff68",
"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": 2281.1741943359375,
- "y": 819.8571147918701,
- "z": "8893d0be.32531",
+ "x": 2266.1468505859375,
+ "y": 849.8571155071259,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "662ea3fd.3a569c"
+ "bf2b8802.529248"
]
]
},
{
- "id": "662ea3fd.3a569c",
+ "id": "bf2b8802.529248",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2521.1741943359375,
- "y": 820.8571147918701,
- "z": "8893d0be.32531",
+ "x": 2506.1468505859375,
+ "y": 850.8571155071259,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "a27bb01c.4d33c"
+ "c8b441e9.e2bc9"
]
]
},
{
- "id": "a27bb01c.4d33c",
+ "id": "c8b441e9.e2bc9",
"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": 2686.6026611328125,
- "y": 818.857084274292,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2671.5753173828125,
+ "y": 848.8570849895477,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "6352e03d.22eed",
+ "id": "416cb672.740808",
"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": 2326.03125,
- "y": 778.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2311.00390625,
+ "y": 808.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8f05ec67.db021"
+ "d6b8ccdf.da70c"
]
]
},
{
- "id": "8f05ec67.db021",
+ "id": "d6b8ccdf.da70c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2622.03125,
- "y": 779.9999980926514,
- "z": "8893d0be.32531",
+ "x": 2607.00390625,
+ "y": 809.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "68925179.7127d"
+ "1c49c6e.f874e39"
]
]
},
{
- "id": "68925179.7127d",
+ "id": "1c49c6e.f874e39",
"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": 2769.459716796875,
- "y": 779.9999980926514,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2754.432373046875,
+ "y": 809.9999988079071,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "f3d5b1ea.9645e",
+ "id": "cf4a32b5.6699",
"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": 526.3883247375488,
- "y": 676.6428327560425,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 511.3609809875488,
+ "y": 706.6428334712982,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "96895c09.a6753",
+ "id": "e96a8642.305778",
"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": 3004.2143173217773,
- "y": 1263.1784744262695,
- "z": "8893d0be.32531",
+ "x": 2989.1869735717773,
+ "y": 1293.1784751415253,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "f9258daf.8b602",
- "5c25b9d9.438728"
+ "f00cd782.2f4528",
+ "833d5e59.8da03"
]
]
},
{
- "id": "ac3d2a23.2dc468",
+ "id": "99436cff.71a52",
"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": 3463.6785202026367,
- "y": 1254.225890159607,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 3448.6511764526367,
+ "y": 1284.2258908748627,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "f9258daf.8b602",
+ "id": "f00cd782.2f4528",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3264.9285316467285,
- "y": 1247.5830965042114,
- "z": "8893d0be.32531",
+ "x": 3249.9011878967285,
+ "y": 1277.5830972194672,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ac3d2a23.2dc468"
+ "99436cff.71a52"
]
]
},
{
- "id": "5c25b9d9.438728",
+ "id": "833d5e59.8da03",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3258.6785316467285,
- "y": 1280.0830965042114,
- "z": "8893d0be.32531",
+ "x": 3243.6511878967285,
+ "y": 1310.0830972194672,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ac3d2a23.2dc468"
+ "99436cff.71a52"
]
]
},
{
- "id": "a2089e7a.ac5b1",
+ "id": "78f46224.bc9d9c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2553.845993041992,
- "y": 1047.5925884246826,
- "z": "8893d0be.32531",
+ "x": 2538.818649291992,
+ "y": 1077.5925891399384,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "620a39e0.d0cdb8"
+ "2dfa7f78.06543"
]
]
},
{
- "id": "42b6c1fc.c06a7",
+ "id": "178e4db8.c59b02",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 2560.0959281921387,
- "y": 1186.7591934204102,
- "z": "8893d0be.32531",
+ "x": 2545.0685844421387,
+ "y": 1216.759194135666,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "8a643c02.96779"
+ "7c0ea99f.5a1678"
]
]
},
{
- "id": "4b09caaf.8b4044",
+ "id": "fe208cbc.dc6fa",
"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": 3006.7143020629883,
- "y": 1186.2432470321655,
- "z": "8893d0be.32531",
+ "x": 2991.6869583129883,
+ "y": 1216.2432477474213,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "c368ca47.7ac378",
- "c422bd25.160ed"
+ "1c40e946.8c8157",
+ "793372b8.fc938c"
]
]
},
{
- "id": "f0c9c755.52a178",
+ "id": "789a1cde.2f3584",
"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": 3453.7976684570312,
- "y": 1186.2432775497437,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 3438.7703247070312,
+ "y": 1216.2432782649994,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "c368ca47.7ac378",
+ "id": "1c40e946.8c8157",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3255.047748565674,
- "y": 1181.6004934310913,
- "z": "8893d0be.32531",
+ "x": 3240.020404815674,
+ "y": 1211.600494146347,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "f0c9c755.52a178"
+ "789a1cde.2f3584"
]
]
},
{
- "id": "c422bd25.160ed",
+ "id": "793372b8.fc938c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3248.797748565674,
- "y": 1214.1004934310913,
- "z": "8893d0be.32531",
+ "x": 3233.770404815674,
+ "y": 1244.100494146347,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "f0c9c755.52a178"
+ "789a1cde.2f3584"
]
]
},
{
- "id": "b60ce6b6.6e55c8",
+ "id": "2f9cf39c.ecdeac",
"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": 3000.400505065918,
- "y": 1122.4007968902588,
- "z": "8893d0be.32531",
+ "x": 2985.373161315918,
+ "y": 1152.4007976055145,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "53ee50da.92c",
- "302de1ee.96625e"
+ "de12035b.bf10a",
+ "d50a76bd.bc3228"
]
]
},
{
- "id": "508d66c6.0a5cd8",
+ "id": "67a5ef63.346e1",
"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": 3459.8647079467773,
- "y": 1113.4482126235962,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 3444.8373641967773,
+ "y": 1143.448213338852,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "53ee50da.92c",
+ "id": "de12035b.bf10a",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3261.114719390869,
- "y": 1106.8054189682007,
- "z": "8893d0be.32531",
+ "x": 3246.087375640869,
+ "y": 1136.8054196834564,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "508d66c6.0a5cd8"
+ "67a5ef63.346e1"
]
]
},
{
- "id": "302de1ee.96625e",
+ "id": "d50a76bd.bc3228",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3256.1146965026855,
- "y": 1138.0554180145264,
- "z": "8893d0be.32531",
+ "x": 3241.0873527526855,
+ "y": 1168.055418729782,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "508d66c6.0a5cd8"
+ "67a5ef63.346e1"
]
]
},
{
- "id": "3336f7e.5de1408",
+ "id": "bc655191.0e724",
"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": 2999.1504287719727,
- "y": 1047.9654626846313,
- "z": "8893d0be.32531",
+ "x": 2984.1230850219727,
+ "y": 1077.965463399887,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "97b21fe.ac0ede",
- "a706b0a7.379b8"
+ "8e2d24f5.121c68",
+ "7c889074.1b565"
]
]
},
{
- "id": "d796bf5.a742d4",
+ "id": "d18ba133.1177",
"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": 3449.983856201172,
- "y": 1045.465600013733,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 3434.956512451172,
+ "y": 1075.4656007289886,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "97b21fe.ac0ede",
+ "id": "8e2d24f5.121c68",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 3251.2339363098145,
- "y": 1040.8228158950806,
- "z": "8893d0be.32531",
+ "x": 3236.2065925598145,
+ "y": 1070.8228166103363,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "d796bf5.a742d4"
+ "d18ba133.1177"
]
]
},
{
- "id": "a706b0a7.379b8",
+ "id": "7c889074.1b565",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 3244.9839363098145,
- "y": 1073.3228158950806,
- "z": "8893d0be.32531",
+ "x": 3229.9565925598145,
+ "y": 1103.3228166103363,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "d796bf5.a742d4"
+ "d18ba133.1177"
]
]
},
{
- "id": "620a39e0.d0cdb8",
+ "id": "2dfa7f78.06543",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2729.1702423095703,
- "y": 1046.805416584015,
- "z": "8893d0be.32531",
+ "x": 2714.1428985595703,
+ "y": 1076.8054172992706,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "3336f7e.5de1408",
- "b60ce6b6.6e55c8"
+ "bc655191.0e724",
+ "2f9cf39c.ecdeac"
]
]
},
{
- "id": "8a643c02.96779",
+ "id": "7c0ea99f.5a1678",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2721.6702423095703,
- "y": 1185.555419921875,
- "z": "8893d0be.32531",
+ "x": 2706.6428985595703,
+ "y": 1215.5554206371307,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4b09caaf.8b4044",
- "96895c09.a6753"
+ "fe208cbc.dc6fa",
+ "e96a8642.305778"
]
]
},
{
- "id": "96152f20.469f",
+ "id": "3c8e6628.d91a7a",
"type": "outcome",
"name": "ActivateDCINetworkInstance",
"xml": "<outcome value='ActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1435.6978378295898,
- "y": 444.99999809265137,
- "z": "8893d0be.32531",
+ "x": 1420.6704940795898,
+ "y": 474.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4b2f8e37.5461c"
+ "875e8d68.e9af6"
]
]
},
{
- "id": "b2644153.2a067",
+ "id": "6fed75a2.decf0c",
"type": "outcome",
"name": "DeActivateDCINetworkInstance",
"xml": "<outcome value='DeActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1457.0312118530273,
- "y": 607.9999980926514,
- "z": "8893d0be.32531",
+ "x": 1442.0038681030273,
+ "y": 637.9999988079071,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "31bb2eb9.4b2df2"
+ "104b7f33.e975b1"
]
]
},
{
- "id": "6492fa8d.a3f754",
+ "id": "f8366874.128af8",
"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": 2308.0313110351562,
- "y": 744.0000343322754,
- "z": "8893d0be.32531",
+ "x": 2293.0039672851562,
+ "y": 774.0000350475311,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "d0898bc.4da8178"
+ "a9b08bc9.314328"
]
]
},
{
- "id": "d0898bc.4da8178",
+ "id": "a9b08bc9.314328",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2593.0313720703125,
- "y": 743.0000286102295,
- "z": "8893d0be.32531",
+ "x": 2578.0040283203125,
+ "y": 773.0000293254852,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1ca0e8c8.26dc17"
+ "660b21a9.185aa"
]
]
},
{
- "id": "1ca0e8c8.26dc17",
+ "id": "660b21a9.185aa",
"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": 2744.4598388671875,
- "y": 742.0000286102295,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2729.4324951171875,
+ "y": 772.0000293254852,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "158231ee.a3fc1e",
+ "id": "2a04f924.bc59c6",
"type": "comment",
"name": "network-information.onap-model-information block validations",
"info": "",
"comments": "",
- "x": 2327.1741943359375,
- "y": 704.8571147918701,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2312.1468505859375,
+ "y": 734.8571155071259,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "dbf6cbd2.03c8d8",
+ "id": "d7a16e1b.af209",
"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": 2263.0311737060547,
- "y": 613.3333549499512,
- "z": "8893d0be.32531",
+ "x": 2248.0038299560547,
+ "y": 643.3333556652069,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "6175843f.314bac",
- "6cf19d4d.69d604"
+ "539f2742.e1fa38",
+ "cf298caa.2064f"
]
]
},
{
- "id": "6175843f.314bac",
+ "id": "539f2742.e1fa38",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 2559.0311241149902,
- "y": 646.0000667572021,
- "z": "8893d0be.32531",
+ "x": 2544.0037803649902,
+ "y": 676.0000674724579,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "c1d6e588.8008f8"
+ "efbdc310.4df6b"
]
]
},
{
- "id": "c1d6e588.8008f8",
+ "id": "efbdc310.4df6b",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2693.142379760742,
- "y": 646.4444713592529,
- "z": "8893d0be.32531",
+ "x": 2678.115036010742,
+ "y": 676.4444720745087,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "71346c27.04b7d4"
+ "aa96a81e.338e18"
]
]
},
{
- "id": "71346c27.04b7d4",
+ "id": "aa96a81e.338e18",
"type": "switchNode",
"name": "switch service-data.networks.network_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 2966.856491088867,
- "y": 648.0158214569092,
- "z": "8893d0be.32531",
+ "x": 2951.829147338867,
+ "y": 678.0158221721649,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "34df5d30.93d862",
- "b53e3219.4661d"
+ "a6924a9.366acb8",
+ "d67b8110.cf084"
]
]
},
{
- "id": "34df5d30.93d862",
+ "id": "a6924a9.366acb8",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 3255.856491088867,
- "y": 650.0158824920654,
- "z": "8893d0be.32531",
+ "x": 3240.829147338867,
+ "y": 680.0158832073212,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "dd967162.ba1ae"
+ "38331b12.104364"
]
]
},
{
- "id": "b53e3219.4661d",
+ "id": "d67b8110.cf084",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 3235.856491088867,
- "y": 685.0158824920654,
- "z": "8893d0be.32531",
+ "x": 3220.829147338867,
+ "y": 715.0158832073212,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ad38a9d8.149638"
+ "27a40eb8.35dc12"
]
]
},
{
- "id": "ad38a9d8.149638",
+ "id": "27a40eb8.35dc12",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 3437.126510620117,
- "y": 686.5704479217529,
- "z": "8893d0be.32531",
+ "x": 3422.099166870117,
+ "y": 716.5704486370087,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "aa0170e3.5679c",
- "2465dbb6.c0a6e4"
+ "c4349cea.5f846",
+ "ceec98b4.2ffb48"
]
]
},
{
- "id": "aa0170e3.5679c",
+ "id": "c4349cea.5f846",
"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": 3707.142547607422,
- "y": 685.4444637298584,
- "z": "8893d0be.32531",
+ "x": 3692.115203857422,
+ "y": 715.4444644451141,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1fbf0f94.4056a"
+ "3a558d2e.ab0422"
]
]
},
{
- "id": "1fbf0f94.4056a",
+ "id": "3a558d2e.ab0422",
"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": 3997.5710983276367,
- "y": 684.6945476531982,
- "z": "8893d0be.32531",
+ "x": 3982.5437545776367,
+ "y": 714.694548368454,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "3de6966a.9e173a"
+ "5c767e8.1709a8"
]
]
},
{
- "id": "3de6966a.9e173a",
+ "id": "5c767e8.1709a8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 4186.523452758789,
- "y": 685.5872859954834,
- "z": "8893d0be.32531",
+ "x": 4171.496109008789,
+ "y": 715.5872867107391,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4f5a1354.1233dc"
+ "24b6b776.af3398"
]
]
},
{
- "id": "4acc4fac.09f96",
+ "id": "399ed923.ac8ab6",
"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": 4630.055221557617,
- "y": 694.337308883667,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 4615.027877807617,
+ "y": 724.3373095989227,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "2465dbb6.c0a6e4",
+ "id": "ceec98b4.2ffb48",
"type": "switchNode",
"name": "switch tmp.nidx ",
"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 3625.443977355957,
- "y": 727.4276704788208,
- "z": "8893d0be.32531",
+ "x": 3610.416633605957,
+ "y": 757.4276711940765,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "dea84216.b653a"
+ "96827960.07e628"
]
]
},
{
- "id": "ecca41ce.fcb55",
+ "id": "d3abbc81.d91ab",
"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": 3978.3009605407715,
- "y": 723.1419124603271,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 3963.2736167907715,
+ "y": 753.1419131755829,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "dea84216.b653a",
+ "id": "96827960.07e628",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 3796.872512817383,
- "y": 725.9990558624268,
- "z": "8893d0be.32531",
+ "x": 3781.845169067383,
+ "y": 755.9990565776825,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "ecca41ce.fcb55"
+ "d3abbc81.d91ab"
]
]
},
{
- "id": "9ff8451b.0ce6b8",
+ "id": "976eb0b3.3ee26",
"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": 4588.475631713867,
- "y": 731.444486618042,
- "z": "8893d0be.32531",
+ "x": 4573.448287963867,
+ "y": 761.4444873332977,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1c527fbe.e34b3"
+ "894b90cf.4a9a"
]
]
},
{
- "id": "1c527fbe.e34b3",
+ "id": "894b90cf.4a9a",
"type": "other",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 4802.475631713867,
- "y": 731.444486618042,
- "z": "8893d0be.32531",
+ "x": 4787.448287963867,
+ "y": 761.4444873332977,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "1ed56338.a1e19d"
+ "6704e2e0.e6d2ac"
]
]
},
{
- "id": "1ed56338.a1e19d",
+ "id": "6704e2e0.e6d2ac",
"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": 5006.475631713867,
- "y": 727.4444713592529,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 4991.448287963867,
+ "y": 757.4444720745087,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "4f5a1354.1233dc",
+ "id": "24b6b776.af3398",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 4335.141891479492,
- "y": 685.4444713592529,
- "z": "8893d0be.32531",
+ "x": 4320.114547729492,
+ "y": 715.4444720745087,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "4acc4fac.09f96"
+ "399ed923.ac8ab6"
]
]
},
{
- "id": "dd967162.ba1ae",
+ "id": "38331b12.104364",
"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=\"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": 3417.142379760742,
- "y": 649.4444713592529,
- "z": "8893d0be.32531",
+ "x": 3402.115036010742,
+ "y": 679.4444720745087,
+ "z": "cd5e1606.c0dcc8",
"wires": [
- []
+ [
+
+ ]
]
},
{
- "id": "de4bc965.10a9a8",
+ "id": "56dfe279.93c1fc",
"type": "switchNode",
"name": "switch network-information.network-id",
"xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 2261.0310974121094,
- "y": 566.6666717529297,
- "z": "8893d0be.32531",
+ "x": 2246.0037536621094,
+ "y": 596.6666724681854,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "515a1b60.a2b844"
+ "d731fd6c.5f66a"
]
]
},
{
- "id": "515a1b60.a2b844",
+ "id": "d731fd6c.5f66a",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2489.7454223632812,
- "y": 568.6666717529297,
- "z": "8893d0be.32531",
+ "x": 2474.7180786132812,
+ "y": 598.6666724681854,
+ "z": "cd5e1606.c0dcc8",
"wires": [
[
- "5c3c2c39.9ce264"
+ "f8512ef0.9e14e"
]
]
},
{
- "id": "5c3c2c39.9ce264",
+ "id": "f8512ef0.9e14e",
"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": 2654.174041748047,
- "y": 566.6666717529297,
- "z": "8893d0be.32531",
- "wires": []
+ "x": 2639.146697998047,
+ "y": 596.6666724681854,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+
+ ]
},
{
- "id": "6cf19d4d.69d604",
+ "id": "cf298caa.2064f",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2556.6980209350586,
- "y": 612.9999408721924,
- "z": "8893d0be.32531",
+ "x": 2541.6706771850586,
+ "y": 642.9999415874481,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "875e8d68.e9af6",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1646.9765625,
+ "y": 449.00390696525574,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "104b7f33.e975b1",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1698.0039520263672,
+ "y": 627.0312669277191,
+ "z": "cd5e1606.c0dcc8",
"wires": [
- []
+ [
+
+ ]
+ ]
+ },
+ {
+ "id": "631913c6.522e9c",
+ "type": "outcome",
+ "name": "ActivateSOTNConnectivityInstance",
+ "xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1250.7539672851562,
+ "y": 441.00390434265137,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+ [
+ "eee16eb3.ee727"
+ ]
]
},
{
- "id": "4b2f8e37.5461c",
+ "id": "eee16eb3.ee727",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1662.00390625,
- "y": 419.00390625,
- "z": "8893d0be.32531",
+ "x": 1476.7539367675781,
+ "y": 441.00395011901855,
+ "z": "cd5e1606.c0dcc8",
"wires": [
- []
+ [
+
+ ]
]
},
{
- "id": "31bb2eb9.4b2df2",
+ "id": "1da958a1.745b77",
+ "type": "outcome",
+ "name": "DeactivateSOTNConnectivityInstance",
+ "xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1307.75390625,
+ "y": 599.00390625,
+ "z": "cd5e1606.c0dcc8",
+ "wires": [
+ [
+ "9eaa2ade.3cbb68"
+ ]
+ ]
+ },
+ {
+ "id": "9eaa2ade.3cbb68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1713.0312957763672,
- "y": 597.0312662124634,
- "z": "8893d0be.32531",
+ "x": 1533.7538757324219,
+ "y": 599.0039520263672,
+ "z": "cd5e1606.c0dcc8",
"wires": [
- []
+ [
+
+ ]
]
}
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
index 7ba8a8fa..e0563866 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
@@ -1,1051 +1,1051 @@
[
{
- "id": "f341527b.50b3",
+ "id": "30540b72.a3da84",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 100.03125,
- "y": 50.3333295583725,
- "z": "612a8bcd.555ff4",
+ "x": 119.01040649414062,
+ "y": 58.010414123535156,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "73a43f3f.5366a"
+ "5db42949.04e028"
]
]
},
{
- "id": "73a43f3f.5366a",
+ "id": "5db42949.04e028",
"type": "service-logic",
- "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
- "version": "1.2.1-SNAPSHOT",
+ "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='1.2.1-SNAPSHOT'>",
+ "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": 345.3169631958008,
- "y": 49.57140862941742,
- "z": "612a8bcd.555ff4",
+ "x": 364.2961196899414,
+ "y": 57.24849319458008,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "51c30458.248f6c"
+ "8510d543.ea49c8"
]
]
},
{
- "id": "51c30458.248f6c",
+ "id": "8510d543.ea49c8",
"type": "method",
"name": "validate-sotn-network-input-parameters",
"xml": "<method rpc='validate-sotn-network-input-parameters' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 302.94793701171875,
- "y": 124.5863469839096,
- "z": "612a8bcd.555ff4",
+ "x": 321.9270935058594,
+ "y": 132.26343154907227,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "2614ca2e.5555e6"
+ "9906fd18.4ac52"
]
]
},
{
- "id": "2614ca2e.5555e6",
+ "id": "9906fd18.4ac52",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 586.9479446411133,
- "y": 112.58637177944183,
- "z": "612a8bcd.555ff4",
+ "x": 605.9271011352539,
+ "y": 120.26345634460449,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "7d98662d.87c938",
- "db93dd27.961fc"
+ "d110bc81.4e37c",
+ "e101af22.28a5c"
]
]
},
{
- "id": "7d98662d.87c938",
+ "id": "d110bc81.4e37c",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 867.9479446411133,
- "y": 107.58635747432709,
- "z": "612a8bcd.555ff4",
+ "x": 886.9271011352539,
+ "y": 115.26344203948975,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "ed1074da.968838"
+ "71be43d8.37b15c"
]
]
},
{
- "id": "ed1074da.968838",
+ "id": "71be43d8.37b15c",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1058.6622467041016,
- "y": 108.5863584280014,
- "z": "612a8bcd.555ff4",
+ "x": 1077.6414031982422,
+ "y": 116.26344299316406,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "1f50e65c.41f41a"
+ "bc10300e.78772"
]
]
},
{
- "id": "1f50e65c.41f41a",
+ "id": "bc10300e.78772",
"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": 1233.0907974243164,
- "y": 107.58635079860687,
- "z": "612a8bcd.555ff4",
+ "x": 1252.069953918457,
+ "y": 115.26343536376953,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "db93dd27.961fc",
+ "id": "e101af22.28a5c",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 168.94789123535156,
- "y": 383.58637177944183,
- "z": "612a8bcd.555ff4",
+ "x": 187.9270477294922,
+ "y": 391.2634563446045,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "b3bdbe0b.cad91",
- "26d5914b.21d37e",
- "3f8d5428.3f490c",
- "2e6ac3e2.42bc2c",
- "8ba722c1.4dbdb"
+ "3bf943df.6744bc",
+ "10f717b7.132f48",
+ "8c12a16e.cbb18",
+ "47b862af.fda80c",
+ "7a94502c.8a083"
]
]
},
{
- "id": "b3bdbe0b.cad91",
+ "id": "3bf943df.6744bc",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 377.53126525878906,
- "y": 212.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 396.5104217529297,
+ "y": 220.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "898ae9b8.952238"
+ "eda4c0e0.9d0f8"
]
]
},
{
- "id": "898ae9b8.952238",
+ "id": "eda4c0e0.9d0f8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 538.5312652587891,
- "y": 212.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 557.5104217529297,
+ "y": 220.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "29c233ae.14280c"
+ "61aab614.c8bcf8"
]
]
},
{
- "id": "26d5914b.21d37e",
+ "id": "10f717b7.132f48",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 350.52325439453125,
- "y": 821.7618678808212,
- "z": "612a8bcd.555ff4",
+ "x": 369.5024108886719,
+ "y": 829.4389524459839,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "5f3074f8.76c69c"
+ "9eddcf71.5eb8f"
]
]
},
{
- "id": "3f8d5428.3f490c",
+ "id": "8c12a16e.cbb18",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 354.2376365661621,
- "y": 992.4764255285263,
- "z": "612a8bcd.555ff4",
+ "x": 373.21679306030273,
+ "y": 1000.153510093689,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "b3fb014d.8c7af"
+ "15081a49.63f566"
]
]
},
{
- "id": "2e6ac3e2.42bc2c",
+ "id": "47b862af.fda80c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 353.99952697753906,
- "y": 1165.9047111272812,
- "z": "612a8bcd.555ff4",
+ "x": 372.9786834716797,
+ "y": 1173.5817956924438,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "bc54858d.9ca818"
+ "b2e1256a.056728"
]
]
},
{
- "id": "bc54858d.9ca818",
+ "id": "b2e1256a.056728",
"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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 537.5710601806641,
- "y": 1166.5238517522812,
- "z": "612a8bcd.555ff4",
+ "x": 556.5502166748047,
+ "y": 1174.2009363174438,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "29c233ae.14280c",
+ "id": "61aab614.c8bcf8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 762.0312652587891,
- "y": 212.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 781.0104217529297,
+ "y": 220.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "45f9882d.888fa8",
- "c9fe1e81.e4448"
+ "6d75ab83.475bf4",
+ "7ea03444.87b99c"
]
]
},
{
- "id": "45f9882d.888fa8",
+ "id": "6d75ab83.475bf4",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 937.5312652587891,
- "y": 232.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 956.5104217529297,
+ "y": 240.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "a900b306.d7c45"
+ "b89e04db.633018"
]
]
},
{
- "id": "a900b306.d7c45",
+ "id": "b89e04db.633018",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",
"comments": "",
- "x": 1075.031265258789,
- "y": 232.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1094.0104217529297,
+ "y": 240.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "6b8a3092.36d36",
+ "id": "ffa5b3a1.3441c",
"type": "other",
"name": "DeleteSOTNConnectivityIntance",
"xml": "<outcome value='DeleteSOTNConnectivityIntance'>",
"comments": "",
"outputs": 1,
- "x": 776.0946769714355,
- "y": 993.0316957235336,
- "z": "612a8bcd.555ff4",
+ "x": 795.0738334655762,
+ "y": 1000.7087802886963,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "77908b22.05afb4"
+ "7d07be98.5012f"
]
]
},
{
- "id": "8144887f.4926d8",
+ "id": "29b99a15.11a946",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 711.6502227783203,
- "y": 1065.2539647817612,
- "z": "612a8bcd.555ff4",
+ "x": 730.6293792724609,
+ "y": 1072.9310493469238,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "8b6a3319.1c2db"
+ "db297816.605e88"
]
]
},
{
- "id": "8b6a3319.1c2db",
+ "id": "db297816.605e88",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",
"comments": "",
- "x": 871.983642578125,
- "y": 1067.365102171898,
- "z": "612a8bcd.555ff4",
+ "x": 890.9627990722656,
+ "y": 1075.0421867370605,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "77908b22.05afb4",
+ "id": "7d07be98.5012f",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1019.9835510253906,
- "y": 995.2539476156235,
- "z": "612a8bcd.555ff4",
+ "x": 1038.9627075195312,
+ "y": 1002.9310321807861,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "174db933.229107",
- "c5c30480.3e58d8",
- "57a9e8ca.5b6ba8",
- "5d3a1919.83ff78"
+ "3952213.ae947de",
+ "8110b258.792d5",
+ "7745399b.00a168",
+ "314d388e.78f918"
]
]
},
{
- "id": "8ba722c1.4dbdb",
+ "id": "7a94502c.8a083",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 371.4598197937012,
- "y": 476.04764211177826,
- "z": "612a8bcd.555ff4",
+ "x": 390.4389762878418,
+ "y": 483.7247266769409,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "c50ae05a.b3f78"
+ "b94cc46d.828738"
]
]
},
{
- "id": "c50ae05a.b3f78",
+ "id": "b94cc46d.828738",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 554.3169860839844,
- "y": 473.19049203395844,
- "z": "612a8bcd.555ff4",
+ "x": 573.296142578125,
+ "y": 480.8675765991211,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "3a3dfff9.f5159",
- "e69e7919.c1d848"
+ "31b835e5.4dbdaa",
+ "390f9d7d.f4c4a2"
]
]
},
{
- "id": "3a3dfff9.f5159",
+ "id": "31b835e5.4dbdaa",
"type": "other",
"name": "ActivateSOTNConnectivityIntance",
"xml": "<outcome value='ActivateSOTNConnectivityIntance'>",
"comments": "",
"outputs": 1,
- "x": 807.5312652587891,
- "y": 452.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 826.5104217529297,
+ "y": 460.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "c446e4e6.e8ac48"
+ "77468a6f.0fba64"
]
]
},
{
- "id": "e69e7919.c1d848",
+ "id": "390f9d7d.f4c4a2",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 737.5312652587891,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 756.5104217529297,
+ "y": 500.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "f911f3da.ef74b"
+ "f71c1a16.68c918"
]
]
},
{
- "id": "f911f3da.ef74b",
+ "id": "f71c1a16.68c918",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",
"comments": "",
- "x": 895.0312652587891,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 914.0104217529297,
+ "y": 500.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "c446e4e6.e8ac48",
+ "id": "77468a6f.0fba64",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1038.531265258789,
- "y": 452.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1057.5104217529297,
+ "y": 460.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "57a9e8ca.5b6ba8",
- "174db933.229107",
- "c5c30480.3e58d8",
- "ca8482b0.138b7"
+ "7745399b.00a168",
+ "3952213.ae947de",
+ "8110b258.792d5",
+ "1f6f232b.661ccd"
]
]
},
{
- "id": "d4ecf814.c6a798",
+ "id": "e3c2b14b.36676",
"type": "other",
"name": "DeactivateSOTNConnectivityIntance",
"xml": "<outcome value='DeactivateSOTNConnectivityIntance'>",
"comments": "",
"outputs": 1,
- "x": 793.9518814086914,
- "y": 823.4762614965439,
- "z": "612a8bcd.555ff4",
+ "x": 812.931037902832,
+ "y": 831.1533460617065,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "3dd1f9de.bc71e6"
+ "b5920e80.fae14"
]
]
},
{
- "id": "5b749a1a.8a0654",
+ "id": "c46566d8.dada58",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 708.9518737792969,
- "y": 892.4762691259384,
- "z": "612a8bcd.555ff4",
+ "x": 727.9310302734375,
+ "y": 900.1533536911011,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "47507d7d.fc2bb4"
+ "a6bce96d.58eb58"
]
]
},
{
- "id": "47507d7d.fc2bb4",
+ "id": "a6bce96d.58eb58",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",
"comments": "",
- "x": 889.9518890380859,
- "y": 893.4762691259384,
- "z": "612a8bcd.555ff4",
+ "x": 908.9310455322266,
+ "y": 901.1533536911011,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "5f3074f8.76c69c",
+ "id": "9eddcf71.5eb8f",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 530.8089370727539,
- "y": 823.9520953893661,
- "z": "612a8bcd.555ff4",
+ "x": 549.7880935668945,
+ "y": 831.6291799545288,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "d4ecf814.c6a798",
- "5b749a1a.8a0654"
+ "e3c2b14b.36676",
+ "c46566d8.dada58"
]
]
},
{
- "id": "b3fb014d.8c7af",
+ "id": "15081a49.63f566",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 534.5867385864258,
- "y": 992.2856494188309,
- "z": "612a8bcd.555ff4",
+ "x": 553.5658950805664,
+ "y": 999.9627339839935,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "6b8a3092.36d36",
- "8144887f.4926d8"
+ "ffa5b3a1.3441c",
+ "29b99a15.11a946"
]
]
},
{
- "id": "3dd1f9de.bc71e6",
+ "id": "b5920e80.fae14",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1053.9200286865234,
- "y": 826.2856563329697,
- "z": "612a8bcd.555ff4",
+ "x": 1072.899185180664,
+ "y": 833.9627408981323,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "174db933.229107",
- "c5c30480.3e58d8",
- "57a9e8ca.5b6ba8",
- "dee8bd53.56b7b"
+ "3952213.ae947de",
+ "8110b258.792d5",
+ "7745399b.00a168",
+ "8df757db.a56268"
]
]
},
{
- "id": "c9fe1e81.e4448",
+ "id": "7ea03444.87b99c",
"type": "other",
"name": "CreateSOTNConnectivityIntance",
"xml": "<outcome value='CreateSOTNConnectivityIntance'>",
"comments": "",
"outputs": 1,
- "x": 1003.5312652587891,
- "y": 192.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1022.5104217529297,
+ "y": 200.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "f41339c3.f110b8"
+ "5c394cce.8332b4"
]
]
},
{
- "id": "f41339c3.f110b8",
+ "id": "5c394cce.8332b4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1218.531265258789,
- "y": 192.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1237.5104217529297,
+ "y": 200.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "78324d1c.b05904"
+ "aacac661.db5fc8"
]
]
},
{
- "id": "78324d1c.b05904",
+ "id": "aacac661.db5fc8",
"type": "for",
"name": "for loop i - Network input parameters",
"xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 1469.031265258789,
- "y": 192.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1488.0104217529297,
+ "y": 200.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "6af6c64a.163a28"
+ "f1c9f306.088fe"
]
]
},
{
- "id": "6af6c64a.163a28",
+ "id": "f1c9f306.088fe",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1697.531265258789,
- "y": 192.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1716.5104217529297,
+ "y": 200.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "9cb7bf55.5070b",
- "46cd63b4.17fedc",
- "8ab4804d.8981"
+ "1c0f238b.8a133c",
+ "22c01d86.bf0c72",
+ "5fb7d8b1.555d08"
]
]
},
{
- "id": "9cb7bf55.5070b",
+ "id": "1c0f238b.8a133c",
"type": "set",
"name": "clear tmp-data",
"xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
"comments": "",
- "x": 1880.531265258789,
- "y": 152.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1899.5104217529297,
+ "y": 160.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "46cd63b4.17fedc",
+ "id": "22c01d86.bf0c72",
"type": "set",
"name": "set tmp-data",
"xml": "<set>\n<parameter name='tmp.name' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`\"/>\n",
"comments": "",
- "x": 1875.031265258789,
- "y": 192.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1894.0104217529297,
+ "y": 200.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "8ab4804d.8981",
+ "id": "5fb7d8b1.555d08",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$tmp.name`\">\n",
"comments": "",
"outputs": 1,
- "x": 1875.031265258789,
- "y": 232.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1894.0104217529297,
+ "y": 240.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "9592d9e2.7991f8",
- "97143bfc.87f758",
- "d423ac2f.9c51f"
+ "3a78badb.a37d36",
+ "6d81ed6a.535234",
+ "d7b4d45a.818368"
]
]
},
{
- "id": "7c1a345e.318e8c",
+ "id": "a8cb3e9.94103c",
"type": "switchNode",
"name": "switch value",
"xml": "<switch test=\"`$tmp.value`\">\n",
"comments": "",
"outputs": 1,
- "x": 2335.0314331054688,
- "y": 185.00002002716064,
- "z": "612a8bcd.555ff4",
+ "x": 2354.0105895996094,
+ "y": 192.6771045923233,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "71892760.797d58"
+ "f59640c.a9369c"
]
]
},
{
- "id": "d423ac2f.9c51f",
+ "id": "d7b4d45a.818368",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2094.5316009521484,
- "y": 251.00000762939453,
- "z": "612a8bcd.555ff4",
+ "x": 2113.510757446289,
+ "y": 258.6770921945572,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "f8a3cfb8.ff88b"
+ "83193a9c.5212a8"
]
]
},
{
- "id": "f8a3cfb8.ff88b",
+ "id": "83193a9c.5212a8",
"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-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
"comments": "",
- "x": 2269.5316047668457,
- "y": 250.00000762939453,
- "z": "612a8bcd.555ff4",
+ "x": 2288.5107612609863,
+ "y": 257.6770921945572,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "9592d9e2.7991f8",
+ "id": "3a78badb.a37d36",
"type": "other",
"name": "name",
"xml": "<outcome value='name'>",
"comments": "",
"outputs": 1,
- "x": 2094.5316009521484,
- "y": 135.00000190734863,
- "z": "612a8bcd.555ff4",
+ "x": 2113.510757446289,
+ "y": 142.6770864725113,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "7c1a345e.318e8c"
+ "a8cb3e9.94103c"
]
]
},
{
- "id": "97143bfc.87f758",
+ "id": "6d81ed6a.535234",
"type": "other",
"name": "description",
"xml": "<outcome value='description'>",
"comments": "",
"outputs": 1,
- "x": 2106.5313568115234,
- "y": 188.66666412353516,
- "z": "612a8bcd.555ff4",
+ "x": 2125.510513305664,
+ "y": 196.34374868869781,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "7c1a345e.318e8c"
+ "a8cb3e9.94103c"
]
]
},
{
- "id": "71892760.797d58",
+ "id": "f59640c.a9369c",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2478.5314331054688,
- "y": 185.00002002716064,
- "z": "612a8bcd.555ff4",
+ "x": 2497.5105895996094,
+ "y": 192.6771045923233,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "51159df7.8f7f34"
+ "d1c13d61.21b1c"
]
]
},
{
- "id": "51159df7.8f7f34",
+ "id": "d1c13d61.21b1c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
"comments": "",
- "x": 2636.5314331054688,
- "y": 185.00002002716064,
- "z": "612a8bcd.555ff4",
+ "x": 2655.5105895996094,
+ "y": 192.6771045923233,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "57a9e8ca.5b6ba8",
+ "id": "7745399b.00a168",
"type": "switchNode",
"name": "switch service-data.networks.network_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1343.4201278686523,
- "y": 496.3333123922348,
- "z": "612a8bcd.555ff4",
+ "x": 1362.399284362793,
+ "y": 504.01039695739746,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "c975a187.53f03",
- "c343c1d6.32b89"
+ "c70694c.d9fd968",
+ "f88531e6.ae397"
]
]
},
{
- "id": "c975a187.53f03",
+ "id": "c70694c.d9fd968",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1597.031265258789,
- "y": 472.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1616.0104217529297,
+ "y": 480.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "7bf63be7.236304"
+ "58bafa7d.dc8534"
]
]
},
{
- "id": "7bf63be7.236304",
+ "id": "58bafa7d.dc8534",
"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": 1775.031265258789,
- "y": 472.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1794.0104217529297,
+ "y": 480.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "c343c1d6.32b89",
+ "id": "f88531e6.ae397",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1577.531265258789,
- "y": 512.9999994039536,
- "z": "612a8bcd.555ff4",
+ "x": 1596.5104217529297,
+ "y": 520.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "8b3c7b72.8416d8"
+ "adf12a25.f70768"
]
]
},
{
- "id": "8b3c7b72.8416d8",
+ "id": "adf12a25.f70768",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1738.531265258789,
- "y": 512.9999994039536,
- "z": "612a8bcd.555ff4",
+ "x": 1757.5104217529297,
+ "y": 520.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "ea8be443.435208",
- "f4cb0140.f19dc"
+ "81a71d76.fca27",
+ "81dbd082.fe84e"
]
]
},
{
- "id": "ea8be443.435208",
+ "id": "81a71d76.fca27",
"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": 2001.031265258789,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 2020.0104217529297,
+ "y": 500.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "1c69986e.121d38"
+ "bfc00421.e16008"
]
]
},
{
- "id": "1c69986e.121d38",
+ "id": "bfc00421.e16008",
"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": 2287.031265258789,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 2306.0104217529297,
+ "y": 500.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "835d02de.19c93"
+ "c0cf0cfd.ee88d"
]
]
},
{
- "id": "835d02de.19c93",
+ "id": "c0cf0cfd.ee88d",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2457.531265258789,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 2476.5104217529297,
+ "y": 500.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "a4620b88.fbb918"
+ "be39b005.2a634"
]
]
},
{
- "id": "a4620b88.fbb918",
+ "id": "4180e683.809aa8",
"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].network-data.`' />\n",
"comments": "",
- "x": 2680.531265258789,
- "y": 492.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 2866.510482788086,
+ "y": 443.67710971832275,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "2c706feb.2be3b",
+ "id": "8f21dfe1.e194f",
"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": 2215.031265258789,
- "y": 532.9999994039536,
- "z": "612a8bcd.555ff4",
+ "x": 2234.0104217529297,
+ "y": 540.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "c1c7826b.646b7",
+ "id": "d566fcec.dd82e",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 2077.531265258789,
- "y": 532.9999994039536,
- "z": "612a8bcd.555ff4",
+ "x": 2096.5104217529297,
+ "y": 540.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "2c706feb.2be3b"
+ "8f21dfe1.e194f"
]
]
},
{
- "id": "f4cb0140.f19dc",
+ "id": "81dbd082.fe84e",
"type": "switchNode",
"name": "switch tmp.nidx ",
"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1923.531265258789,
- "y": 532.9999994039536,
- "z": "612a8bcd.555ff4",
+ "x": 1942.5104217529297,
+ "y": 540.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "c1c7826b.646b7"
+ "d566fcec.dd82e"
]
]
},
{
- "id": "ca8482b0.138b7",
+ "id": "1f6f232b.661ccd",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1302.6979522705078,
- "y": 571.8888772726059,
- "z": "612a8bcd.555ff4",
+ "x": 1321.6771087646484,
+ "y": 579.5659618377686,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "ac1c944.a70cf68",
- "64f9182f.832d98"
+ "2ea404ed.2890bc",
+ "3fc8a371.2d444c"
]
]
},
{
- "id": "ac1c944.a70cf68",
+ "id": "2ea404ed.2890bc",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 1599.5313682556152,
- "y": 571.8888753652573,
- "z": "612a8bcd.555ff4",
+ "x": 1618.5105247497559,
+ "y": 579.5659599304199,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "dd869d4d.7e624"
+ "4920efaf.e8518"
]
]
},
{
- "id": "64f9182f.832d98",
+ "id": "3fc8a371.2d444c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1567.5313682556152,
- "y": 611.8888753652573,
- "z": "612a8bcd.555ff4",
+ "x": 1586.5105247497559,
+ "y": 619.5659599304199,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "52f7cab.128ad34"
+ "e8e9554e.9ed228"
]
]
},
{
- "id": "52f7cab.128ad34",
+ "id": "e8e9554e.9ed228",
"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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1725.0313682556152,
- "y": 611.8888753652573,
- "z": "612a8bcd.555ff4",
+ "x": 1744.0105247497559,
+ "y": 619.5659599304199,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "c5c30480.3e58d8",
+ "id": "8110b258.792d5",
"type": "switchNode",
"name": "switch network-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1249.531265258789,
- "y": 432.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1268.5104217529297,
+ "y": 440.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "edcc0678.bb4db8"
+ "2154102d.3723d"
]
]
},
{
- "id": "edcc0678.bb4db8",
+ "id": "2154102d.3723d",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1477.531265258789,
- "y": 432.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1496.5104217529297,
+ "y": 440.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "df1eaa9a.c904b8"
+ "6116891a.4a7628"
]
]
},
{
- "id": "df1eaa9a.c904b8",
+ "id": "6116891a.4a7628",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
"comments": "",
- "x": 1615.031265258789,
- "y": 432.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1634.0104217529297,
+ "y": 440.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "174db933.229107",
+ "id": "3952213.ae947de",
"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=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1284.031265258789,
- "y": 392.99999940395355,
- "z": "612a8bcd.555ff4",
+ "x": 1303.0104217529297,
+ "y": 400.6770839691162,
+ "z": "85ea7447.de94b8",
"wires": [
[
@@ -1053,139 +1053,139 @@
]
},
{
- "id": "dee8bd53.56b7b",
+ "id": "8df757db.a56268",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1330.864517211914,
- "y": 821.8888543844223,
- "z": "612a8bcd.555ff4",
+ "x": 1349.8436737060547,
+ "y": 829.565938949585,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "5a840e5a.dfcfb",
- "1e04803d.2175e"
+ "20aef547.50072a",
+ "df0219da.c64748"
]
]
},
{
- "id": "5a840e5a.dfcfb",
+ "id": "20aef547.50072a",
"type": "outcome",
"name": "outcome Active",
"xml": "<outcome value='Active'>\n",
"comments": "",
"outputs": 1,
- "x": 1604.1978912353516,
- "y": 796.3333123922348,
- "z": "612a8bcd.555ff4",
+ "x": 1623.1770477294922,
+ "y": 804.0103969573975,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "1bb2b0bd.7522ff"
+ "7cd2b1ba.76f03"
]
]
},
{
- "id": "1e04803d.2175e",
+ "id": "df0219da.c64748",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1574.1978912353516,
- "y": 836.3333123922348,
- "z": "612a8bcd.555ff4",
+ "x": 1593.1770477294922,
+ "y": 844.0103969573975,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "f180da96.e20aa8"
+ "cde4a066.01eff"
]
]
},
{
- "id": "f180da96.e20aa8",
+ "id": "cde4a066.01eff",
"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 is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1740.1978912353516,
- "y": 838.3333123922348,
- "z": "612a8bcd.555ff4",
+ "x": 1759.1770477294922,
+ "y": 846.0103969573975,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "5d3a1919.83ff78",
+ "id": "314d388e.78f918",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1319.753433227539,
- "y": 992.9999383687973,
- "z": "612a8bcd.555ff4",
+ "x": 1338.7325897216797,
+ "y": 1000.67702293396,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "c0abb2c6.46f4e",
- "d275091d.1d6858"
+ "7c9245c6.2a554c",
+ "6b9c73ba.23740c"
]
]
},
{
- "id": "c0abb2c6.46f4e",
+ "id": "7c9245c6.2a554c",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 1619.7534942626953,
- "y": 960.7777341604233,
- "z": "612a8bcd.555ff4",
+ "x": 1638.732650756836,
+ "y": 968.4548187255859,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "77485a8b.427a64"
+ "342b3c07.812f54"
]
]
},
{
- "id": "d275091d.1d6858",
+ "id": "6b9c73ba.23740c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1563.0868072509766,
- "y": 1007.4443963766098,
- "z": "612a8bcd.555ff4",
+ "x": 1582.0659637451172,
+ "y": 1015.1214809417725,
+ "z": "85ea7447.de94b8",
"wires": [
[
- "1df75e1e.6ce5d2"
+ "ed451401.504a48"
]
]
},
{
- "id": "1df75e1e.6ce5d2",
+ "id": "ed451401.504a48",
"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 is not in appropriate state for delete. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1729.0868072509766,
- "y": 1009.4443963766098,
- "z": "612a8bcd.555ff4",
+ "x": 1748.0659637451172,
+ "y": 1017.1214809417725,
+ "z": "85ea7447.de94b8",
"wires": [
]
},
{
- "id": "dd869d4d.7e624",
+ "id": "4920efaf.e8518",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1787.5312461853027,
- "y": 572.9999593496323,
- "z": "612a8bcd.555ff4",
+ "x": 1806.5104026794434,
+ "y": 580.6770439147949,
+ "z": "85ea7447.de94b8",
"wires": [
[
@@ -1193,15 +1193,15 @@
]
},
{
- "id": "1bb2b0bd.7522ff",
+ "id": "7cd2b1ba.76f03",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1804.197769165039,
- "y": 794.4814447164536,
- "z": "612a8bcd.555ff4",
+ "x": 1823.1769256591797,
+ "y": 802.1585292816162,
+ "z": "85ea7447.de94b8",
"wires": [
[
@@ -1209,19 +1209,49 @@
]
},
{
- "id": "77485a8b.427a64",
+ "id": "342b3c07.812f54",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1835.3089752197266,
- "y": 961.148070693016,
- "z": "612a8bcd.555ff4",
+ "x": 1854.2881317138672,
+ "y": 968.8251552581787,
+ "z": "85ea7447.de94b8",
"wires": [
[
]
]
+ },
+ {
+ "id": "f267869b.ce6d48",
+ "type": "break",
+ "name": "break",
+ "xml": "<break>\n",
+ "comments": "",
+ "x": 2768.676830291748,
+ "y": 545.0103549957275,
+ "z": "85ea7447.de94b8",
+ "wires": [
+
+ ]
+ },
+ {
+ "id": "be39b005.2a634",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 2626.676933288574,
+ "y": 497.01043224334717,
+ "z": "85ea7447.de94b8",
+ "wires": [
+ [
+ "4180e683.809aa8",
+ "f267869b.ce6d48"
+ ]
+ ]
}
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 653e68a8..f7782fb8 100755..100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -1,45 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
- <method rpc="network-topology-operation" mode="sync">
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='network-topology-operation' mode='sync'>
<block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="validate-network-input" mode="sync" />
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
- <outcome value="assign">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' ></call>
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value='assign'>
<block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-assign" mode="sync" />
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' ></call>
</block>
</outcome>
- <outcome value="activate">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="ActivateDCINetworkInstance">
- <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-activate" mode="sync" />
+ <outcome value='activate'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='ActivateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' ></call>
</outcome>
- <outcome value="other">
+ <outcome value='ActivateDCINetworkInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
<block atomic="true">
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
+ <outcome value='true'>
<set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />
</set>
</outcome>
</switch>
</for>
<switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
@@ -48,13 +52,13 @@
</block>
</outcome>
</switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="PendingCreate">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-activate" mode="sync" />
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='PendingCreate'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' ></call>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
</return>
@@ -64,87 +68,96 @@
</outcome>
</switch>
</outcome>
- <outcome value="deactivate">
+ <outcome value='deactivate'>
<block atomic="true">
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeactivateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' ></call>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
- <set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
</outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='Created'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeActivateDCINetworkInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' ></call>
+ </outcome>
+ <outcome value='Other'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' ></call>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
</switch>
</block>
</outcome>
</switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="Created">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeActivateDCINetworkInstance">
- <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync" />
- </outcome>
- <outcome value="Other">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-deactivate" mode="sync" />
- </outcome>
- </switch>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
</block>
</outcome>
- <outcome value="unassign">
+ <outcome value='unassign'>
<block atomic="true">
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
+ <outcome value='true'>
<set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />
</set>
</outcome>
</switch>
</for>
<switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
@@ -153,16 +166,16 @@
</block>
</outcome>
</switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="PendingCreate">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync" />
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='PendingCreate'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
</outcome>
- <outcome value="PendingDelete">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync" />
+ <outcome value='PendingDelete'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
</return>
@@ -170,32 +183,46 @@
</switch>
</block>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
</return>
</outcome>
- <outcome value="create">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-create" mode="sync" />
- </block>
+ <outcome value='create'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='CreateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
</outcome>
- <outcome value="delete">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-delete" mode="sync" />
- </block>
+ <outcome value='delete'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeleteSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
</outcome>
</switch>
<set>
- <parameter name="ack-final" value="Y" />
+ <parameter name="ack-final" value="Y"/>
</set>
- <return status="success">
+ <return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
</return>
</block>
</method>
-</service-logic>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
index 5a7aa88d..93de3abb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
@@ -1,41 +1,44 @@
-<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.1-SNAPSHOT">
- <method rpc="sotn-network-topology-operation-activate" mode="sync">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="validate-sotn-network-input-parameters" mode="sync" />
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sotn-network-topology-operation-activate" />
- <parameter name="field3" value="SOTN-Activate" />
- </record>
- <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>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />
- </set>
- <set>
- <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
- </set>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="Active" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action" value="`$network-topology-operation-input.sdnc-request-header.svc-action`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
- </set>
- <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id">
- <parameter name="configuration-id" value="`$network-topology-operation-input.network-information.network-id`" />
- <parameter name="operational-status" value="Active" />
- </update>
- <return status="success">
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-network-topology-operation-activate' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sotn-network-topology-operation-activate"/>
+ <parameter name="field3" value="SOTN-Activate"/>
+ </record>
+ <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>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+ </set>
+ <set>
+ <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
+ </set>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Active' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+ </set>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration'
+ key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
+ <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name='operational-status' value='Active' />
+ </update>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index e5d9268c..fa2547d3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.1-SNAPSHOT">
- <method rpc="sotn-network-topology-operation-create" mode="sync">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="validate-sotn-network-input-parameters" mode="sync" />
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
- <parameter name="ctx-destination" value="prop.sotn.network-id" />
- </execute>
- <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
- <block>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.etht-svc-name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.etht-svc-descr" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.tenantId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.vpnType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.cir" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.eir" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.cbs" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.pbs" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.colorAware" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.couplingFlag" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.access-provider-id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.access-client-id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.access-topology-id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.access-node-id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.access-ltp-id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`">
- <outcome value="true">
- <set>
- <parameter name="prop.sotn.cVLAN" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
- </set>
- </outcome>
- </switch>
- </block>
- </for>
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <set>
- <parameter name="nidx" value="0" />
- </set>
- </outcome>
- <outcome value="Other">
- <block>
- <set>
- <parameter name="nidx" value="`$service-data.networks.network_length`" />
- </set>
- <for index="idx" start="0" end="`$nidx`">
- <switch test="`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id already found in service-data" />
- </return>
- </outcome>
- </switch>
- </for>
- </block>
- </outcome>
- </switch>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sotn-network-topology-operation-create" />
- <parameter name="field3" value="SOTN-Config" />
- </record>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-id" value="`$prop.sotn.network-id`" />
- <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-request-input." value="`$network-topology-operation-input.network-request-input.`" />
- <parameter name="service-data.networks.network_length" value="`$nidx+1`" />
- </set>
- <set>
- <parameter name="networkId" value="`$prop.sotn.network-id`" />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
- </set>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="Created" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action" value="`$network-topology-operation-input.sdnc-request-header.svc-action`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
- </set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.sotn.network-id">
- <parameter name="configuration-id" value="`$prop.sotn.network-id`" />
- <parameter name="configuration-name" value="`$prop.sotn.client-svc-name`" />
- <parameter name="configuration-type" value="`$prop.sotn.client-svc-descr`" />
- <parameter name="configuration-sub-type" value="`$prop.sotn.tenantId`" />
- <parameter name="orchestration-status" value="`$prop.sotn.vpnType`" />
- <parameter name="management-option" value="`$prop.sotn.cir`" />
- <parameter name="operational-status" value="Created" />
- <parameter name="model-customization-id" value="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`" />
- <parameter name="model-invariant-id" value="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`" />
- <parameter name="model-version-id" value="`$network-topology-operation-input.network-information.onap-model-information.model-uuid`" />
- <parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
- </save>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-instance-id AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.sotn.network-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
- </save>
- <set>
- <parameter name="unique-src-ltpId" value="`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`" />
- </set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration:relationship-list" key="configuration.configuration-id = $prop.sotn.network-id" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-src-ltpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-src-ltpId`" />
- </save>
- <return status="success">
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-network-topology-operation-create' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+ <parameter name="ctx-destination" value="prop.sotn.network-id"/>
+ </execute>
+ <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+ <block>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nidx' value='0' />
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <set>
+ <parameter name='nidx' value='`$service-data.networks.network_length`' />
+ </set>
+ <for index='idx' start='0' end='`$nidx`' >
+ <switch test="`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id already found in service-data" />
+ </return>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sotn-network-topology-operation-create"/>
+ <parameter name="field3" value="SOTN-Config"/>
+ </record>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />
+ <parameter name='service-data.networks.network_length' value='`$nidx+1`' />
+ </set>
+ <set>
+ <parameter name='networkId' value='`$prop.sotn.network-id`' />
+ <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ </set>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+ </set>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration'
+ key='configuration.configuration-id = $prop.sotn.network-id' >
+ <parameter name='configuration-id' value='`$prop.sotn.network-id`' />
+ <parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />
+ <parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />
+ <parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />
+ <parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />
+ <parameter name='management-option' value='`$prop.sotn.cir`' />
+ <parameter name='operational-status' value='Created' />
+ <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+ <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+ <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+ <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
+ </save>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+ key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
+ AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id
+ AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.sotn.network-id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
+ </save>
+ <set>
+ <parameter name='unique-src-ltpId' value="`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`" />
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
index 33c69ce9..27d27388 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
@@ -1,41 +1,44 @@
-<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.1-SNAPSHOT">
- <method rpc="sotn-network-topology-operation-deactivate" mode="sync">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="validate-sotn-network-input-parameters" mode="sync" />
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sotn-network-topology-operation-activate" />
- <parameter name="field3" value="SOTN-Deactivate" />
- </record>
- <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>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />
- </set>
- <set>
- <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
- <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
- </set>
- <set>
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="PendingDelete" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action" value="`$network-topology-operation-input.sdnc-request-header.svc-action`" />
- <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
- </set>
- <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id">
- <parameter name="configuration-id" value="`$network-topology-operation-input.network-information.network-id`" />
- <parameter name="operational-status" value="PendingDelete" />
- </update>
- <return status="success">
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-network-topology-operation-deactivate' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sotn-network-topology-operation-activate"/>
+ <parameter name="field3" value="SOTN-Deactivate"/>
+ </record>
+ <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>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+ </set>
+ <set>
+ <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` " />
+ </set>
+ <set>
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+ </set>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration'
+ key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
+ <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name='operational-status' value='PendingDelete' />
+ </update>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
index b9ad46c5..c2d0c9ab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
@@ -1,29 +1,34 @@
-<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.1-SNAPSHOT">
- <method rpc="sotn-network-topology-operation-delete" mode="sync">
- <block atomic="true">
- <call module="GENERIC-RESOURCE-API" rpc="validate-sotn-network-input-parameters" mode="sync" />
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="sotn-network-topology-operation-delete" />
- <parameter name="field3" value="SOTN-Delete" />
- </record>
- <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />
- <set>
- <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`" />
- </set>
- <set>
- <parameter name="service-data.networks.network[$nidx]." value="" />
- </set>
- <set>
- <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
- <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'` " />
- </set>
- <return status="success">
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-network-topology-operation-delete' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sotn-network-topology-operation-delete"/>
+ <parameter name="field3" value="SOTN-Delete"/>
+ </record>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='configuration'
+ key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'></delete>
+ <set>
+ <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>
+ </set>
+ <set>
+ <parameter name="service-data.networks.network[$tmp.nidx]." value=""/>
+ </set>
+ <set>
+ <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $network-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'` " />
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic>
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 f4e79be1..db1a73bb 100755..100644
--- 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
@@ -1,82 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
- <method rpc="validate-network-input" mode="sync">
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='validate-network-input' mode='sync'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-request-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="request-information.request-action is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.service-information.service-instance-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.service-information.service-instance-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.service-instance-id is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
- <outcome value="assign">
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value='assign'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="CreateNetworkInstance">
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='CreateNetworkInstance'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="" />
- <outcome value="Other">
+ <switch test='`$network-topology-operation-input.network-information.network-id`'>
+ <outcome value=''></outcome>
+ <outcome value='Other'>
<block>
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log" />
- <parameter name="field1" value="__TIMESTAMP__" />
- <parameter name="field2" value="GENERIC-RESOURCE-API.validate-network-input" />
- <parameter name="field3" value="`$network-topology-operation-input.sdnc-request-header.svc-request-id`" />
- <parameter name="field4" value="Network id proveded but no network exists that matches" />
- <parameter name="field5" value="`$network-topology-operation-input.network-information.network-id`" />
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="GENERIC-RESOURCE-API.validate-network-input"/>
+ <parameter name="field3" value="`$network-topology-operation-input.sdnc-request-header.svc-request-id`"/>
+ <parameter name="field4" value="Network id proveded but no network exists that matches"/>
+ <parameter name="field5" value="`$network-topology-operation-input.network-information.network-id`"/>
</record>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
+ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />
</set>
</block>
</outcome>
</switch>
</for>
<switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
</return>
@@ -88,119 +89,137 @@
</block>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-request-input.tenant`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-request-input.tenant`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-request-input.tenant is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-request-input.aic-cloud-region`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.service-information.onap-model-information.model-uuid`">
- <outcome value="">
+ <switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
+ <outcome value=''>
<block atomic="true">
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="service-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+ pfx='service-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+ and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+ pfx='network-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
</block>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="service-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+ pfx='service-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+ and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+ pfx='network-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
@@ -209,9 +228,9 @@
</switch>
</block>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="request-information.request-action is required to be CreateNetworkInstance for svc-action=assign" />
</return>
@@ -219,136 +238,157 @@
</switch>
</block>
</outcome>
- <outcome value="activate">
+ <outcome value='activate'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="ActivateDCINetworkInstance">
- <block atomic="true" />
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='ActivateSOTNConnectivityInstance'>
+ <block atomic="true"></block>
</outcome>
- <outcome value="CreateNetworkInstance">
+ <outcome value='ActivateDCINetworkInstance'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='CreateNetworkInstance'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.network-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.network-information.network-id is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-uuid`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-request-input.tenant`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-request-input.tenant`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="network-request-input.tenant is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-request-input.aic-cloud-region`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
</return>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.service-information.onap-model-information.model-uuid`">
- <outcome value="">
+ <switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
+ <outcome value=''>
<block atomic="true">
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="service-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+ pfx='service-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+ and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+ pfx='network-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
</block>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block atomic="true">
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="service-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+ pfx='service-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+ key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+ and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+ pfx='network-model'>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'No network model found for customization UUID ' + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid + ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+ <parameter name="error-message" value="`'No network model found for customization UUID '
+ + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+ ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
</return>
</outcome>
</get-resource>
@@ -357,9 +397,9 @@
</switch>
</block>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="request-information.request-action is required to be CreateNetworkInstance for svc-action=activate" />
</return>
@@ -367,18 +407,21 @@
</switch>
</block>
</outcome>
- <outcome value="deactivate">
+ <outcome value='deactivate'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeActivateDCINetworkInstance">
- <block atomic="true" />
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeactivateSOTNConnectivityInstance'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='DeActivateDCINetworkInstance'>
+ <block atomic="true"></block>
</outcome>
- <outcome value="DeleteNetworkInstance">
+ <outcome value='DeleteNetworkInstance'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.network-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.network-information.network-id is a required input" />
</return>
@@ -386,9 +429,9 @@
</switch>
</block>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=deactivate" />
</return>
@@ -396,15 +439,15 @@
</switch>
</block>
</outcome>
- <outcome value="unassign">
+ <outcome value='unassign'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeleteNetworkInstance">
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeleteNetworkInstance'>
<block atomic="true">
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <switch test='`$network-topology-operation-input.network-information.network-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="service-information.network-information.network-id is a required input" />
</return>
@@ -412,9 +455,9 @@
</switch>
</block>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=unassign" />
</return>
@@ -423,11 +466,11 @@
</block>
</outcome>
</switch>
- <return status="success">
+ <return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
</return>
</block>
</method>
-</service-logic>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
index 7d4e5feb..a8587049 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
@@ -1,297 +1,308 @@
-<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.1-SNAPSHOT">
- <method rpc="validate-sotn-network-input-parameters" mode="sync">
- <block atomic="true">
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
- </return>
- </outcome>
- </switch>
- <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
- <outcome value="create">
- <block atomic="true">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="CreateSOTNConnectivityIntance">
- <block atomic="true">
- <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
- <block>
- <set>
- <parameter name="tmp.name" value="" />
- <parameter name="tmp.value" value="" />
- </set>
- <set>
- <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`" />
- <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`" />
- </set>
- <switch test="`$tmp.name`">
- <outcome value="name">
- <switch test="`$tmp.value`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
- </return>
- </outcome>
- </switch>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='validate-sotn-network-input-parameters' mode='sync'>
+ <block atomic="true">
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
+ </return>
+ </outcome>
+ </switch>
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value='create'>
+ <block atomic="true">
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='CreateSOTNConnectivityIntance'>
+ <block atomic="true">
+ <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+ <block>
+ <set>
+ <parameter name='tmp.name' value='' />
+ <parameter name='tmp.value' value='' />
+ </set>
+ <set>
+ <parameter name='tmp.name' value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`"/>
+ <parameter name='tmp.value' value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`"/>
+ </set>
+ <switch test="`$tmp.name`">
+ <outcome value='name'>
+ <switch test="`$tmp.value`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='description'>
+ <switch test="`$tmp.value`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='activate'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='ActivateSOTNConnectivityIntance'>
+ <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="$network-topology-operation-input.network-information.network-id"/>
+ </execute>
+ <switch test="`$network-topology-operation-input.network-information.network-id`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+ </return>
</outcome>
- <outcome value="description">
- <switch test="`$tmp.value`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
- </return>
- </outcome>
- </switch>
+ </switch>
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
</outcome>
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
- </return>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
+ </set>
+ <break></break>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
</outcome>
- </switch>
- </block>
- </for>
- </block>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value="activate">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="ActivateSOTNConnectivityIntance">
- <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="$network-topology-operation-input.network-information.network-id" />
- </execute>
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
- </return>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value="Other">
- <block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
- <set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].network-data.`" />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='Created'>
+ <block atomic="true"></block>
</outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="Created">
- <block atomic="true" />
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate" />
- </return>
- </outcome>
- </switch>
- </outcome>
- <outcome value="deactivate">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeactivateSOTNConnectivityIntance">
- <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="$network-topology-operation-input.network-information.network-id" />
- </execute>
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
- </return>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value="Other">
- <block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
- <set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].network-data.`" />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
</outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="Active">
- <block atomic="true" />
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate" />
- </return>
- </outcome>
- </switch>
- </outcome>
- <outcome value="delete">
- <switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeleteSOTNConnectivityIntance">
- <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="$network-topology-operation-input.network-information.network-id" />
- </execute>
- <switch test="`$network-topology-operation-input.network-information.network-id`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
- </return>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network_length`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value="Other">
- <block atomic="true">
- <for index="nidx" start="0" end="`$service-data.networks.network_length`">
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value="true">
- <set>
- <parameter name="tmp.nidx" value="`$nidx`" />
- <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].network-data.`" />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value="">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='deactivate'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeactivateSOTNConnectivityIntance'>
+ <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="$network-topology-operation-input.network-information.network-id"/>
+ </execute>
+ <switch test="`$network-topology-operation-input.network-information.network-id`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+ </return>
</outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
- <outcome value="PendingDelete">
- <block atomic="true" />
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for delete. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
+ </switch>
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
+ </set>
+ <break></break>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='Active'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='delete'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeleteSOTNConnectivityIntance'>
+ <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="$network-topology-operation-input.network-information.network-id"/>
+ </execute>
+ <switch test="`$network-topology-operation-input.network-information.network-id`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+ </return>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
+ </set>
+ <break></break>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='PendingDelete'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for delete. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete" />
- </return>
- </outcome>
- </switch>
- </outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
- </return>
- </outcome>
- </switch>
- </block>
- </method>
+ <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </method>
</service-logic>