aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurav Agrawal <gaurav.agrawal@huawei.com>2017-10-04 15:03:44 +0530
committerGaurav Agrawal <gaurav.agrawal@huawei.com>2017-10-04 09:38:09 +0000
commitfdde7ced2af69fdd6f3fdae6362b06bf22fe8136 (patch)
treef7286415c061ae45b16ee093d114392e41094274
parent934177c0efb84b6e4d2e41bdb2e0ad2c3c8f5949 (diff)
Patched DCI overlay DG to main DG
Changes includes: 1) Patched DCI overlay DGs with network-topology-operation DG. 2) Prefixed DCI overlay dg with dci-connects to avoid duplication with existing network-topology-operation-activate DG. Change-Id: I3b9f99fb5f1e5be27707aaa7c7b2dc9144c74398 Issue-Id: SDNC-110 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com> Former-commit-id: bd0ebcc0e2f442233845fa6fe631c19173e8ac35
Diffstat
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json4
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json1390
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml2
-rwxr-xr-xplatform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml310
4 files changed, 983 insertions, 723 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
index 091df632..358e7ec9 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -34,8 +34,8 @@
{
"id":"27054278.56f0ce",
"type":"method",
- "name":"method network-topology-operation-activate",
- "xml":"<method rpc='network-topology-operation-activate' mode='sync'>\n",
+ "name":"method dci-connects-network-topology-operation-activate",
+ "xml":"<method rpc='dci-connects-network-topology-operation-activate' mode='sync'>\n",
"comments":"",
"outputs":1,
"x":230.01565551757812,
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 e0baa7a1..41243f3b 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,842 +1,1010 @@
[
{
- "id": "41c5caea.9adc34",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 95.54763793945312,
- "y": 109.41365623474121,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"85a3d498.ee70b8",
+ "type":"dgstart",
+ "name":"DGSTART",
+ "outputs":1,
+ "x":467.0155944824219,
+ "y":473.0155944824219,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "cc320d31.bccdf"
+ "484faa8a.853654"
]
]
},
{
- "id": "cc320d31.bccdf",
- "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": 177.5,
- "y": 149.6517686843872,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"484faa8a.853654",
+ "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":548.9679565429688,
+ "y":513.2537069320679,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "82b10f50.5d8e8"
+ "577e559b.5bf3fc"
]
]
},
{
- "id": "82b10f50.5d8e8",
- "type": "method",
- "name": "network-topology-operation",
- "xml": "<method rpc='network-topology-operation' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 173.97626495361328,
- "y": 189.4136505126953,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"577e559b.5bf3fc",
+ "type":"method",
+ "name":"network-topology-operation",
+ "xml":"<method rpc='network-topology-operation' mode='sync'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":545.444221496582,
+ "y":553.015588760376,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "bf4f5344.1024c8"
+ "d89fb108.c15da"
]
]
},
{
- "id": "17ece3ab.35321c",
- "type": "comment",
- "name": " NETWORK-TOPOLOGY-OPERATION ",
- "info": "",
- "comments": "",
- "x": 489.89249420166016,
- "y": 57,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"ac32132a.0500d",
+ "type":"comment",
+ "name":" NETWORK-TOPOLOGY-OPERATION ",
+ "info":"",
+ "comments":"",
+ "x":861.3604507446289,
+ "y":420.60193824768066,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "bf4f5344.1024c8",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 209.54766845703125,
- "y": 272.85713958740234,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"d89fb108.c15da",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":581.015625,
+ "y":636.459077835083,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "d50c5a2a.c0cea",
- "b762591f.2fb7a",
- "f06b8960.155ea8",
- "f1b5981d.bfa858"
+ "e42a6d76.72f57",
+ "6e4d7ebf.93e81",
+ "ae97e5fa.ddc148",
+ "879a69b3.6edd88"
]
]
},
{
- "id": "d50c5a2a.c0cea",
- "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": 439.6310272216797,
- "y": 896.6997756958008,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"e42a6d76.72f57",
+ "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":811.0989837646484,
+ "y":1260.3017139434814,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "b762591f.2fb7a",
- "type": "switchNode",
- "name": "switch svc-action",
- "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 436.26190185546875,
- "y": 503.2708339691162,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"6e4d7ebf.93e81",
+ "type":"switchNode",
+ "name":"switch svc-action",
+ "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":807.7298583984375,
+ "y":866.8727722167969,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "38a30397.7f9c64",
- "5b59ca66.3fadec",
- "7a4b792c.22588",
- "b22e57ce.c6aee8",
- "10c582cc.cfd665",
- "de74faab.3a2ae",
- "9bc3f97c.14bbf8"
+ "f25f7aea.b8fbf8",
+ "5b25cfb0.9dc3",
+ "ce4f0e34.637f",
+ "554ed162.fdbc2",
+ "9c1f95f4.d32d48",
+ "b361fb8f.196518",
+ "e0127b7f.249248"
]
]
},
{
- "id": "38a30397.7f9c64",
- "type": "other",
- "name": "assign",
- "xml": "<outcome value='assign'>\n",
- "comments": "",
- "outputs": 1,
- "x": 656.7380981445312,
- "y": 365.5564842224121,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"f25f7aea.b8fbf8",
+ "type":"other",
+ "name":"assign",
+ "xml":"<outcome value='assign'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1028.2060546875,
+ "y":643.1584224700928,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "7047d313.0a4e84"
+ "9ca02c4f.ecd52"
]
]
},
{
- "id": "7047d313.0a4e84",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 837.9762573242188,
- "y": 366.5566062927246,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"9ca02c4f.ecd52",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1209.4442138671875,
+ "y":644.1585445404053,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "fbc9882f.656ad8"
+ "e222c594.de61b8"
]
]
},
{
- "id": "f06b8960.155ea8",
- "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": 567.5476379394531,
- "y": 273.4136562347412,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"ae97e5fa.ddc148",
+ "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":940.0156097412109,
+ "y":579.0156707763672,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "fbc9882f.656ad8",
- "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": 1209.547607421875,
- "y": 363.4136619567871,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"e222c594.de61b8",
+ "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":1581.0155639648438,
+ "y":641.0156002044678,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "5b59ca66.3fadec",
- "type": "other",
- "name": "activate",
- "xml": "<outcome value='activate'>\n",
- "comments": "",
- "outputs": 1,
- "x": 658.5476379394531,
- "y": 453.4136562347412,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"5b25cfb0.9dc3",
+ "type":"other",
+ "name":"activate",
+ "xml":"<outcome value='activate'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1030.0155944824219,
+ "y":817.0155944824219,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "73ce8c08.c3845c"
+ "a2f3df33.c4b68"
]
]
},
{
- "id": "73ce8c08.c3845c",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 842.7857971191406,
- "y": 454.4137783050537,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"922d755b.661638",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1567.2537536621094,
+ "y":814.0158309936523,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "a003c0d6.5a0d8",
- "61a363af.ee55bc"
+ "c5274c8f.1721b",
+ "3b322ad5.66cb26"
]
]
},
{
- "id": "ee7e53d1.6aac9",
- "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": 1975.3572082519531,
- "y": 616.2708282470703,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"7c5eb492.d1272c",
+ "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":2612.825164794922,
+ "y":942.872766494751,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "7a4b792c.22588",
- "type": "other",
- "name": "deactivate",
- "xml": "<outcome value='deactivate'>\n",
- "comments": "",
- "outputs": 1,
- "x": 647.5476379394531,
- "y": 613.4136810302734,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"ce4f0e34.637f",
+ "type":"other",
+ "name":"deactivate",
+ "xml":"<outcome value='deactivate'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1019.0155944824219,
+ "y":977.0156192779541,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "72ac187b.b86c38"
+ "4fa02a57.55a214"
]
]
},
{
- "id": "72ac187b.b86c38",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 828.7857971191406,
- "y": 614.4138031005859,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"9c0934a4.38d8c8",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1571.2537994384766,
+ "y":1080.0159301757812,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "a003c0d6.5a0d8",
- "831644e8.e13cc"
+ "c5274c8f.1721b",
+ "a31ca188.c32d7"
]
]
},
{
- "id": "65e2e00c.98fae8",
- "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": 1981.8571166992188,
- "y": 732.0208282470703,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"61181d4d.3f9f64",
+ "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":2611.3250732421875,
+ "y":1114.622766494751,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "b22e57ce.c6aee8",
- "type": "other",
- "name": "unassign",
- "xml": "<outcome value='unassign'>\n",
- "comments": "",
- "outputs": 1,
- "x": 655.5476379394531,
- "y": 678.4136810302734,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"554ed162.fdbc2",
+ "type":"other",
+ "name":"unassign",
+ "xml":"<outcome value='unassign'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1027.0155944824219,
+ "y":1042.015619277954,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "4894d2ca.1278e4"
+ "babe1e.7216b1e"
]
]
},
{
- "id": "4894d2ca.1278e4",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 836.7857971191406,
- "y": 679.4138031005859,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"babe1e.7216b1e",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1208.2537536621094,
+ "y":1043.0157413482666,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "a003c0d6.5a0d8",
- "2108d22b.ae9926"
+ "c5274c8f.1721b",
+ "a93ebb11.5112b8"
]
]
},
{
- "id": "40a123a7.613904",
- "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": 1988.6071166992188,
- "y": 844.7708282470703,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"98390811.bf3d38",
+ "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":2360.0750732421875,
+ "y":1208.372766494751,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "10c582cc.cfd665",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 646.5476417541504,
- "y": 738.4136714935303,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"9c1f95f4.d32d48",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1018.0155982971191,
+ "y":1102.015609741211,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "9b7e6225.5d79d"
+ "b64c1d1.5a772e"
]
]
},
{
- "id": "9b7e6225.5d79d",
- "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": 828.5476379394531,
- "y": 737.4136810302734,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"b64c1d1.5a772e",
+ "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":1200.0155944824219,
+ "y":1101.015619277954,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "f1b5981d.bfa858",
- "type": "set",
- "name": "Set final indicator to Y",
- "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
- "comments": "",
- "x": 458.6587219238281,
- "y": 855.8581142425537,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"879a69b3.6edd88",
+ "type":"set",
+ "name":"Set final indicator to Y",
+ "xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
+ "comments":"",
+ "x":830.1266784667969,
+ "y":1219.4600524902344,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "e4027dbf.f06578",
- "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": 1877.2779998779297,
- "y": 510.1755828857422,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"8945700c.0d991",
+ "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":2566.7459564208984,
+ "y":852.7775211334229,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "ac917046.066bc"
+ "63bd9e68.829b4"
]
]
},
{
- "id": "a003c0d6.5a0d8",
- "type": "switchNode",
- "name": "switch service-data.networks.network_length",
- "xml": "<switch test='`$service-data.networks.network_length`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1210.9920959472656,
- "y": 474.74696350097656,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"c5274c8f.1721b",
+ "type":"switchNode",
+ "name":"switch service-data.networks.network_length",
+ "xml":"<switch test='`$service-data.networks.network_length`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1873.4600524902344,
+ "y":812.3489017486572,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "9e3ec1fd.ad5b98",
- "47eae2b1.438c54"
+ "aeada561.cc58d8",
+ "7091af2b.522e4"
]
]
},
{
- "id": "9e3ec1fd.ad5b98",
- "type": "other",
- "name": "outcome Null",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 1453.9920349121094,
- "y": 476.7469730377197,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"aeada561.cc58d8",
+ "type":"other",
+ "name":"outcome Null",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2146.460090637207,
+ "y":811.3489665985107,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "f460d6cb.ffd978"
+ "ed06878e.3cab58"
]
]
},
{
- "id": "47eae2b1.438c54",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1407.9920654296875,
- "y": 509.7469940185547,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"7091af2b.522e4",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2126.4604148864746,
+ "y":851.3489713668823,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "e10cc477.9b0f2"
+ "ab947f5a.5f651"
]
]
},
{
- "id": "ac917046.066bc",
- "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": 2167.7065505981445,
- "y": 509.42566680908203,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"63bd9e68.829b4",
+ "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":2857.1745071411133,
+ "y":852.0276050567627,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "3695eb78.874394"
+ ]
+ ]
+ },
+ {
+ "id":"3695eb78.874394",
+ "type":"outcomeTrue",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":3046.1268615722656,
+ "y":852.9203433990479,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "674767aa.48a638"
+ ]
+ ]
+ },
+ {
+ "id":"674767aa.48a638",
+ "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":3279.6586303710938,
+ "y":851.6703510284424,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"6fdacf7d.b32fb",
+ "type":"comment",
+ "name":"Find the index to service data for this network - save id in tmp.nidx, save service-data",
+ "info":"",
+ "comments":"",
+ "x":1819.571388244629,
+ "y":776.3489632606506,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"f5085beb.082298",
+ "type":"comment",
+ "name":"service-data will not be stored until we have a network-id",
+ "info":"",
+ "comments":"",
+ "x":1548.6821899414062,
+ "y":609.237829208374,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"ed06878e.3cab58",
+ "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":2308.237548828125,
+ "y":812.2379093170166,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"ab947f5a.5f651",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":2264.7299880981445,
+ "y":851.9035091400146,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "6f4b90eb.3d488"
+ "8945700c.0d991",
+ "61e26d45.4186e4"
]
]
},
{
- "id": "6f4b90eb.3d488",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2356.658905029297,
- "y": 510.3184051513672,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"61e26d45.4186e4",
+ "type":"switchNode",
+ "name":"switch tmp.nidx ",
+ "xml":"<switch test=\"`$tmp.nidx`\">\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2485.0473861694336,
+ "y":894.7607278823853,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "9e191d8a.ab6c4"
+ "b746b314.6a6bb"
]
]
},
{
- "id": "9e191d8a.ab6c4",
- "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": 2590.190673828125,
- "y": 509.0684127807617,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"ebd0f10f.cbf66",
+ "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":2837.904369354248,
+ "y":890.4749698638916,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "7b13cf65.3164b",
- "type": "comment",
- "name": "Find the index to service data for this network - save id in tmp.nidx, save service-data",
- "info": "",
- "comments": "",
- "x": 1334.1031799316406,
- "y": 443.74698638916016,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"b746b314.6a6bb",
+ "type":"outcome",
+ "name":"NULL",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2656.4759216308594,
+ "y":893.3321132659912,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "ebd0f10f.cbf66"
+ ]
+ ]
},
{
- "id": "1ed6801d.d2f0c8",
- "type": "comment",
- "name": "service-data will not be stored until we have a network-id",
- "info": "",
- "comments": "",
- "x": 1177.2142333984375,
- "y": 331.63589096069336,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"3b322ad5.66cb26",
+ "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":1825.7933959960938,
+ "y":942.8241672515869,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "4168b97e.614508",
+ "648208ba.c9c398"
+ ]
+ ]
},
{
- "id": "f460d6cb.ffd978",
- "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": 1645.7695922851562,
- "y": 474.63597106933594,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"4168b97e.614508",
+ "type":"outcome",
+ "name":"outcome PendingCreate",
+ "xml":"<outcome value='PendingCreate'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2190.793375651041,
+ "y":942.8241519927977,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "7c5eb492.d1272c"
+ ]
+ ]
},
{
- "id": "e10cc477.9b0f2",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 1575.2620315551758,
- "y": 509.301570892334,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"648208ba.c9c398",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2140.7934226989746,
+ "y":982.824182510376,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "e4027dbf.f06578",
- "8872fa92.c2a47"
+ "cd47365a.985768"
]
]
},
{
- "id": "8872fa92.c2a47",
- "type": "switchNode",
- "name": "switch tmp.nidx ",
- "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1795.5794296264648,
- "y": 552.1587896347046,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"cd47365a.985768",
+ "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":2310.7934226989746,
+ "y":982.824182510376,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"a31ca188.c32d7",
+ "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":1825.0948791503906,
+ "y":1114.7755680084229,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "90030fdf.45af7"
+ "e33c6a6c.b344c8",
+ "aa28812e.314c3"
]
]
},
{
- "id": "6b0a8e46.af7a78",
- "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": 2148.4364128112793,
- "y": 547.8730316162109,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"e33c6a6c.b344c8",
+ "type":"outcome",
+ "name":"outcome Created",
+ "xml":"<outcome value='Created'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2188.0948486328125,
+ "y":1114.775598526001,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "61181d4d.3f9f64"
+ ]
+ ]
},
{
- "id": "90030fdf.45af7",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 1967.0079650878906,
- "y": 550.7301750183105,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"aa28812e.314c3",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2158.0948486328125,
+ "y":1154.775598526001,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "6b0a8e46.af7a78"
+ "deb09c1d.1e536"
]
]
},
{
- "id": "61a363af.ee55bc",
- "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": 1188.325439453125,
- "y": 616.2222290039062,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"deb09c1d.1e536",
+ "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":2324.0948486328125,
+ "y":1156.775598526001,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"a93ebb11.5112b8",
+ "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":1566.8964538574219,
+ "y":1209.9769687652588,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "a0dc1668.8be6a8",
- "e9825cb2.5deff"
+ "b6998c15.248c1",
+ "86ffd64.1d13d28",
+ "90e3f2b9.f7fb8"
]
]
},
{
- "id": "a0dc1668.8be6a8",
- "type": "outcome",
- "name": "outcome PendingCreate",
- "xml": "<outcome value='PendingCreate'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1553.3254191080723,
- "y": 616.2222137451171,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"b6998c15.248c1",
+ "type":"outcome",
+ "name":"outcome PendingCreate",
+ "xml":"<outcome value='PendingCreate'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1926.8964233398438,
+ "y":1209.976999282837,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "ee7e53d1.6aac9"
+ "98390811.bf3d38"
]
]
},
{
- "id": "e9825cb2.5deff",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1503.3254661560059,
- "y": 656.2222442626953,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"86ffd64.1d13d28",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1883.8963623046875,
+ "y":1293.977014541626,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "44229861.ecaaa8"
+ "38a0884b.706138"
]
]
},
{
- "id": "44229861.ecaaa8",
- "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": 1673.3254661560059,
- "y": 656.2222442626953,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"38a0884b.706138",
+ "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":2075.229782104492,
+ "y":1292.6436433792114,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+
+ ]
},
{
- "id": "831644e8.e13cc",
- "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": 1195.6269226074219,
- "y": 732.1736297607422,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"90e3f2b9.f7fb8",
+ "type":"outcome",
+ "name":"outcome PendingDelete",
+ "xml":"<outcome value='PendingDelete'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1930.1266479492188,
+ "y":1247.824167251587,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "1181976c.1aed59",
- "1843fe0b.3bf1d2"
+ "98390811.bf3d38"
]
]
},
{
- "id": "1181976c.1aed59",
- "type": "outcome",
- "name": "outcome Created",
- "xml": "<outcome value='Created'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1558.6268920898438,
- "y": 732.1736602783203,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"b361fb8f.196518",
+ "type":"other",
+ "name":"create",
+ "xml":"<outcome value='create'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1015.4679565429688,
+ "y":1161.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "65e2e00c.98fae8"
+ "870ebc3.cf39e4"
]
]
},
{
- "id": "1843fe0b.3bf1d2",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1528.6268920898438,
- "y": 772.1736602783203,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"e0127b7f.249248",
+ "type":"other",
+ "name":"delete",
+ "xml":"<outcome value='delete'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1018.4679565429688,
+ "y":1214.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "420607f9.76c808"
+ "997e78db.545078"
]
]
},
{
- "id": "420607f9.76c808",
- "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": 1694.6268920898438,
- "y": 774.1736602783203,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"870ebc3.cf39e4",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1204.4679565429688,
+ "y":1167.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "3c97679a.62e2f8"
+ ]
+ ]
},
{
- "id": "2108d22b.ae9926",
- "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": 1195.4284973144531,
- "y": 846.3750305175781,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"997e78db.545078",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":1203.4679565429688,
+ "y":1226.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "e2213711.520dd",
- "6c464ada.030e1c",
- "457e18b7.6ac5a8"
+ "54f0a399.e0516c"
]
]
},
{
- "id": "e2213711.520dd",
- "type": "outcome",
- "name": "outcome PendingCreate",
- "xml": "<outcome value='PendingCreate'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1555.428466796875,
- "y": 846.3750610351562,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"3c97679a.62e2f8",
+ "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":1612.4679565429688,
+ "y":1352.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "40a123a7.613904"
+
]
]
},
{
- "id": "6c464ada.030e1c",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1512.4284057617188,
- "y": 930.3750762939453,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"54f0a399.e0516c",
+ "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":1618.4679565429688,
+ "y":1435.6019382476807,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "138a0d17.b239e3"
+
]
]
},
{
- "id": "138a0d17.b239e3",
- "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": 1703.7618255615234,
- "y": 929.0417051315308,
- "z": "67a3081a.032478",
- "wires": []
+ "id":"a2f3df33.c4b68",
+ "type":"switchNode",
+ "name":"switch request-action",
+ "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1214.6668243408203,
+ "y":797.3333606719971,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "4eb93a4e.82ca64",
+ "7ad79299.e126cc"
+ ]
+ ]
},
{
- "id": "457e18b7.6ac5a8",
- "type": "outcome",
- "name": "outcome PendingDelete",
- "xml": "<outcome value='PendingDelete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1558.65869140625,
- "y": 884.2222290039062,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"4eb93a4e.82ca64",
+ "type":"outcome",
+ "name":"ActivateDCINetworkInstance",
+ "xml":"<outcome value='ActivateDCINetworkInstance'>",
+ "comments":"",
+ "outputs":1,
+ "x":1457.0000915527344,
+ "y":719.333173751831,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "40a123a7.613904"
+ "564c81e9.848b9"
]
]
},
{
- "id": "de74faab.3a2ae",
- "type": "other",
- "name": "create",
- "xml": "<outcome value='create'>\n",
- "comments": "",
- "outputs": 1,
- "x": 644,
- "y": 798,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"7ad79299.e126cc",
+ "type":"outcome",
+ "name":"other",
+ "xml":"<outcome value='other'>",
+ "comments":"",
+ "outputs":1,
+ "x":1387.0000839233398,
+ "y":844.999870300293,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "326c42d2.bec496"
+ "922d755b.661638"
]
]
},
{
- "id": "9bc3f97c.14bbf8",
- "type": "other",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 647,
- "y": 851,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"564c81e9.848b9",
+ "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":1881.0001068115234,
+ "y":719.0000429153442,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "58d15587.e02aec"
+
]
]
},
{
- "id": "326c42d2.bec496",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 833,
- "y": 804,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"4fa02a57.55a214",
+ "type":"switchNode",
+ "name":"switch request-action",
+ "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1227.6666259765625,
+ "y":975,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "4ece5b87.0ed32c"
+ "bcde7f7f.e235b",
+ "55dafa1.c389f04"
]
]
},
{
- "id": "58d15587.e02aec",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 832,
- "y": 863,
- "z": "67a3081a.032478",
- "wires": [
+ "id":"bcde7f7f.e235b",
+ "type":"outcome",
+ "name":"DeActivateDCINetworkInstance",
+ "xml":"<outcome value='DeActivateDCINetworkInstance'>",
+ "comments":"",
+ "outputs":1,
+ "x":1497.9998779296875,
+ "y":984.9998912811279,
+ "z":"be8f5eb6.ea882",
+ "wires":[
[
- "b37ff23e.4b78c8"
+ "efb1ed02.23fdf"
]
]
},
{
- "id": "4ece5b87.0ed32c",
- "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": 1241,
- "y": 989,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"efb1ed02.23fdf",
+ "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":1964.999900817871,
+ "y":1041.6667194366455,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+
+ ]
]
},
{
- "id": "b37ff23e.4b78c8",
- "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": 1247,
- "y": 1072,
- "z": "67a3081a.032478",
- "wires": [
- []
+ "id":"55dafa1.c389f04",
+ "type":"outcome",
+ "name":"other",
+ "xml":"<outcome value='other'>",
+ "comments":"",
+ "outputs":1,
+ "x":1422.9998817443848,
+ "y":1080.6665649414062,
+ "z":"be8f5eb6.ea882",
+ "wires":[
+ [
+ "9c0934a4.38d8c8"
+ ]
]
}
-]
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 617073b4..ebd32db5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -1,6 +1,6 @@
<?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-activate" mode="sync">
+ <method rpc="dci-connects-network-topology-operation-activate" mode="sync">
<block atomic="true">
<call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
<block atomic="true">
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 cb82d329..00848f98 100755
--- 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,109 +1,201 @@
-<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' >
-</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></block></outcome><outcome value='activate'>
-<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></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='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'/>
- <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='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></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'>
-<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >
-</call></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'>
-<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></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='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' >
-</call></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 unassign. 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="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' >
-</call></block></outcome><outcome value='delete'>
-<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >
-</call></block></outcome></switch><set>
-<parameter name="ack-final" value="Y"/></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>
+<?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">
+ <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">
+ <block atomic="true">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-assign" mode="sync" />
+ </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>
+ <outcome value="other">
+ <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>
+ </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="PendingCreate">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-activate" mode="sync" />
+ </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>
+ </switch>
+ </outcome>
+ <outcome value="deactivate">
+ <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">
+ <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>
+ </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">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-deactivate" mode="sync" />
+ </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>
+ </outcome>
+ <outcome value="unassign">
+ <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>
+ </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="PendingCreate">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync" />
+ </outcome>
+ <outcome value="PendingDelete">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync" />
+ </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 unassign. 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="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>
+ <outcome value="delete">
+ <block atomic="true">
+ <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-delete" mode="sync" />
+ </block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name="ack-final" value="Y" />
+ </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> \ No newline at end of file