diff options
8 files changed, 2455 insertions, 2105 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 358e7ec9..bcc9e0e2 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 @@ -1,20 +1,20 @@ [ { - "id":"60145acf.ac87b4", + "id":"f677edb7.5eba9", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":105.515625, - "y":47.99999809265137, - "z":"21bf7e0.d63c382", + "x":104.66666412353516, + "y":37.99999809265137, + "z":"e7b3886.bec2e78", "wires":[ [ - "4cc0f1af.f25ba" + "bda53e34.48bcb" ] ] }, { - "id":"4cc0f1af.f25ba", + "id":"bda53e34.48bcb", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,59 +22,59 @@ "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":322.015625, - "y":110.49999809265137, - "z":"21bf7e0.d63c382", + "x":321.16666412353516, + "y":100.49999809265137, + "z":"e7b3886.bec2e78", "wires":[ [ - "27054278.56f0ce" + "33551718.9d6058" ] ] }, { - "id":"27054278.56f0ce", + "id":"33551718.9d6058", "type":"method", "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, - "y":205.4999828338623, - "z":"21bf7e0.d63c382", + "x":229.16669464111328, + "y":195.4999828338623, + "z":"e7b3886.bec2e78", "wires":[ [ - "17a21e32.d066f2" + "6463cc60.4f8394" ] ] }, { - "id":"17a21e32.d066f2", + "id":"6463cc60.4f8394", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":527.8489685058594, - "y":213.33332633972168, - "z":"21bf7e0.d63c382", + "x":527.0000076293945, + "y":203.33332633972168, + "z":"e7b3886.bec2e78", "wires":[ [ - "c2ea2a39.349028", - "c3b857dd.cdef38", - "b122986c.ea3588" + "c7522c24.5f98b", + "102b3cb5.6d7ac3", + "2ed80a33.f4c916" ] ] }, { - "id":"c3b857dd.cdef38", + "id":"102b3cb5.6d7ac3", "type":"call", "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters", "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n", "comments":"", "outputs":1, - "x":917.8489685058594, - "y":78.33332633972168, - "z":"21bf7e0.d63c382", + "x":917.0000076293945, + "y":68.33332633972168, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -82,361 +82,361 @@ ] }, { - "id":"e3e1b08f.34796", + "id":"12cc8933.03f2b7", "type":"for", "name":"for each network-input-parameters", "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n", "comments":"", "outputs":1, - "x":1435.8492584228516, - "y":351.33338713645935, - "z":"21bf7e0.d63c382", + "x":1435.0002975463867, + "y":341.33338713645935, + "z":"e7b3886.bec2e78", "wires":[ [ - "df2d225.ad706e" + "4b519ec.f2b4b6" ] ] }, { - "id":"df2d225.ad706e", + "id":"4b519ec.f2b4b6", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1682.8491668701172, - "y":349.3333566188812, - "z":"21bf7e0.d63c382", + "x":1682.0002059936523, + "y":339.3333566188812, + "z":"e7b3886.bec2e78", "wires":[ [ - "3fc9d626.fd631a", - "3af822f1.512e5e", - "ba27957d.3af2a8", - "30d85a9a.81ed46", - "96ccbb3d.e35638", - "953727e3.e65d98", - "9f4099a7.cd6818", - "ecbf5185.0a283", - "366dfe39.460be2" + "32074b80.b9a384", + "448b7ef3.fc516", + "1a7f3647.3d7caa", + "59f458ff.1d73b8", + "bb7bc8f4.498f28", + "e2d9cb00.0ed418", + "6fb6ab2c.4aa5d4", + "397d3387.a8686c", + "b90eee01.f71b" ] ] }, { - "id":"3fc9d626.fd631a", + "id":"32074b80.b9a384", "type":"switchNode", "name":"switch id", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n", "comments":"", "outputs":1, - "x":2169.84952545166, - "y":225.3334732055664, - "z":"21bf7e0.d63c382", + "x":2169.0005645751953, + "y":215.3334732055664, + "z":"e7b3886.bec2e78", "wires":[ [ - "2d331fe2.47fa4" + "f708b7e0.e87648" ] ] }, { - "id":"3af822f1.512e5e", + "id":"448b7ef3.fc516", "type":"switchNode", "name":"switch description", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`\">\n", "comments":"", "outputs":1, - "x":2197.84952545166, - "y":279.33345890045166, - "z":"21bf7e0.d63c382", + "x":2197.0005645751953, + "y":269.33345890045166, + "z":"e7b3886.bec2e78", "wires":[ [ - "7f98b7b2.516698" + "13b7e002.7b869" ] ] }, { - "id":"ba27957d.3af2a8", + "id":"1a7f3647.3d7caa", "type":"switchNode", "name":"switch routerId", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n", "comments":"", "outputs":1, - "x":2186.8493118286133, - "y":410.33341884613037, - "z":"21bf7e0.d63c382", + "x":2186.0003509521484, + "y":400.33341884613037, + "z":"e7b3886.bec2e78", "wires":[ [ - "c0866b21.51b018" + "b16fc128.b108e" ] ] }, { - "id":"30d85a9a.81ed46", + "id":"59f458ff.1d73b8", "type":"switchNode", "name":"switch importRT1", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n", "comments":"", "outputs":1, - "x":2195.1350479125977, - "y":471.61917209625244, - "z":"21bf7e0.d63c382", + "x":2194.286087036133, + "y":461.61917209625244, + "z":"e7b3886.bec2e78", "wires":[ [ - "403c9bfb.ba9f84" + "38411baa.2cca74" ] ] }, { - "id":"96ccbb3d.e35638", + "id":"bb7bc8f4.498f28", "type":"switchNode", "name":"switch exportRT1", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n", "comments":"", "outputs":1, - "x":2196.135108947754, - "y":535.6191428899765, - "z":"21bf7e0.d63c382", + "x":2195.286148071289, + "y":525.6191428899765, + "z":"e7b3886.bec2e78", "wires":[ [ - "de48d13a.91b27" + "c1464a84.f3b268" ] ] }, { - "id":"953727e3.e65d98", + "id":"e2d9cb00.0ed418", "type":"switchNode", "name":"switch vni", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n", "comments":"", "outputs":1, - "x":2167.135078430176, - "y":598.6191749572754, - "z":"21bf7e0.d63c382", + "x":2166.286117553711, + "y":588.6191749572754, + "z":"e7b3886.bec2e78", "wires":[ [ - "774440d3.26232" + "a40701ca.7f71d" ] ] }, { - "id":"2d331fe2.47fa4", + "id":"f708b7e0.e87648", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2384.84952545166, - "y":224.3334732055664, - "z":"21bf7e0.d63c382", + "x":2384.0005645751953, + "y":214.3334732055664, + "z":"e7b3886.bec2e78", "wires":[ [ - "61674644.1d0558" + "3df14e3f.ff9f42" ] ] }, { - "id":"7f98b7b2.516698", + "id":"13b7e002.7b869", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2395.84952545166, - "y":279.33345890045166, - "z":"21bf7e0.d63c382", + "x":2395.0005645751953, + "y":269.33345890045166, + "z":"e7b3886.bec2e78", "wires":[ [ - "c33f05d1.922218" + "bf6e83b1.5d5aa" ] ] }, { - "id":"c0866b21.51b018", + "id":"b16fc128.b108e", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2391.8493118286133, - "y":409.33341884613037, - "z":"21bf7e0.d63c382", + "x":2391.0003509521484, + "y":399.33341884613037, + "z":"e7b3886.bec2e78", "wires":[ [ - "f941cf94.05bbe" + "762bb1f.102ee5" ] ] }, { - "id":"403c9bfb.ba9f84", + "id":"38411baa.2cca74", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2397.1350479125977, - "y":470.61917209625244, - "z":"21bf7e0.d63c382", + "x":2396.286087036133, + "y":460.61917209625244, + "z":"e7b3886.bec2e78", "wires":[ [ - "9da05058.8cf95" + "28eacd01.75bb82" ] ] }, { - "id":"de48d13a.91b27", + "id":"c1464a84.f3b268", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2392.135108947754, - "y":532.6191428899765, - "z":"21bf7e0.d63c382", + "x":2391.286148071289, + "y":522.6191428899765, + "z":"e7b3886.bec2e78", "wires":[ [ - "7e027125.8b2a2" + "54d6710.aef549" ] ] }, { - "id":"774440d3.26232", + "id":"a40701ca.7f71d", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2373.135078430176, - "y":598.6191749572754, - "z":"21bf7e0.d63c382", + "x":2372.286117553711, + "y":588.6191749572754, + "z":"e7b3886.bec2e78", "wires":[ [ - "cecc8f2e.0ca25" + "3a8b4224.49c96e" ] ] }, { - "id":"c33f05d1.922218", + "id":"bf6e83b1.5d5aa", "type":"set", "name":"set description", "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2577.84952545166, - "y":272.33345890045166, - "z":"21bf7e0.d63c382", + "x":2577.0005645751953, + "y":262.33345890045166, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"f941cf94.05bbe", + "id":"762bb1f.102ee5", "type":"set", "name":"set router_id", "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2582.8495330810547, - "y":402.33350563049316, - "z":"21bf7e0.d63c382", + "x":2582.00057220459, + "y":392.33350563049316, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"cecc8f2e.0ca25", + "id":"3a8b4224.49c96e", "type":"set", "name":"set vni", "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2543.135078430176, - "y":590.6191749572754, - "z":"21bf7e0.d63c382", + "x":2542.286117553711, + "y":580.6191749572754, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"c2ea2a39.349028", + "id":"c7522c24.5f98b", "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":750.1347961425781, - "y":1054.0476970672607, - "z":"21bf7e0.d63c382", + "x":749.2858352661133, + "y":1044.0476970672607, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"9f4099a7.cd6818", + "id":"6fb6ab2c.4aa5d4", "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":2181.0160598754883, - "y":166.5001049041748, - "z":"21bf7e0.d63c382", + "x":2180.1670989990234, + "y":156.5001049041748, + "z":"e7b3886.bec2e78", "wires":[ [ - "2522e46d.18fb0c" + "1239b72b.2fbef9" ] ] }, { - "id":"2522e46d.18fb0c", + "id":"1239b72b.2fbef9", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2379.0160598754883, - "y":166.5001049041748, - "z":"21bf7e0.d63c382", + "x":2378.1670989990234, + "y":156.5001049041748, + "z":"e7b3886.bec2e78", "wires":[ [ - "d80dda98.56d9c8" + "11312cce.e525f3" ] ] }, { - "id":"d80dda98.56d9c8", + "id":"11312cce.e525f3", "type":"set", "name":"set name", "xml":"<set>\n<parameter name='prop.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2561.0160598754883, - "y":159.5001049041748, - "z":"21bf7e0.d63c382", + "x":2560.1670989990234, + "y":149.5001049041748, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"ecbf5185.0a283", + "id":"397d3387.a8686c", "type":"switchNode", "name":"switch networkName", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n", "comments":"", "outputs":1, - "x":2204.5158462524414, - "y":345.50004482269287, - "z":"21bf7e0.d63c382", + "x":2203.6668853759766, + "y":335.50004482269287, + "z":"e7b3886.bec2e78", "wires":[ [ - "6712cfa0.6da36" + "7e8f9a77.54d324" ] ] }, { - "id":"6712cfa0.6da36", + "id":"7e8f9a77.54d324", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2402.5158462524414, - "y":345.50004482269287, - "z":"21bf7e0.d63c382", + "x":2401.6668853759766, + "y":335.50004482269287, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -444,317 +444,318 @@ ] }, { - "id":"b122986c.ea3588", + "id":"2ed80a33.f4c916", "type":"block", "name":"block : execute", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":751.5155563354492, - "y":586.5000438690186, - "z":"21bf7e0.d63c382", + "x":750.6665954589844, + "y":576.5000438690186, + "z":"e7b3886.bec2e78", "wires":[ [ - "7b94a84.2093158", - "ccbd6961.d40f88" + "5080dfc0.36b37", + "eb244a6f.359e28", + "ca9b0788.7f9838" ] ] }, { - "id":"7b94a84.2093158", + "id":"5080dfc0.36b37", "type":"block", "name":"block : executeSite1", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":1044.0156173706055, - "y":411.00002002716064, - "z":"21bf7e0.d63c382", + "x":1043.1666564941406, + "y":401.00002002716064, + "z":"e7b3886.bec2e78", "wires":[ [ - "e3e1b08f.34796", - "f33269f0.940878" + "12cc8933.03f2b7", + "d400e6f0.9ebae8" ] ] }, { - "id":"ccbd6961.d40f88", + "id":"eb244a6f.359e28", "type":"block", "name":"block : executeSite2", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":1061.0156631469727, - "y":927.000002861023, - "z":"21bf7e0.d63c382", + "x":1060.1667022705078, + "y":917.000002861023, + "z":"e7b3886.bec2e78", "wires":[ [ - "51a93228.f2f0fc", - "f33269f0.940878" + "89c1aab1.7bdc58", + "d400e6f0.9ebae8" ] ] }, { - "id":"5d2180aa.de0e2", + "id":"8f3fbdf6.1304f", "type":"switchNode", "name":"switch id", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n", "comments":"", "outputs":1, - "x":2155.515869140625, - "y":745.9999370574951, - "z":"21bf7e0.d63c382", + "x":2154.66690826416, + "y":735.9999370574951, + "z":"e7b3886.bec2e78", "wires":[ [ - "bbb36af3.4b5978" + "a436316f.11b39" ] ] }, { - "id":"e3115059.5fca5", + "id":"87844c42.b36e3", "type":"switchNode", "name":"switch description", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`\">\n", "comments":"", "outputs":1, - "x":2179.5162200927734, - "y":804.9999437332153, - "z":"21bf7e0.d63c382", + "x":2178.6672592163086, + "y":794.9999437332153, + "z":"e7b3886.bec2e78", "wires":[ [ - "b4f95f29.48041", - "50452acf.501864" + "bf81b94b.2f55a8", + "18114475.1855ec" ] ] }, { - "id":"533af772.c3eac8", + "id":"bb073e87.caa3e", "type":"switchNode", "name":"switch routerId", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n", "comments":"", "outputs":1, - "x":2188.515609741211, - "y":1000.9999094009399, - "z":"21bf7e0.d63c382", + "x":2187.666648864746, + "y":990.9999094009399, + "z":"e7b3886.bec2e78", "wires":[ [ - "6a04a362.a162ec" + "96a4190f.73e698" ] ] }, { - "id":"e72b1110.d4d6e", + "id":"e9a9b37b.df96d", "type":"switchNode", "name":"switch importRT1", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n", "comments":"", "outputs":1, - "x":2196.8013458251953, - "y":1062.285662651062, - "z":"21bf7e0.d63c382", + "x":2195.9523849487305, + "y":1052.285662651062, + "z":"e7b3886.bec2e78", "wires":[ [ - "c14e7e52.9dfca" + "7988286f.daa4d8" ] ] }, { - "id":"32c0b542.9e397a", + "id":"d05e00bd.4bb1d", "type":"switchNode", "name":"switch exportRT1", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`\">\n", "comments":"", "outputs":1, - "x":2197.8014068603516, - "y":1126.285633444786, - "z":"21bf7e0.d63c382", + "x":2196.9524459838867, + "y":1116.285633444786, + "z":"e7b3886.bec2e78", "wires":[ [ - "b21aa554.501138" + "4feb1f47.56d31" ] ] }, { - "id":"759ab28f.fe025c", + "id":"50846ae9.b3bb24", "type":"switchNode", "name":"switch vni", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n", "comments":"", "outputs":1, - "x":2168.8013763427734, - "y":1189.285665512085, - "z":"21bf7e0.d63c382", + "x":2167.9524154663086, + "y":1179.285665512085, + "z":"e7b3886.bec2e78", "wires":[ [ - "f68ec5ed.0e6888" + "1c48672.500ee99" ] ] }, { - "id":"bbb36af3.4b5978", + "id":"a436316f.11b39", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2370.515869140625, - "y":744.9999370574951, - "z":"21bf7e0.d63c382", + "x":2369.66690826416, + "y":734.9999370574951, + "z":"e7b3886.bec2e78", "wires":[ [ - "3b9d92a0.561cce" + "a9738af0.3c8338" ] ] }, { - "id":"b4f95f29.48041", + "id":"bf81b94b.2f55a8", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2377.5162200927734, - "y":804.9999437332153, - "z":"21bf7e0.d63c382", + "x":2376.6672592163086, + "y":794.9999437332153, + "z":"e7b3886.bec2e78", "wires":[ [ - "862e157b.103688" + "b34bd5d.abbf728" ] ] }, { - "id":"6a04a362.a162ec", + "id":"96a4190f.73e698", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2393.515609741211, - "y":999.9999094009399, - "z":"21bf7e0.d63c382", + "x":2392.666648864746, + "y":989.9999094009399, + "z":"e7b3886.bec2e78", "wires":[ [ - "6295c05a.7d32" + "74df6953.989bb8" ] ] }, { - "id":"c14e7e52.9dfca", + "id":"7988286f.daa4d8", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2398.8013458251953, - "y":1061.285662651062, - "z":"21bf7e0.d63c382", + "x":2397.9523849487305, + "y":1051.285662651062, + "z":"e7b3886.bec2e78", "wires":[ [ - "6bd3101.b6ac7f" + "87fc0003.1c83" ] ] }, { - "id":"b21aa554.501138", + "id":"4feb1f47.56d31", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2393.8014068603516, - "y":1123.285633444786, - "z":"21bf7e0.d63c382", + "x":2392.9524459838867, + "y":1113.285633444786, + "z":"e7b3886.bec2e78", "wires":[ [ - "353fa61f.c112fa" + "e1b1c41e.20d598" ] ] }, { - "id":"f68ec5ed.0e6888", + "id":"1c48672.500ee99", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2374.8013763427734, - "y":1189.285665512085, - "z":"21bf7e0.d63c382", + "x":2373.9524154663086, + "y":1179.285665512085, + "z":"e7b3886.bec2e78", "wires":[ [ - "5f4e48ea.1a8f68" + "b4378fb6.33ce7" ] ] }, { - "id":"862e157b.103688", + "id":"b34bd5d.abbf728", "type":"set", "name":"set description", "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2559.5162200927734, - "y":797.9999437332153, - "z":"21bf7e0.d63c382", + "x":2558.6672592163086, + "y":787.9999437332153, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"6295c05a.7d32", + "id":"74df6953.989bb8", "type":"set", "name":"set router_id", "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2584.5158309936523, - "y":992.9999961853027, - "z":"21bf7e0.d63c382", + "x":2583.6668701171875, + "y":982.9999961853027, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"5f4e48ea.1a8f68", + "id":"b4378fb6.33ce7", "type":"set", "name":"set vni", "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2544.8013763427734, - "y":1181.285665512085, - "z":"21bf7e0.d63c382", + "x":2543.9524154663086, + "y":1171.285665512085, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"32050113.af315e", + "id":"d2d84b28.6524b8", "type":"switchNode", "name":"switch networkName", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n", "comments":"", "outputs":1, - "x":2206.182144165039, - "y":936.1665353775024, - "z":"21bf7e0.d63c382", + "x":2205.333183288574, + "y":926.1665353775024, + "z":"e7b3886.bec2e78", "wires":[ [ - "ad14e7c.2778e18" + "2e52c3b.1c3fa3c" ] ] }, { - "id":"ad14e7c.2778e18", + "id":"2e52c3b.1c3fa3c", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2404.182144165039, - "y":936.1665353775024, - "z":"21bf7e0.d63c382", + "x":2403.333183288574, + "y":926.1665353775024, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -762,131 +763,132 @@ ] }, { - "id":"4a12c766.428fe8", + "id":"ebb3dc82.63277", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1674.5153198242188, - "y":867.9998948574066, - "z":"21bf7e0.d63c382", + "x":1673.666358947754, + "y":857.9998948574066, + "z":"e7b3886.bec2e78", "wires":[ [ - "5d2180aa.de0e2", - "e3115059.5fca5", - "533af772.c3eac8", - "e72b1110.d4d6e", - "32c0b542.9e397a", - "759ab28f.fe025c", - "32050113.af315e" + "8f3fbdf6.1304f", + "87844c42.b36e3", + "bb073e87.caa3e", + "e9a9b37b.df96d", + "d05e00bd.4bb1d", + "50846ae9.b3bb24", + "d2d84b28.6524b8" ] ] }, { - "id":"51a93228.f2f0fc", + "id":"89c1aab1.7bdc58", "type":"for", "name":"for each network-input-parameters", "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n", "comments":"", "outputs":1, - "x":1427.5154113769531, - "y":869.9999253749847, - "z":"21bf7e0.d63c382", + "x":1426.6664505004883, + "y":859.9999253749847, + "z":"e7b3886.bec2e78", "wires":[ [ - "4a12c766.428fe8" + "ebb3dc82.63277" ] ] }, { - "id":"61674644.1d0558", + "id":"3df14e3f.ff9f42", "type":"set", "name":"set id", "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2566.5159072875977, - "y":218.0000228881836, - "z":"21bf7e0.d63c382", + "x":2565.666946411133, + "y":208.0000228881836, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"366dfe39.460be2", + "id":"b90eee01.f71b", "type":"switchNode", "name":"switch tunnelType", "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n", "comments":"", "outputs":1, - "x":2186.015625, - "y":667.9999370574951, - "z":"21bf7e0.d63c382", + "x":2185.166664123535, + "y":657.9999370574951, + "z":"e7b3886.bec2e78", "wires":[ [ - "8e0c82ca.7fa6" + "49421593.ccc6fc" ] ] }, { - "id":"8e0c82ca.7fa6", + "id":"49421593.ccc6fc", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":2392.015625, - "y":667.9999370574951, - "z":"21bf7e0.d63c382", + "x":2391.166664123535, + "y":657.9999370574951, + "z":"e7b3886.bec2e78", "wires":[ [ - "731815b1.9879ac" + "85008c2f.e9768" ] ] }, { - "id":"731815b1.9879ac", + "id":"85008c2f.e9768", "type":"set", "name":"set tunnelType", "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2562.015625, - "y":659.9999370574951, - "z":"21bf7e0.d63c382", + "x":2561.166664123535, + "y":649.9999370574951, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"f33269f0.940878", + "id":"d400e6f0.9ebae8", "type":"block", "name":"block : sendRequest", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":1340.0156440734863, - "y":1427.499942779541, - "z":"21bf7e0.d63c382", + "x":1339.1666831970215, + "y":1417.499942779541, + "z":"e7b3886.bec2e78", "wires":[ [ - "8a66fbcb.3a6538", - "a01675f7.06ee28", - "49f34f09.e59ea" + "4b5b64db.a6e31c", + "67106fe7.87d3f", + "e15d1e8.e713be", + "51ee7ac2.7dbfe4" ] ] }, { - "id":"8f288c1f.2ee81", + "id":"b9168ed9.b3a7b", "type":"execute", "name":"execute RestApiCallNode Activate Vxlan Tunnel", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n", "comments":"", "outputs":1, - "x":2148.0159187316895, - "y":1490.4998979568481, - "z":"21bf7e0.d63c382", + "x":2147.1669578552246, + "y":1480.4998979568481, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -894,64 +896,64 @@ ] }, { - "id":"d32d9795.7e3d68", + "id":"b0137d76.ad7a2", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1833.5154113769531, - "y":1279.4994621276855, - "z":"21bf7e0.d63c382", + "x":1825.6666412353516, + "y":1188.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ [ - "2e0abdec.6b6a72" + "e0b0e9e7.f874b8" ] ] }, { - "id":"37a4ea9c.c89576", + "id":"a03a0ce7.9531c", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1840.5154113769531, - "y":1317.4994621276855, - "z":"21bf7e0.d63c382", + "x":1832.6666412353516, + "y":1226.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ [ - "b76645eb.106e38" + "fa707742.d53878" ] ] }, { - "id":"6bb7a3cb.5c930c", + "id":"818bf049.9d8d8", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":1832.5154113769531, - "y":1359.4994621276855, - "z":"21bf7e0.d63c382", + "x":1824.6666412353516, + "y":1268.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ [ - "db6ca063.b0c74" + "d591067c.05c108" ] ] }, { - "id":"2e0abdec.6b6a72", + "id":"e0b0e9e7.f874b8", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":1998.5154113769531, - "y":1268.4994621276855, - "z":"21bf7e0.d63c382", + "x":1990.6666412353516, + "y":1177.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -959,134 +961,134 @@ ] }, { - "id":"b76645eb.106e38", + "id":"fa707742.d53878", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", "comments":"", - "x":1997.5154113769531, - "y":1321.4994621276855, - "z":"21bf7e0.d63c382", + "x":1989.6666412353516, + "y":1230.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"db6ca063.b0c74", + "id":"d591067c.05c108", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", "comments":"", - "x":1990.5154113769531, - "y":1368.4994621276855, - "z":"21bf7e0.d63c382", + "x":1982.6666412353516, + "y":1277.4995296001434, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"8a66fbcb.3a6538", + "id":"4b5b64db.a6e31c", "type":"get-resource", - "name":"get-resource dci-connects", + "name":"get-resource esr-thirdparty-sdnc", "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n", "comments":"", "outputs":1, - "x":1645.5155334472656, - "y":1326.4994812011719, - "z":"21bf7e0.d63c382", + "x":1637.666763305664, + "y":1235.4995486736298, + "z":"e7b3886.bec2e78", "wires":[ [ - "d32d9795.7e3d68", - "37a4ea9c.c89576", - "6bb7a3cb.5c930c" + "b0137d76.ad7a2", + "a03a0ce7.9531c", + "818bf049.9d8d8" ] ] }, { - "id":"a01675f7.06ee28", + "id":"67106fe7.87d3f", "type":"set", "name":"set controller data", "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n", "comments":"", - "x":1617.0153846740723, - "y":1427.9994354248047, - "z":"21bf7e0.d63c382", + "x":1609.1666145324707, + "y":1336.9995028972626, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"49f34f09.e59ea", + "id":"e15d1e8.e713be", "type":"switchNode", "name":"switch tunnelType", "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n", "comments":"", "outputs":1, - "x":1611.0153770446777, - "y":1514.9994087219238, - "z":"21bf7e0.d63c382", + "x":1610.166416168213, + "y":1504.9994087219238, + "z":"e7b3886.bec2e78", "wires":[ [ - "72c21633.697888", - "bc6148.3fa8ceb8" + "a7d6c612.d263a8", + "d5e95c68.c598e" ] ] }, { - "id":"72c21633.697888", + "id":"a7d6c612.d263a8", "type":"outcomeTrue", "name":"L3-DCI", "xml":"<outcome value='L3-DCI'>\n", "comments":"", "outputs":1, - "x":1824.0155067443848, - "y":1494.9994087219238, - "z":"21bf7e0.d63c382", + "x":1823.16654586792, + "y":1484.9994087219238, + "z":"e7b3886.bec2e78", "wires":[ [ - "8f288c1f.2ee81" + "b9168ed9.b3a7b" ] ] }, { - "id":"bc6148.3fa8ceb8", + "id":"d5e95c68.c598e", "type":"outcomeTrue", "name":"L2-DCI", "xml":"<outcome value='L2-DCI'>\n", "comments":"", "outputs":1, - "x":1822.0153274536133, - "y":1566.9994087219238, - "z":"21bf7e0.d63c382", + "x":1821.1663665771484, + "y":1556.9994087219238, + "z":"e7b3886.bec2e78", "wires":[ [ - "18b936e.7133ac9" + "6cf6d77.8f1d028" ] ] }, { - "id":"3b9d92a0.561cce", + "id":"a9738af0.3c8338", "type":"set", "name":"set id", "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2544.515842437744, - "y":739.9999895095825, - "z":"21bf7e0.d63c382", + "x":2543.6668815612793, + "y":729.9999895095825, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"18b936e.7133ac9", + "id":"6cf6d77.8f1d028", "type":"execute", "name":"execute RestApiCallNode Activate Vxlan Tunnel", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n", "comments":"", "outputs":1, - "x":2142.0158729553223, - "y":1567.499834060669, - "z":"21bf7e0.d63c382", + "x":2141.1669120788574, + "y":1557.499834060669, + "z":"e7b3886.bec2e78", "wires":[ [ @@ -1094,557 +1096,723 @@ ] }, { - "id":"50452acf.501864", + "id":"18114475.1855ec", "type":"outcomeTrue", "name":"false", "xml":"<outcome value='false'>\n", "comments":"", "outputs":1, - "x":2376.015800476074, - "y":863.9999732971191, - "z":"21bf7e0.d63c382", + "x":2375.1668395996094, + "y":853.9999732971191, + "z":"e7b3886.bec2e78", "wires":[ [ - "558a5beb.808c64" + "3f1b8826.009518" ] ] }, { - "id":"558a5beb.808c64", + "id":"3f1b8826.009518", "type":"set", "name":"set description", "xml":"<set>\n<parameter name='prop.dci-connects.description' value='' />\n", "comments":"", - "x":2557.015869140625, - "y":858.9999141693115, - "z":"21bf7e0.d63c382", + "x":2556.16690826416, + "y":848.9999141693115, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"9da05058.8cf95", + "id":"28eacd01.75bb82", "type":"block", "name":"block setEvpnIrts", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":2579.015380859375, - "y":472.5155944824219, - "z":"21bf7e0.d63c382", + "x":2578.16641998291, + "y":462.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "f59be47.2245a18", - "6fceca00.0b0b48" + "bb1cdbdd.2fff28", + "4cd550f9.8750a" ] ] }, { - "id":"f59be47.2245a18", + "id":"bb1cdbdd.2fff28", "type":"set", "name":"set evpn_irts", "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2825.015380859375, - "y":423.5155944824219, - "z":"21bf7e0.d63c382", + "x":2824.16641998291, + "y":413.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"6fceca00.0b0b48", + "id":"4cd550f9.8750a", "type":"execute", "name":"split evpn_irts", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n", "comments":"", "outputs":1, - "x":2854.015380859375, - "y":475.5155944824219, - "z":"21bf7e0.d63c382", + "x":2853.16641998291, + "y":465.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "8ac2a412.2bc7d8", - "f06f6320.a3ba5" + "599d2ef7.cc6f5", + "24f186e1.e961aa" ] ] }, { - "id":"f06f6320.a3ba5", + "id":"24f186e1.e961aa", "type":"failure", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":3071.015380859375, - "y":401.5155944824219, - "z":"21bf7e0.d63c382", + "x":3070.16641998291, + "y":391.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "a6b39033.8c77c" + "d3a490a1.86ec7" ] ] }, { - "id":"8ac2a412.2bc7d8", + "id":"599d2ef7.cc6f5", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":3072.015380859375, - "y":467.5155944824219, - "z":"21bf7e0.d63c382", + "x":3071.16641998291, + "y":457.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "d4181347.bc95d" + "9d1496cd.6b6838" ] ] }, { - "id":"d4181347.bc95d", + "id":"9d1496cd.6b6838", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments":"", - "x":3253.015380859375, - "y":465.5155944824219, - "z":"21bf7e0.d63c382", + "x":3252.16641998291, + "y":455.5155944824219, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"d183f400.b7c7a8", + "id":"be04370c.90ae38", "type":"set", "name":"set evpn_erts", "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2821.515380859375, - "y":566.015625, - "z":"21bf7e0.d63c382", + "x":2820.66641998291, + "y":556.015625, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"862ad334.4820a", + "id":"46236baf.ee4334", "type":"execute", "name":"split evpn_erts", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n", "comments":"", "outputs":1, - "x":2850.515380859375, - "y":618.015625, - "z":"21bf7e0.d63c382", + "x":2849.66641998291, + "y":608.015625, + "z":"e7b3886.bec2e78", "wires":[ [ - "c7841794.4a1558", - "96021a8.e493ee8" + "50db2b4d.65c564", + "3f72e979.616c26" ] ] }, { - "id":"96021a8.e493ee8", + "id":"3f72e979.616c26", "type":"failure", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":3067.515380859375, - "y":544.015625, - "z":"21bf7e0.d63c382", + "x":3066.66641998291, + "y":534.015625, + "z":"e7b3886.bec2e78", "wires":[ [ - "767a44c9.83ddec" + "33c6d394.335a0c" ] ] }, { - "id":"c7841794.4a1558", + "id":"50db2b4d.65c564", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":3068.515380859375, - "y":610.015625, - "z":"21bf7e0.d63c382", + "x":3067.66641998291, + "y":600.015625, + "z":"e7b3886.bec2e78", "wires":[ [ - "f4c642e1.daf09" + "dd7bbc95.f451" ] ] }, { - "id":"f4c642e1.daf09", + "id":"dd7bbc95.f451", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments":"", - "x":3249.515380859375, - "y":608.015625, - "z":"21bf7e0.d63c382", + "x":3248.66641998291, + "y":598.015625, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"7e027125.8b2a2", + "id":"54d6710.aef549", "type":"block", "name":"block setEvpnErts", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":2572.5152740478516, - "y":528.015682220459, - "z":"21bf7e0.d63c382", + "x":2571.6663131713867, + "y":518.015682220459, + "z":"e7b3886.bec2e78", "wires":[ [ - "d183f400.b7c7a8", - "862ad334.4820a" + "be04370c.90ae38", + "46236baf.ee4334" ] ] }, { - "id":"a6b39033.8c77c", + "id":"d3a490a1.86ec7", "type":"for", "name":"for each evpn_irts", "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n", "comments":"", "outputs":1, - "x":3273.5155448913574, - "y":401.01563453674316, - "z":"21bf7e0.d63c382", + "x":3272.6665840148926, + "y":391.01563453674316, + "z":"e7b3886.bec2e78", "wires":[ [ - "7a255963.a19a48" + "5cb80f19.64eda" ] ] }, { - "id":"7a255963.a19a48", + "id":"5cb80f19.64eda", "type":"set", "name":"set evpn_irt", "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n", "comments":"", - "x":3485.5160369873047, - "y":401.0157871246338, - "z":"21bf7e0.d63c382", + "x":3484.66707611084, + "y":391.0157871246338, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"767a44c9.83ddec", + "id":"33c6d394.335a0c", "type":"for", "name":"for each evpn_erts", "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n", "comments":"", "outputs":1, - "x":3267.015380859375, - "y":540.015625, - "z":"21bf7e0.d63c382", + "x":3266.16641998291, + "y":530.015625, + "z":"e7b3886.bec2e78", "wires":[ [ - "ad045a9b.36e458" + "64b16cdb.c226f4" ] ] }, { - "id":"ad045a9b.36e458", + "id":"64b16cdb.c226f4", "type":"set", "name":"set evpn_ert", "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n", "comments":"", - "x":3479.0158729553223, - "y":540.0157775878906, - "z":"21bf7e0.d63c382", + "x":3478.1669120788574, + "y":530.0157775878906, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"e67e9dd7.989e2", + "id":"de4c08e4.779ef8", "type":"set", "name":"set evpn_irts", "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2838.015380859375, - "y":1006.5155639648438, - "z":"21bf7e0.d63c382", + "x":2837.16641998291, + "y":996.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"e44ee888.917218", + "id":"afa52494.436008", "type":"execute", "name":"split evpn_irts", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n", "comments":"", "outputs":1, - "x":2867.015380859375, - "y":1058.5155639648438, - "z":"21bf7e0.d63c382", + "x":2866.16641998291, + "y":1048.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ [ - "b3fb0522.2e1138", - "2f16c983.f313c6" + "a2faa92a.6d34c8", + "99a5d2ac.70d4e" ] ] }, { - "id":"2f16c983.f313c6", + "id":"99a5d2ac.70d4e", "type":"failure", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":3084.015380859375, - "y":984.5155639648438, - "z":"21bf7e0.d63c382", + "x":3083.16641998291, + "y":974.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ [ - "79319086.b2f45" + "3a5f097c.aa4b76" ] ] }, { - "id":"b3fb0522.2e1138", + "id":"a2faa92a.6d34c8", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":3085.015380859375, - "y":1050.5155639648438, - "z":"21bf7e0.d63c382", + "x":3084.16641998291, + "y":1040.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ [ - "3e085d66.84c402" + "e3c3ecd1.1d3de" ] ] }, { - "id":"3e085d66.84c402", + "id":"e3c3ecd1.1d3de", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments":"", - "x":3266.015380859375, - "y":1048.5155639648438, - "z":"21bf7e0.d63c382", + "x":3265.16641998291, + "y":1038.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"bfc1728b.da05d", + "id":"4838fe79.9c15c", "type":"set", "name":"set evpn_erts", "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":2834.515380859375, - "y":1149.0155944824219, - "z":"21bf7e0.d63c382", + "x":2833.66641998291, + "y":1139.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"72d8e223.d0b3fc", + "id":"498325c5.0baffc", "type":"execute", "name":"split evpn_erts", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n", "comments":"", "outputs":1, - "x":2863.515380859375, - "y":1201.0155944824219, - "z":"21bf7e0.d63c382", + "x":2862.66641998291, + "y":1191.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "3bac7268.6214de", - "1921e77b.b9d069" + "252779ac.34f776", + "c60af97c.26e9a8" ] ] }, { - "id":"1921e77b.b9d069", + "id":"c60af97c.26e9a8", "type":"failure", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":3080.515380859375, - "y":1127.0155944824219, - "z":"21bf7e0.d63c382", + "x":3079.66641998291, + "y":1117.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "596b6eff.51d1d" + "d01a6ff.a639b9" ] ] }, { - "id":"3bac7268.6214de", + "id":"252779ac.34f776", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":3081.515380859375, - "y":1193.0155944824219, - "z":"21bf7e0.d63c382", + "x":3080.66641998291, + "y":1183.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "a3151092.f6bfe" + "99152285.4b98e" ] ] }, { - "id":"a3151092.f6bfe", + "id":"99152285.4b98e", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments":"", - "x":3262.515380859375, - "y":1191.0155944824219, - "z":"21bf7e0.d63c382", + "x":3261.66641998291, + "y":1181.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"79319086.b2f45", + "id":"3a5f097c.aa4b76", "type":"for", "name":"for each evpn_irts", "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n", "comments":"", "outputs":1, - "x":3286.5155448913574, - "y":984.015604019165, - "z":"21bf7e0.d63c382", + "x":3285.6665840148926, + "y":974.015604019165, + "z":"e7b3886.bec2e78", "wires":[ [ - "4e2f2b2d.1c3bc4" + "c7718a98.e04308" ] ] }, { - "id":"4e2f2b2d.1c3bc4", + "id":"c7718a98.e04308", "type":"set", "name":"set evpn_irt", "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n", "comments":"", - "x":3498.5160369873047, - "y":984.0157566070557, - "z":"21bf7e0.d63c382", + "x":3497.66707611084, + "y":974.0157566070557, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"596b6eff.51d1d", + "id":"d01a6ff.a639b9", "type":"for", "name":"for each evpn_erts", "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n", "comments":"", "outputs":1, - "x":3280.015380859375, - "y":1123.0155944824219, - "z":"21bf7e0.d63c382", + "x":3279.16641998291, + "y":1113.0155944824219, + "z":"e7b3886.bec2e78", "wires":[ [ - "e02fb530.a62c28" + "980d219f.1cb96" ] ] }, { - "id":"e02fb530.a62c28", + "id":"980d219f.1cb96", "type":"set", "name":"set evpn_ert", "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n", "comments":"", - "x":3492.0158729553223, - "y":1123.0157470703125, - "z":"21bf7e0.d63c382", + "x":3491.1669120788574, + "y":1113.0157470703125, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"6bd3101.b6ac7f", + "id":"87fc0003.1c83", "type":"block", "name":"block setEvpnIrts", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":2592.015380859375, - "y":1055.5155639648438, - "z":"21bf7e0.d63c382", + "x":2591.16641998291, + "y":1045.5155639648438, + "z":"e7b3886.bec2e78", "wires":[ [ - "e67e9dd7.989e2", - "e44ee888.917218" + "de4c08e4.779ef8", + "afa52494.436008" ] ] }, { - "id":"353fa61f.c112fa", + "id":"e1b1c41e.20d598", "type":"block", "name":"block setEvpnErts", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":2585.5152740478516, - "y":1111.0156517028809, - "z":"21bf7e0.d63c382", + "x":2584.6663131713867, + "y":1101.0156517028809, + "z":"e7b3886.bec2e78", "wires":[ [ - "bfc1728b.da05d", - "72d8e223.d0b3fc" + "4838fe79.9c15c", + "498325c5.0baffc" ] ] }, { - "id":"f8d5754b.bd5668", + "id":"f43e6d50.f002a", "type":"comment", "name":"TODO", "info":"Get information from VFC team about the A&AI location where name to network mapping will be available.", "comments":"", - "x":2567.0156326293945, - "y":340.51564025878906, - "z":"21bf7e0.d63c382", + "x":2566.1666717529297, + "y":330.51564025878906, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"6f5c1ca1.701f84", + "id":"29cdd210.569a2e", "type":"comment", "name":"TODO", "info":"Store activated network information in A&AI", "comments":"", - "x":723.515625, - "y":980.0155639648438, - "z":"21bf7e0.d63c382", + "x":722.6666641235352, + "y":970.0155639648438, + "z":"e7b3886.bec2e78", "wires":[ ] }, { - "id":"30786a9a.007f16", + "id":"c1da1447.655188", "type":"comment", "name":"TODO", "info":"Get information from VFC team about teh A&AI location where name to network mapping will be available.", "comments":"", - "x":2553.515380859375, - "y":933.5155639648438, - "z":"21bf7e0.d63c382", + "x":2552.66641998291, + "y":923.5155639648438, + "z":"e7b3886.bec2e78", + "wires":[ + + ] + }, + { + "id":"e2902d00.271b2", + "type":"execute", + "name":"execute generate-overlay-network-id", + "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.dci.network-id\"/>\n", + "comments":"", + "outputs":1, + "x":1396.3333740234375, + "y":1581.333426475525, + "z":"e7b3886.bec2e78", + "wires":[ + [ + + ] + ] + }, + { + "id":"ae44dcc.ae6882", + "type":"switchNode", + "name":"switch service-data.networks_length", + "xml":"<switch test='`$service-data.networks.network_length`'>\n", + "comments":"", + "outputs":1, + "x":1388.3333892822266, + "y":1651.3334327936172, + "z":"e7b3886.bec2e78", + "wires":[ + [ + "6472b37e.9743dc", + "63aa7013.b8d94" + ] + ] + }, + { + "id":"6472b37e.9743dc", + "type":"other", + "name":"Null", + "xml":"<outcome value=''>\n", + "comments":"", + "outputs":1, + "x":1662.1429595947266, + "y":1620.2858253717422, + "z":"e7b3886.bec2e78", + "wires":[ + [ + "4d01bada.4b4734" + ] + ] + }, + { + "id":"63aa7013.b8d94", + "type":"other", + "name":"other", + "xml":"<outcome value='Other'>\n", + "comments":"", + "outputs":1, + "x":1657.0001373291016, + "y":1666.000119805336, + "z":"e7b3886.bec2e78", + "wires":[ + [ + "329b5d96.16d152" + ] + ] + }, + { + "id":"4d01bada.4b4734", + "type":"set", + "name":"set nidx", + "xml":"<set>\n<parameter name='nidx' value='0' />\n", + "comments":"", + "x":1815.1429595947266, + "y":1619.8572365045547, + "z":"e7b3886.bec2e78", + "wires":[ + + ] + }, + { + "id":"329b5d96.16d152", + "type":"set", + "name":"set nidx", + "xml":"<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n", + "comments":"", + "x":1816.571548461914, + "y":1664.857297539711, + "z":"e7b3886.bec2e78", + "wires":[ + + ] + }, + { + "id":"54770b17.566f04", + "type":"set", + "name":"set network in service-data", + "xml":"<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.dci.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<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`' />\n\n\n", + "comments":"", + "x":1360.3333740234375, + "y":1723.3334350585938, + "z":"e7b3886.bec2e78", + "wires":[ + + ] + }, + { + "id":"ca9b0788.7f9838", + "type":"block", + "name":"block : saveNetworkData", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "comments":"", + "outputs":1, + "x":1056.6666259765625, + "y":1562.6666259765625, + "z":"e7b3886.bec2e78", + "wires":[ + [ + "e2902d00.271b2", + "ae44dcc.ae6882", + "54770b17.566f04", + "c62b5ead.36429" + ] + ] + }, + { + "id":"c62b5ead.36429", + "type":"set", + "name":"set networkId and network-object-path", + "xml":"<set>\n<parameter name='networkId' value='`$prop.dci.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.dci.network-id + '/network-data/'` \" />", + "comments":"", + "x":1392.6666259765625, + "y":1793, + "z":"e7b3886.bec2e78", + "wires":[ + + ] + }, + { + "id":"51ee7ac2.7dbfe4", + "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=\"dci-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"dci-connects.name\"/>\n<parameter name=\"field4\" value=\"$prop.dci-connects.name\" />\n<parameter name=\"field5\" value=\"dci-connects.id\"/>\n<parameter name=\"field6\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>", + "comments":"", + "outputs":1, + "x":1575.0004196166992, + "y":1421.6667108535767, + "z":"e7b3886.bec2e78", + "wires":[ + [ + + ] + ] + }, + { + "id":"f9e8ba1c.b0c118", + "type":"comment", + "name":"TODO", + "info":"Currently activate is done without assignment, later divide in two phases.", + "comments":"", + "x":1351.6666259765625, + "y":55.666664123535156, + "z":"e7b3886.bec2e78", "wires":[ ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json index 960679ff..cfccd825 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json @@ -1,20 +1,20 @@ [ { - "id":"b4ab3cc5.98a8", + "id":"148f01b9.7651be", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":77, - "y":35, - "z":"4954cd5d.30ecf4", + "x":127.66666412353516, + "y":59.666664123535156, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "e6efa6d3.e15398" + "75389724.73d1d8" ] ] }, { - "id":"e6efa6d3.e15398", + "id":"75389724.73d1d8", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,62 +22,61 @@ "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":338, - "y":106, - "z":"4954cd5d.30ecf4", + "x":388.66666412353516, + "y":130.66666412353516, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "55bb413f.73fa7" + "c572bb07.b4aab8" ] ] }, { - "id":"55bb413f.73fa7", + "id":"c572bb07.b4aab8", "type":"method", "name":"method dci-connects-network-topology-operation-deactivate", "xml":"<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n", "comments":"", "outputs":1, - "x":228, - "y":191, - "z":"4954cd5d.30ecf4", + "x":278.66666412353516, + "y":215.66666412353516, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "750ee4c.8fdd21c" + "2e7d9d36.9e8932" ] ] }, { - "id":"750ee4c.8fdd21c", + "id":"2e7d9d36.9e8932", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":527, - "y":185, - "z":"4954cd5d.30ecf4", + "x":613.6666793823242, + "y":215.66667366027832, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "ea6f8a69.5601e8", - "2f344129.2fe78e", - "33c821d9.b212fe", - "15fa4d45.d0b353", - "7e978ea8.0c5a1", - "a04a290c.948ab8" + "b8044390.c16c5", + "d126698a.8dba88", + "3c585b18.c1b394", + "17e0f0e1.f4a85f", + "c13afebf.e4af7" ] ] }, { - "id":"ea6f8a69.5601e8", + "id":"b8044390.c16c5", "type":"call", "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters", "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n", "comments":"", "outputs":1, - "x":898, - "y":60, - "z":"4954cd5d.30ecf4", + "x":948.6666641235352, + "y":84.66666412353516, + "z":"b8d6a9b7.54bca8", "wires":[ [ @@ -85,420 +84,578 @@ ] }, { - "id":"2f344129.2fe78e", + "id":"d126698a.8dba88", "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":763.9999771118164, - "y":838.9999732971191, - "z":"4954cd5d.30ecf4", + "x":814.6666412353516, + "y":863.6666374206543, + "z":"b8d6a9b7.54bca8", "wires":[ ] }, { - "id":"33c821d9.b212fe", - "type":"get-resource", - "name":"get-resource dci-connects", - "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"dci-connects\" \n\t\tkey=\"dci-connects.id AND depth = '1'\"\n pfx='tmp.aai.dci-connects' local-only='false' >\n", + "id":"a0179072.b0699", + "type":"block", + "name":"block : sendRequest", + "xml":"<block atomic=\"true\">", + "atomic":"true", "comments":"", "outputs":1, - "x":803.9999847412109, - "y":306.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1010.1666946411133, + "y":559.1823291778564, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "bcbac350.046e5", - "bcb8c268.c1efd", - "95a7f0ae.33df5" + "2004f909.4303c6", + "8f1e5d77.2d978", + "db4a772d.b48518", + "a9badb26.f8ff08" ] ] }, { - "id":"bcbac350.046e5", + "id":"48d3ef18.744f9", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1052.999984741211, - "y":270.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1542.666591644287, + "y":356.1818552017212, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "9441b536.e2c908" + "f3e0b35b.ac7e6" ] ] }, { - "id":"bcb8c268.c1efd", + "id":"1f0ce6e6.d7e319", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1059.999984741211, - "y":308.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1549.666591644287, + "y":394.1818552017212, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "22635f7c.d7e7a" + "25422e06.a06362" ] ] }, { - "id":"95a7f0ae.33df5", + "id":"c9371824.9cf4a8", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":1051.999984741211, - "y":350.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1541.666591644287, + "y":436.1818552017212, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "a0aae260.9c5c2" + "caa6b2ac.fdad4" ] ] }, { - "id":"22635f7c.d7e7a", + "id":"f3e0b35b.ac7e6", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1707.666591644287, + "y":345.1818552017212, + "z":"b8d6a9b7.54bca8", + "wires":[ + [ + + ] + ] + }, + { + "id":"25422e06.a06362", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", "comments":"", - "x":1216.999984741211, - "y":312.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1706.666591644287, + "y":398.1818552017212, + "z":"b8d6a9b7.54bca8", "wires":[ ] }, { - "id":"a0aae260.9c5c2", + "id":"caa6b2ac.fdad4", "type":"returnFailure", "name":"return failure", "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", "comments":"", - "x":1209.999984741211, - "y":359.9999887943268, - "z":"4954cd5d.30ecf4", + "x":1699.666591644287, + "y":445.1818552017212, + "z":"b8d6a9b7.54bca8", "wires":[ ] }, { - "id":"15fa4d45.d0b353", - "type":"block", - "name":"block : sendRequest", - "xml":"<block atomic=\"true\">", - "atomic":"true", + "id":"2004f909.4303c6", + "type":"get-resource", + "name":"get-resource esr-thirdparty-sdnc", + "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n", "comments":"", "outputs":1, - "x":765.5, - "y":606.5156269073486, - "z":"4954cd5d.30ecf4", + "x":1318.6666793823242, + "y":403.18186211586, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "e1e92378.2c99d", - "673c8079.171c7", - "5c11d741.ea97f8" + "48d3ef18.744f9", + "1f0ce6e6.d7e319", + "c9371824.9cf4a8" ] ] }, { - "id":"c5be9b53.183ee8", - "type":"success", - "name":"success", - "xml":"<outcome value='success'>\n", + "id":"8f1e5d77.2d978", + "type":"set", + "name":"set controller data", + "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n", "comments":"", - "outputs":1, - "x":1258.9997673034668, - "y":458.51514625549316, - "z":"4954cd5d.30ecf4", + "x":1290.1665306091309, + "y":504.6818163394928, + "z":"b8d6a9b7.54bca8", "wires":[ - [ - "c033d341.3f6dc" - ] + ] }, { - "id":"dcc81047.e0f45", - "type":"not-found", - "name":"not-found", - "xml":"<outcome value='not-found'>\n", + "id":"fc904692.6194d8", + "type":"execute", + "name":"execute RestApiCallNode De-Activate Vxlan Tunnel", + "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n", "comments":"", "outputs":1, - "x":1265.9997673034668, - "y":496.51514625549316, - "z":"4954cd5d.30ecf4", + "x":1818.1669692993164, + "y":622.1822843551636, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "a86ff2ba.5ed55" + ] ] }, { - "id":"38f7300e.03a3f", - "type":"other", - "name":"other", - "xml":"<outcome value='Other'>\n", + "id":"db4a772d.b48518", + "type":"switchNode", + "name":"switch tunnelType", + "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n", "comments":"", "outputs":1, - "x":1257.9997673034668, - "y":538.5151462554932, - "z":"4954cd5d.30ecf4", + "x":1281.1664276123047, + "y":646.6817951202393, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "d2f0ad9e.7cf8d" + "435458d3.7f7428", + "ac616ba.5114198" ] ] }, { - "id":"c033d341.3f6dc", - "type":"block", - "name":"block : atomic", - "xml":"<block atomic=\"true\">\n", - "atomic":"false", + "id":"435458d3.7f7428", + "type":"outcomeTrue", + "name":"L3-DCI", + "xml":"<outcome value='L3-DCI'>\n", "comments":"", "outputs":1, - "x":1423.9997673034668, - "y":447.51514625549316, - "z":"4954cd5d.30ecf4", + "x":1494.1665573120117, + "y":626.6817951202393, + "z":"b8d6a9b7.54bca8", "wires":[ [ - + "fc904692.6194d8" ] ] }, { - "id":"a86ff2ba.5ed55", - "type":"returnFailure", - "name":"return failure", - "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", + "id":"ac616ba.5114198", + "type":"outcomeTrue", + "name":"L2-DCI", + "xml":"<outcome value='L2-DCI'>\n", "comments":"", - "x":1422.9997673034668, - "y":500.51514625549316, - "z":"4954cd5d.30ecf4", + "outputs":1, + "x":1492.1663780212402, + "y":698.6817951202393, + "z":"b8d6a9b7.54bca8", "wires":[ - + [ + "43446998.00c4b8" + ] ] }, { - "id":"d2f0ad9e.7cf8d", - "type":"returnFailure", - "name":"return failure", - "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n", + "id":"43446998.00c4b8", + "type":"execute", + "name":"execute RestApiCallNode De-Activate Vxlan Tunnel", + "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>", "comments":"", - "x":1415.9997673034668, - "y":547.5151462554932, - "z":"4954cd5d.30ecf4", + "outputs":1, + "x":1812.1669235229492, + "y":699.1822204589844, + "z":"b8d6a9b7.54bca8", "wires":[ + [ + ] ] }, { - "id":"e1e92378.2c99d", - "type":"get-resource", - "name":"get-resource dci-connects", - "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n", + "id":"f950c622.50d2c8", + "type":"for", + "name":"for each network-input-parameters", + "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n", "comments":"", "outputs":1, - "x":1070.9998893737793, - "y":505.5151653289795, - "z":"4954cd5d.30ecf4", + "x":1072.666648864746, + "y":160.18229579925537, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "c5be9b53.183ee8", - "dcc81047.e0f45", - "38f7300e.03a3f" + "2803809e.cd6f9" ] ] }, { - "id":"673c8079.171c7", - "type":"set", - "name":"set controller data", - "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n", + "id":"a9badb26.f8ff08", + "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=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>", "comments":"", - "x":1042.499740600586, - "y":607.0151195526123, - "z":"4954cd5d.30ecf4", + "outputs":1, + "x":1255.0000305175781, + "y":578.6666641235352, + "z":"b8d6a9b7.54bca8", "wires":[ + [ + ] ] }, { - "id":"2589b144.7be4de", - "type":"execute", - "name":"execute RestApiCallNode De-Activate Vxlan Tunnel", - "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n", + "id":"2803809e.cd6f9", + "type":"block", + "name":"block", + "xml":"<block>\n", + "atomic":"false", "comments":"", "outputs":1, - "x":1573.5002746582031, - "y":669.5155820846558, - "z":"4954cd5d.30ecf4", + "x":1306.0000915527344, + "y":159.6666717529297, + "z":"b8d6a9b7.54bca8", "wires":[ [ - + "b059e691.786878", + "e3c86ec7.af8ef" ] ] }, { - "id":"5c11d741.ea97f8", + "id":"b059e691.786878", "type":"switchNode", - "name":"switch tunnelType", - "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n", + "name":"switch site1_id", + "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n", "comments":"", "outputs":1, - "x":1036.4997329711914, - "y":694.0150928497314, - "z":"4954cd5d.30ecf4", + "x":1512.3333015441895, + "y":128.66666793823242, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "6492045a.52a02c", - "647c96d8.6f1708" + "6b8958be.1a4d18" ] ] }, { - "id":"6492045a.52a02c", + "id":"6b8958be.1a4d18", "type":"outcomeTrue", - "name":"L3-DCI", - "xml":"<outcome value='L3-DCI'>\n", + "name":"true", + "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":1249.4998626708984, - "y":674.0150928497314, - "z":"4954cd5d.30ecf4", + "x":1713.333396911621, + "y":127.6666669845581, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "2589b144.7be4de" + "4c747d09.9d8e34" ] ] }, { - "id":"647c96d8.6f1708", - "type":"outcomeTrue", - "name":"L2-DCI", - "xml":"<outcome value='L2-DCI'>\n", + "id":"4c747d09.9d8e34", + "type":"set", + "name":"set id", + "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "outputs":1, - "x":1247.499683380127, - "y":746.0150928497314, - "z":"4954cd5d.30ecf4", + "x":1886.9997482299805, + "y":127.33321189880371, + "z":"b8d6a9b7.54bca8", "wires":[ - [ - "4fb66e63.84804" - ] + ] }, { - "id":"4fb66e63.84804", - "type":"execute", - "name":"execute RestApiCallNode De-Activate Vxlan Tunnel", - "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>", + "id":"e3c86ec7.af8ef", + "type":"switchNode", + "name":"switch tunnelType", + "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n", "comments":"", "outputs":1, - "x":1567.500228881836, - "y":746.5155181884766, - "z":"4954cd5d.30ecf4", + "x":1522.333381652832, + "y":181.6666738986969, + "z":"b8d6a9b7.54bca8", "wires":[ [ - + "53a3a5f5.60a92c" ] ] }, { - "id":"7e978ea8.0c5a1", - "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=\"network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>", + "id":"53a3a5f5.60a92c", + "type":"outcomeTrue", + "name":"true", + "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":739, - "y":429.0000171661377, - "z":"4954cd5d.30ecf4", + "x":1728.333381652832, + "y":181.6666738986969, + "z":"b8d6a9b7.54bca8", "wires":[ [ - + "e41570df.a2318" ] ] }, { - "id":"9441b536.e2c908", + "id":"e41570df.a2318", "type":"set", "name":"set tunnelType", - "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value=\"`$tmp.aai.dci-connects.dci-connects.serviceType`\" />\n", + "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments":"", - "x":1241.0000839233398, - "y":260.51568603515625, - "z":"4954cd5d.30ecf4", + "x":1897.333480834961, + "y":181.66668915748596, + "z":"b8d6a9b7.54bca8", "wires":[ ] }, { - "id":"a04a290c.948ab8", + "id":"3c585b18.c1b394", + "type":"block", + "name":"block : executeSite1", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "comments":"", + "outputs":1, + "x":802, + "y":161.3333282470703, + "z":"b8d6a9b7.54bca8", + "wires":[ + [ + "f950c622.50d2c8", + "a0179072.b0699" + ] + ] + }, + { + "id":"3cc5f533.01012a", "type":"for", "name":"for each network-input-parameters", - "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n", + "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n", + "comments":"", + "outputs":1, + "x":1077.666732788086, + "y":266.3332996368408, + "z":"b8d6a9b7.54bca8", + "wires":[ + [ + "38542283.614a3e" + ] + ] + }, + { + "id":"38542283.614a3e", + "type":"block", + "name":"block", + "xml":"<block>\n", + "atomic":"false", "comments":"", "outputs":1, - "x":791, - "y":180.51562690734863, - "z":"4954cd5d.30ecf4", + "x":1306.000099182129, + "y":268.81767559051514, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "ecdadcb9.f534b" + "4cb30828.1cc3b8" ] ] }, { - "id":"ecdadcb9.f534b", + "id":"4cb30828.1cc3b8", "type":"switchNode", - "name":"switch id", - "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n", + "name":"switch site2_id", + "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n", "comments":"", "outputs":1, - "x":1045.500099182129, - "y":181.5156364440918, - "z":"4954cd5d.30ecf4", + "x":1507.0000495910645, + "y":268.8176612854004, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "6f6c6213.b682dc" + "dd6bc853.9b86f8" ] ] }, { - "id":"6f6c6213.b682dc", + "id":"dd6bc853.9b86f8", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":1247.5002250671387, - "y":180.51565170288086, - "z":"4954cd5d.30ecf4", + "x":1708.000144958496, + "y":267.8176603317261, + "z":"b8d6a9b7.54bca8", "wires":[ [ - "9c537412.9158a8" + "eabf42ba.5e4d4" ] ] }, { - "id":"9c537412.9158a8", + "id":"eabf42ba.5e4d4", "type":"set", "name":"set id", - "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n", + "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", + "comments":"", + "x":1881.6664962768555, + "y":267.4842052459717, + "z":"b8d6a9b7.54bca8", + "wires":[ + + ] + }, + { + "id":"17e0f0e1.f4a85f", + "type":"block", + "name":"block : executeSite1", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "comments":"", + "outputs":1, + "x":802.0000076293945, + "y":270.48433208465576, + "z":"b8d6a9b7.54bca8", + "wires":[ + [ + "3cc5f533.01012a", + "a0179072.b0699" + ] + ] + }, + { + "id":"ba49b6c1.a72218", + "type":"set", + "name":"set object-path", + "xml":"<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n", + "comments":"", + "x":1117.0039901733398, + "y":791.5274066925049, + "z":"b8d6a9b7.54bca8", + "wires":[ + + ] + }, + { + "id":"378e343e.0cb45c", + "type":"set", + "name":"set networkId", + "xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n", + "comments":"", + "x":1111.289623260498, + "y":754.3845148086548, + "z":"b8d6a9b7.54bca8", + "wires":[ + + ] + }, + { + "id":"c13afebf.e4af7", + "type":"block", + "name":"block : saveNetworkData", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "comments":"", + "outputs":1, + "x":854.0000610351562, + "y":730.3333559036255, + "z":"b8d6a9b7.54bca8", + "wires":[ + [ + "378e343e.0cb45c", + "ba49b6c1.a72218", + "44d19a8f.ba7544", + "e247e731.bf5fd8" + ] + ] + }, + { + "id":"74d41b77.b05d54", + "type":"comment", + "name":"TODO", + "info":"Currently deactivate does deletion too, later divide in two phases.", + "comments":"", + "x":736, + "y":23.666664123535156, + "z":"b8d6a9b7.54bca8", + "wires":[ + + ] + }, + { + "id":"44d19a8f.ba7544", + "type":"set", + "name":"copy input to service-data", + "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n", + "comments":"", + "x":1147.0000686645508, + "y":710.6666679382324, + "z":"b8d6a9b7.54bca8", + "wires":[ + + ] + }, + { + "id":"e247e731.bf5fd8", + "type":"set", + "name":"set network-level-oper-status", + "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.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[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n", "comments":"", - "x":1429.1666069030762, - "y":179.18220138549805, - "z":"4954cd5d.30ecf4", + "x":1161, + "y":838.6666259765625, + "z":"b8d6a9b7.54bca8", "wires":[ ] } -] +]
\ No newline at end of file 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 41243f3b..7d572f9c 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,20 +1,20 @@ [ { - "id":"85a3d498.ee70b8", + "id":"f7054ab9.c750e8", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":467.0155944824219, - "y":473.0155944824219, - "z":"be8f5eb6.ea882", + "x":120.66666412353516, + "y":100.41365557909012, + "z":"d739160d.215ac8", "wires":[ [ - "484faa8a.853654" + "c424c6c5.ae02a8" ] ] }, { - "id":"484faa8a.853654", + "id":"c424c6c5.ae02a8", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,140 +22,140 @@ "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", + "x":202.61902618408203, + "y":140.65176802873611, + "z":"d739160d.215ac8", "wires":[ [ - "577e559b.5bf3fc" + "293d1a40.e88a76" ] ] }, { - "id":"577e559b.5bf3fc", + "id":"293d1a40.e88a76", "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", + "x":199.0952911376953, + "y":180.41364985704422, + "z":"d739160d.215ac8", "wires":[ [ - "d89fb108.c15da" + "6c71864c.68b0b8" ] ] }, { - "id":"ac32132a.0500d", + "id":"6808a800.72f6b8", "type":"comment", "name":" NETWORK-TOPOLOGY-OPERATION ", "info":"", "comments":"", - "x":861.3604507446289, - "y":420.60193824768066, - "z":"be8f5eb6.ea882", + "x":515.0115203857422, + "y":47.99999934434891, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"d89fb108.c15da", + "id":"6c71864c.68b0b8", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":581.015625, - "y":636.459077835083, - "z":"be8f5eb6.ea882", + "x":234.66669464111328, + "y":263.85713893175125, + "z":"d739160d.215ac8", "wires":[ [ - "e42a6d76.72f57", - "6e4d7ebf.93e81", - "ae97e5fa.ddc148", - "879a69b3.6edd88" + "a683a74d.bbfcd8", + "ec781a98.809e88", + "d4adb7b5.a74888", + "a12d09b7.6dc858" ] ] }, { - "id":"e42a6d76.72f57", + "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":811.0989837646484, - "y":1260.3017139434814, - "z":"be8f5eb6.ea882", + "x":464.7500534057617, + "y":887.6997750401497, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"6e4d7ebf.93e81", + "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":807.7298583984375, - "y":866.8727722167969, - "z":"be8f5eb6.ea882", + "x":461.3809280395508, + "y":494.2708333134651, + "z":"d739160d.215ac8", "wires":[ [ - "f25f7aea.b8fbf8", - "5b25cfb0.9dc3", - "ce4f0e34.637f", - "554ed162.fdbc2", - "9c1f95f4.d32d48", - "b361fb8f.196518", - "e0127b7f.249248" + "4dfadbed.777bc4", + "55daa54f.4836ec", + "5c025596.ae8c5c", + "67e93f6e.2c897", + "24132a9d.396786", + "29d750bd.02a64", + "e6eca3d3.abe59" ] ] }, { - "id":"f25f7aea.b8fbf8", + "id":"4dfadbed.777bc4", "type":"other", "name":"assign", "xml":"<outcome value='assign'>\n", "comments":"", "outputs":1, - "x":1028.2060546875, - "y":643.1584224700928, - "z":"be8f5eb6.ea882", + "x":681.8571243286133, + "y":270.556483566761, + "z":"d739160d.215ac8", "wires":[ [ - "9ca02c4f.ecd52" + "fc28dd4a.e1c57" ] ] }, { - "id":"9ca02c4f.ecd52", + "id":"fc28dd4a.e1c57", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1209.4442138671875, - "y":644.1585445404053, - "z":"be8f5eb6.ea882", + "x":863.0952835083008, + "y":271.5566056370735, + "z":"d739160d.215ac8", "wires":[ [ - "e222c594.de61b8" + "82d45ba2.1d8bc8" ] ] }, { - "id":"ae97e5fa.ddc148", + "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":940.0156097412109, - "y":579.0156707763672, - "z":"be8f5eb6.ea882", + "x":593.6666793823242, + "y":206.41373187303543, + "z":"d739160d.215ac8", "wires":[ [ @@ -163,15 +163,15 @@ ] }, { - "id":"e222c594.de61b8", + "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":1581.0155639648438, - "y":641.0156002044678, - "z":"be8f5eb6.ea882", + "x":1234.666633605957, + "y":268.413661301136, + "z":"d739160d.215ac8", "wires":[ [ @@ -179,48 +179,48 @@ ] }, { - "id":"5b25cfb0.9dc3", + "id":"55daa54f.4836ec", "type":"other", "name":"activate", "xml":"<outcome value='activate'>\n", "comments":"", "outputs":1, - "x":1030.0155944824219, - "y":817.0155944824219, - "z":"be8f5eb6.ea882", + "x":683.6666641235352, + "y":444.4136555790901, + "z":"d739160d.215ac8", "wires":[ [ - "a2f3df33.c4b68" + "67566173.45c4c" ] ] }, { - "id":"922d755b.661638", + "id":"627cdb56.3b7234", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1567.2537536621094, - "y":814.0158309936523, - "z":"be8f5eb6.ea882", + "x":1220.9048233032227, + "y":441.4138920903206, + "z":"d739160d.215ac8", "wires":[ [ - "c5274c8f.1721b", - "3b322ad5.66cb26" + "2132e234.e510ce", + "a3ddfe15.bee34" ] ] }, { - "id":"7c5eb492.d1272c", + "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":2612.825164794922, - "y":942.872766494751, - "z":"be8f5eb6.ea882", + "x":2266.476234436035, + "y":570.2708275914192, + "z":"d739160d.215ac8", "wires":[ [ @@ -228,48 +228,48 @@ ] }, { - "id":"ce4f0e34.637f", + "id":"5c025596.ae8c5c", "type":"other", "name":"deactivate", "xml":"<outcome value='deactivate'>\n", "comments":"", "outputs":1, - "x":1019.0155944824219, - "y":977.0156192779541, - "z":"be8f5eb6.ea882", + "x":672.6666641235352, + "y":604.4136803746223, + "z":"d739160d.215ac8", "wires":[ [ - "4fa02a57.55a214" + "2deb4375.385a5c" ] ] }, { - "id":"9c0934a4.38d8c8", + "id":"2deb4375.385a5c", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1571.2537994384766, - "y":1080.0159301757812, - "z":"be8f5eb6.ea882", + "x":860.9050216674805, + "y":603.4140033721924, + "z":"d739160d.215ac8", "wires":[ [ - "c5274c8f.1721b", - "a31ca188.c32d7" + "2132e234.e510ce", + "1d159242.42217e" ] ] }, { - "id":"61181d4d.3f9f64", + "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":2611.3250732421875, - "y":1114.622766494751, - "z":"be8f5eb6.ea882", + "x":2458.9762954711914, + "y":734.0208568572998, + "z":"d739160d.215ac8", "wires":[ [ @@ -277,48 +277,48 @@ ] }, { - "id":"554ed162.fdbc2", + "id":"67e93f6e.2c897", "type":"other", "name":"unassign", "xml":"<outcome value='unassign'>\n", "comments":"", "outputs":1, - "x":1027.0155944824219, - "y":1042.015619277954, - "z":"be8f5eb6.ea882", + "x":680.6666641235352, + "y":669.4136803746223, + "z":"d739160d.215ac8", "wires":[ [ - "babe1e.7216b1e" + "a5a4cbe4.928108" ] ] }, { - "id":"babe1e.7216b1e", + "id":"a5a4cbe4.928108", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1208.2537536621094, - "y":1043.0157413482666, - "z":"be8f5eb6.ea882", + "x":861.9048233032227, + "y":670.4138024449348, + "z":"d739160d.215ac8", "wires":[ [ - "c5274c8f.1721b", - "a93ebb11.5112b8" + "2132e234.e510ce", + "8cb9d01a.01cbb" ] ] }, { - "id":"98390811.bf3d38", + "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":2360.0750732421875, - "y":1208.372766494751, - "z":"be8f5eb6.ea882", + "x":2013.7261428833008, + "y":835.7708275914192, + "z":"d739160d.215ac8", "wires":[ [ @@ -326,535 +326,535 @@ ] }, { - "id":"9c1f95f4.d32d48", + "id":"24132a9d.396786", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":1018.0155982971191, - "y":1102.015609741211, - "z":"be8f5eb6.ea882", + "x":671.6666679382324, + "y":729.4136708378792, + "z":"d739160d.215ac8", "wires":[ [ - "b64c1d1.5a772e" + "e05b3a0e.6b2cf8" ] ] }, { - "id":"b64c1d1.5a772e", + "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":1200.0155944824219, - "y":1101.015619277954, - "z":"be8f5eb6.ea882", + "x":853.6666641235352, + "y":728.4136803746223, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"879a69b3.6edd88", + "id":"a12d09b7.6dc858", "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", + "x":483.77774810791016, + "y":846.8581135869026, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"8945700c.0d991", + "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":2566.7459564208984, - "y":852.7775211334229, - "z":"be8f5eb6.ea882", + "x":2220.3970260620117, + "y":480.1755822300911, + "z":"d739160d.215ac8", "wires":[ [ - "63bd9e68.829b4" + "329c7937.b6a136" ] ] }, { - "id":"c5274c8f.1721b", + "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":1873.4600524902344, - "y":812.3489017486572, - "z":"be8f5eb6.ea882", + "x":1527.1111221313477, + "y":439.74696284532547, + "z":"d739160d.215ac8", "wires":[ [ - "aeada561.cc58d8", - "7091af2b.522e4" + "4172c482.3f5a6c", + "d4b9b393.99ada" ] ] }, { - "id":"aeada561.cc58d8", + "id":"4172c482.3f5a6c", "type":"other", "name":"outcome Null", "xml":"<outcome value=''>\n", "comments":"", "outputs":1, - "x":2146.460090637207, - "y":811.3489665985107, - "z":"be8f5eb6.ea882", + "x":1800.1111602783203, + "y":438.747027695179, + "z":"d739160d.215ac8", "wires":[ [ - "ed06878e.3cab58" + "29641469.ee90fc" ] ] }, { - "id":"7091af2b.522e4", + "id":"d4b9b393.99ada", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":2126.4604148864746, - "y":851.3489713668823, - "z":"be8f5eb6.ea882", + "x":1780.111484527588, + "y":478.74703246355057, + "z":"d739160d.215ac8", "wires":[ [ - "ab947f5a.5f651" + "1bb6dea1.ed18f1" ] ] }, { - "id":"63bd9e68.829b4", + "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":2857.1745071411133, - "y":852.0276050567627, - "z":"be8f5eb6.ea882", + "x":2510.8255767822266, + "y":479.42566615343094, + "z":"d739160d.215ac8", "wires":[ [ - "3695eb78.874394" + "af5c385d.aaa198" ] ] }, { - "id":"3695eb78.874394", + "id":"af5c385d.aaa198", "type":"outcomeTrue", "name":"true", "xml":"<outcome value='true'>\n", "comments":"", "outputs":1, - "x":3046.1268615722656, - "y":852.9203433990479, - "z":"be8f5eb6.ea882", + "x":2699.777931213379, + "y":480.3184044957161, + "z":"d739160d.215ac8", "wires":[ [ - "674767aa.48a638" + "7a7e1001.3b10e" ] ] }, { - "id":"674767aa.48a638", + "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":3279.6586303710938, - "y":851.6703510284424, - "z":"be8f5eb6.ea882", + "x":2933.309700012207, + "y":479.0684121251106, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"6fdacf7d.b32fb", + "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":1819.571388244629, - "y":776.3489632606506, - "z":"be8f5eb6.ea882", + "x":1473.2224578857422, + "y":403.7470243573189, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"f5085beb.082298", + "id":"be0b87cc.facda8", "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", + "x":1202.3332595825195, + "y":236.63589030504227, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"ed06878e.3cab58", + "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":2308.237548828125, - "y":812.2379093170166, - "z":"be8f5eb6.ea882", + "x":1961.8886184692383, + "y":439.63597041368484, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"ab947f5a.5f651", + "id":"1bb6dea1.ed18f1", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":2264.7299880981445, - "y":851.9035091400146, - "z":"be8f5eb6.ea882", + "x":1918.3810577392578, + "y":479.3015702366829, + "z":"d739160d.215ac8", "wires":[ [ - "8945700c.0d991", - "61e26d45.4186e4" + "9acad2b9.f0834", + "cf1a68d3.1547a8" ] ] }, { - "id":"61e26d45.4186e4", + "id":"cf1a68d3.1547a8", "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", + "x":2138.698455810547, + "y":522.1587889790535, + "z":"d739160d.215ac8", "wires":[ [ - "b746b314.6a6bb" + "5e666501.228a8c" ] ] }, { - "id":"ebd0f10f.cbf66", + "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":2837.904369354248, - "y":890.4749698638916, - "z":"be8f5eb6.ea882", + "x":2491.5554389953613, + "y":517.8730309605598, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"b746b314.6a6bb", + "id":"5e666501.228a8c", "type":"outcome", "name":"NULL", "xml":"<outcome value=''>\n", "comments":"", "outputs":1, - "x":2656.4759216308594, - "y":893.3321132659912, - "z":"be8f5eb6.ea882", + "x":2310.1269912719727, + "y":520.7301743626595, + "z":"d739160d.215ac8", "wires":[ [ - "ebd0f10f.cbf66" + "b312a9fc.605418" ] ] }, { - "id":"3b322ad5.66cb26", + "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":1825.7933959960938, - "y":942.8241672515869, - "z":"be8f5eb6.ea882", + "x":1479.444465637207, + "y":570.2222283482552, + "z":"d739160d.215ac8", "wires":[ [ - "4168b97e.614508", - "648208ba.c9c398" + "671fe44a.883fcc", + "619f5c4e.da9664" ] ] }, { - "id":"4168b97e.614508", + "id":"671fe44a.883fcc", "type":"outcome", "name":"outcome PendingCreate", "xml":"<outcome value='PendingCreate'>\n", "comments":"", "outputs":1, - "x":2190.793375651041, - "y":942.8241519927977, - "z":"be8f5eb6.ea882", + "x":1844.4444452921543, + "y":570.222213089466, + "z":"d739160d.215ac8", "wires":[ [ - "7c5eb492.d1272c" + "6e5c6d24.81c194" ] ] }, { - "id":"648208ba.c9c398", + "id":"619f5c4e.da9664", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":2140.7934226989746, - "y":982.824182510376, - "z":"be8f5eb6.ea882", + "x":1794.444492340088, + "y":610.2222436070442, + "z":"d739160d.215ac8", "wires":[ [ - "cd47365a.985768" + "ddaa51b4.1a3e6" ] ] }, { - "id":"cd47365a.985768", + "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":2310.7934226989746, - "y":982.824182510376, - "z":"be8f5eb6.ea882", + "x":1964.444492340088, + "y":610.2222436070442, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"a31ca188.c32d7", + "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":1825.0948791503906, - "y":1114.7755680084229, - "z":"be8f5eb6.ea882", + "x":1225.7460136413574, + "y":670.1736888885498, + "z":"d739160d.215ac8", "wires":[ [ - "e33c6a6c.b344c8", - "aa28812e.314c3" + "666ae4b6.332edc", + "a7398342.dc0f5" ] ] }, { - "id":"e33c6a6c.b344c8", + "id":"666ae4b6.332edc", "type":"outcome", "name":"outcome Created", "xml":"<outcome value='Created'>\n", "comments":"", "outputs":1, - "x":2188.0948486328125, - "y":1114.775598526001, - "z":"be8f5eb6.ea882", + "x":1588.7459831237793, + "y":670.1737194061279, + "z":"d739160d.215ac8", "wires":[ [ - "61181d4d.3f9f64" + "fc61673.76cb698" ] ] }, { - "id":"aa28812e.314c3", + "id":"a7398342.dc0f5", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":2158.0948486328125, - "y":1154.775598526001, - "z":"be8f5eb6.ea882", + "x":1558.7459831237793, + "y":710.1737194061279, + "z":"d739160d.215ac8", "wires":[ [ - "deb09c1d.1e536" + "6900f252.7fffdc" ] ] }, { - "id":"deb09c1d.1e536", + "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":2324.0948486328125, - "y":1156.775598526001, - "z":"be8f5eb6.ea882", + "x":1724.7459831237793, + "y":712.1737194061279, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"a93ebb11.5112b8", + "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":1566.8964538574219, - "y":1209.9769687652588, - "z":"be8f5eb6.ea882", + "x":1220.5475234985352, + "y":837.375029861927, + "z":"d739160d.215ac8", "wires":[ [ - "b6998c15.248c1", - "86ffd64.1d13d28", - "90e3f2b9.f7fb8" + "c260be3c.787a4", + "3745164.07306ea", + "aa12305c.9840f" ] ] }, { - "id":"b6998c15.248c1", + "id":"c260be3c.787a4", "type":"outcome", "name":"outcome PendingCreate", "xml":"<outcome value='PendingCreate'>\n", "comments":"", "outputs":1, - "x":1926.8964233398438, - "y":1209.976999282837, - "z":"be8f5eb6.ea882", + "x":1580.547492980957, + "y":837.3750603795052, + "z":"d739160d.215ac8", "wires":[ [ - "98390811.bf3d38" + "76ad4a39.0cc194" ] ] }, { - "id":"86ffd64.1d13d28", + "id":"3745164.07306ea", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":1883.8963623046875, - "y":1293.977014541626, - "z":"be8f5eb6.ea882", + "x":1537.5474319458008, + "y":921.3750756382942, + "z":"d739160d.215ac8", "wires":[ [ - "38a0884b.706138" + "609493c3.1dc45c" ] ] }, { - "id":"38a0884b.706138", + "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":2075.229782104492, - "y":1292.6436433792114, - "z":"be8f5eb6.ea882", + "x":1728.8808517456055, + "y":920.0417044758797, + "z":"d739160d.215ac8", "wires":[ ] }, { - "id":"90e3f2b9.f7fb8", + "id":"aa12305c.9840f", "type":"outcome", "name":"outcome PendingDelete", "xml":"<outcome value='PendingDelete'>\n", "comments":"", "outputs":1, - "x":1930.1266479492188, - "y":1247.824167251587, - "z":"be8f5eb6.ea882", + "x":1583.777717590332, + "y":875.2222283482552, + "z":"d739160d.215ac8", "wires":[ [ - "98390811.bf3d38" + "76ad4a39.0cc194" ] ] }, { - "id":"b361fb8f.196518", + "id":"29d750bd.02a64", "type":"other", "name":"create", "xml":"<outcome value='create'>\n", "comments":"", "outputs":1, - "x":1015.4679565429688, - "y":1161.6019382476807, - "z":"be8f5eb6.ea882", + "x":669.119026184082, + "y":788.9999993443489, + "z":"d739160d.215ac8", "wires":[ [ - "870ebc3.cf39e4" + "8872f98e.6acb58" ] ] }, { - "id":"e0127b7f.249248", + "id":"e6eca3d3.abe59", "type":"other", "name":"delete", "xml":"<outcome value='delete'>\n", "comments":"", "outputs":1, - "x":1018.4679565429688, - "y":1214.6019382476807, - "z":"be8f5eb6.ea882", + "x":672.119026184082, + "y":841.9999993443489, + "z":"d739160d.215ac8", "wires":[ [ - "997e78db.545078" + "9bd83beb.090958" ] ] }, { - "id":"870ebc3.cf39e4", + "id":"8872f98e.6acb58", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1204.4679565429688, - "y":1167.6019382476807, - "z":"be8f5eb6.ea882", + "x":858.119026184082, + "y":794.9999993443489, + "z":"d739160d.215ac8", "wires":[ [ - "3c97679a.62e2f8" + "1974de99.132ea1" ] ] }, { - "id":"997e78db.545078", + "id":"9bd83beb.090958", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "outputs":1, - "x":1203.4679565429688, - "y":1226.6019382476807, - "z":"be8f5eb6.ea882", + "x":857.119026184082, + "y":853.9999993443489, + "z":"d739160d.215ac8", "wires":[ [ - "54f0a399.e0516c" + "bedc898b.68ec58" ] ] }, { - "id":"3c97679a.62e2f8", + "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":1612.4679565429688, - "y":1352.6019382476807, - "z":"be8f5eb6.ea882", + "x":1266.119026184082, + "y":979.9999993443489, + "z":"d739160d.215ac8", "wires":[ [ @@ -862,15 +862,15 @@ ] }, { - "id":"54f0a399.e0516c", + "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":1618.4679565429688, - "y":1435.6019382476807, - "z":"be8f5eb6.ea882", + "x":1272.119026184082, + "y":1062.999999344349, + "z":"d739160d.215ac8", "wires":[ [ @@ -878,64 +878,64 @@ ] }, { - "id":"a2f3df33.c4b68", + "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":1214.6668243408203, - "y":797.3333606719971, - "z":"be8f5eb6.ea882", + "x":868.3178939819336, + "y":424.7314217686653, + "z":"d739160d.215ac8", "wires":[ [ - "4eb93a4e.82ca64", - "7ad79299.e126cc" + "18ffc8df.333407", + "4f680131.8475e" ] ] }, { - "id":"4eb93a4e.82ca64", + "id":"18ffc8df.333407", "type":"outcome", "name":"ActivateDCINetworkInstance", "xml":"<outcome value='ActivateDCINetworkInstance'>", "comments":"", "outputs":1, - "x":1457.0000915527344, - "y":719.333173751831, - "z":"be8f5eb6.ea882", + "x":1110.6511611938477, + "y":346.7312348484993, + "z":"d739160d.215ac8", "wires":[ [ - "564c81e9.848b9" + "73585281.0c5d0c" ] ] }, { - "id":"7ad79299.e126cc", + "id":"4f680131.8475e", "type":"outcome", "name":"other", "xml":"<outcome value='other'>", "comments":"", "outputs":1, - "x":1387.0000839233398, - "y":844.999870300293, - "z":"be8f5eb6.ea882", + "x":1040.6511535644531, + "y":472.3979313969612, + "z":"d739160d.215ac8", "wires":[ [ - "922d755b.661638" + "627cdb56.3b7234" ] ] }, { - "id":"564c81e9.848b9", + "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":1881.0001068115234, - "y":719.0000429153442, - "z":"be8f5eb6.ea882", + "x":1534.6511764526367, + "y":346.3981040120125, + "z":"d739160d.215ac8", "wires":[ [ @@ -943,48 +943,48 @@ ] }, { - "id":"4fa02a57.55a214", + "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":1227.6666259765625, - "y":975, - "z":"be8f5eb6.ea882", + "x":1863.333251953125, + "y":668.3333129882812, + "z":"d739160d.215ac8", "wires":[ [ - "bcde7f7f.e235b", - "55dafa1.c389f04" + "96fbac31.d3f4f", + "3bd184d4.cd8cbc" ] ] }, { - "id":"bcde7f7f.e235b", + "id":"96fbac31.d3f4f", "type":"outcome", "name":"DeActivateDCINetworkInstance", "xml":"<outcome value='DeActivateDCINetworkInstance'>", "comments":"", "outputs":1, - "x":1497.9998779296875, - "y":984.9998912811279, - "z":"be8f5eb6.ea882", + "x":2133.66650390625, + "y":678.3332042694092, + "z":"d739160d.215ac8", "wires":[ [ - "efb1ed02.23fdf" + "5f435227.66b5dc" ] ] }, { - "id":"efb1ed02.23fdf", + "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":1964.999900817871, - "y":1041.6667194366455, - "z":"be8f5eb6.ea882", + "x":2608.6667251586914, + "y":677.0000224113464, + "z":"d739160d.215ac8", "wires":[ [ @@ -992,18 +992,18 @@ ] }, { - "id":"55dafa1.c389f04", - "type":"outcome", + "id":"3bd184d4.cd8cbc", + "type":"other", "name":"other", - "xml":"<outcome value='other'>", + "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":1422.9998817443848, - "y":1080.6665649414062, - "z":"be8f5eb6.ea882", + "x":2056.3333435058594, + "y":736.3333549499512, + "z":"d739160d.215ac8", "wires":[ [ - "9c0934a4.38d8c8" + "d02489f7.8cbe58" ] ] } diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json index c55aa515..f76a824a 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json @@ -1,1186 +1,1086 @@ [ { - "id": "4e4a1db5.e19994", - "type": "dgstart", - "name": "DGSTART", - "outputs": 1, - "x": 69, - "y": 114.04766654968262, - "z": "32fe6314.d27544", - "wires": [ + "id":"fa4ef6c1.4eb578", + "type":"dgstart", + "name":"DGSTART", + "outputs":1, + "x":79.66666412353516, + "y":118.0478286743164, + "z":"85858cc8.f3e21", + "wires":[ [ - "b00c6ebc.9f6148" + "ca5f7f5c.05d2" ] ] }, { - "id": "b00c6ebc.9f6148", - "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": 314.2857131958008, - "y": 113.28574562072754, - "z": "32fe6314.d27544", - "wires": [ + "id":"ca5f7f5c.05d2", + "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":324.95237731933594, + "y":117.28590774536133, + "z":"85858cc8.f3e21", + "wires":[ [ - "44d4c8c4.c3b998" + "8645455c.b98c28" ] ] }, { - "id": "44d4c8c4.c3b998", - "type": "method", - "name": "method validate-network-input-parameters", - "xml": "<method rpc='validate-network-input-parameters' mode='sync'>\n", - "comments": "", - "outputs": 1, - "x": 271.91668701171875, - "y": 188.30068397521973, - "z": "32fe6314.d27544", - "wires": [ + "id":"8645455c.b98c28", + "type":"method", + "name":"method validate-network-input-parameters", + "xml":"<method rpc='validate-network-input-parameters' mode='sync'>\n", + "comments":"", + "outputs":1, + "x":282.5833511352539, + "y":192.30084609985352, + "z":"85858cc8.f3e21", + "wires":[ [ - "b1f5234e.374c1" + "9b7f7c48.ea161" ] ] }, { - "id": "b1f5234e.374c1", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 555.9166946411133, - "y": 176.30070877075195, - "z": "32fe6314.d27544", - "wires": [ + "id":"9b7f7c48.ea161", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":566.5833587646484, + "y":180.30087089538574, + "z":"85858cc8.f3e21", + "wires":[ [ - "911dd6e7.3e5ce", - "30f2c5d1.5e680a" + "e6ff88ab.904e18", + "ddfba2e8.a63b3" ] ] }, { - "id": "911dd6e7.3e5ce", - "type": "switchNode", - "name": "switch svc-action", - "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n", - "comments": "", - "outputs": 1, - "x": 836.9166946411133, - "y": 171.3006944656372, - "z": "32fe6314.d27544", - "wires": [ + "id":"e6ff88ab.904e18", + "type":"switchNode", + "name":"switch svc-action", + "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n", + "comments":"", + "outputs":1, + "x":847.5833587646484, + "y":175.300856590271, + "z":"85858cc8.f3e21", + "wires":[ [ - "84d48b8c.b6753" + "4f39bff8.da67" ] ] }, { - "id": "84d48b8c.b6753", - "type": "outcome", - "name": "NULL", - "xml": "<outcome value=''>", - "comments": "", - "outputs": 1, - "x": 1027.6309967041016, - "y": 172.30069541931152, - "z": "32fe6314.d27544", - "wires": [ + "id":"4f39bff8.da67", + "type":"outcome", + "name":"NULL", + "xml":"<outcome value=''>", + "comments":"", + "outputs":1, + "x":1038.2976608276367, + "y":176.3008575439453, + "z":"85858cc8.f3e21", + "wires":[ [ - "7ddcb143.915a4" + "a348b04f.fc644" ] ] }, { - "id": "7ddcb143.915a4", - "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": 1202.0595474243164, - "y": 171.300687789917, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "30f2c5d1.5e680a", - "type": "switchNode", - "name": "switch svc-action", - "xml": "<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n", - "comments": "", - "outputs": 1, - "x": 137.91664123535156, - "y": 447.30070877075195, - "z": "32fe6314.d27544", - "wires": [ - [ - "adae5694.342958", - "500ad4c6.47f08c", - "22013026.8cc88", - "750fe4a3.ade904", - "a9f01ff9.d40278" - ] + "id":"a348b04f.fc644", + "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":1212.7262115478516, + "y":175.30084991455078, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "adae5694.342958", - "type": "outcome", - "name": "create", - "xml": "<outcome value='create'>\n", - "comments": "", - "outputs": 1, - "x": 339.4167251586914, - "y": 447.30070877075195, - "z": "32fe6314.d27544", - "wires": [ + "id":"ddfba2e8.a63b3", + "type":"switchNode", + "name":"switch svc-action", + "xml":"<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n", + "comments":"", + "outputs":1, + "x":148.58330535888672, + "y":451.30087089538574, + "z":"85858cc8.f3e21", + "wires":[ [ - "45ac8a67.1ab214" + "6e77eb2e.738e04", + "e71878f5.f29958", + "9addc920.903ef8", + "428444e0.ca842c", + "55e08239.49f15c" ] ] }, { - "id": "45ac8a67.1ab214", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 505.41673278808594, - "y": 447.30070877075195, - "z": "32fe6314.d27544", - "wires": [ + "id":"6e77eb2e.738e04", + "type":"outcome", + "name":"create", + "xml":"<outcome value='create'>\n", + "comments":"", + "outputs":1, + "x":350.08338928222656, + "y":451.30087089538574, + "z":"85858cc8.f3e21", + "wires":[ [ - "97add15a.4cb3a8" + "89568ddf.5b471" ] ] }, { - "id": "d1354c61.d70e7", - "type": "for", - "name": "for loop i - Network input parameters", - "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n", - "comments": "", - "outputs": 1, - "x": 1704.630874633789, - "y": 111.01497840881348, - "z": "32fe6314.d27544", - "wires": [ + "id":"89568ddf.5b471", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":516.0833969116211, + "y":451.30087089538574, + "z":"85858cc8.f3e21", + "wires":[ [ - "f7be75b2.d145f8" + "f6c08df5.6fb1" ] ] }, { - "id": "560f8ff1.549fe8", - "type": "switchNode", - "name": "switch value", - "xml": "<switch test=\"`$tmp.value`\">\n", - "comments": "", - "outputs": 1, - "x": 2558.2022247314453, - "y": 365.01495361328125, - "z": "32fe6314.d27544", - "wires": [ + "id":"6c4b1b37.01f564", + "type":"for", + "name":"for loop i - Network input parameters", + "xml":"<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n", + "comments":"", + "outputs":1, + "x":1715.2975387573242, + "y":115.01514053344727, + "z":"85858cc8.f3e21", + "wires":[ [ - "35d7055a.4a3242" + "e6126a8f.3bd648" ] ] }, { - "id": "35d7055a.4a3242", - "type": "outcome", - "name": "NULL", - "xml": "<outcome value=''>", - "comments": "", - "outputs": 1, - "x": 2775.2021980285645, - "y": 364.01495933532715, - "z": "32fe6314.d27544", - "wires": [ + "id":"29338172.3d043e", + "type":"switchNode", + "name":"switch value", + "xml":"<switch test=\"`$tmp.value`\">\n", + "comments":"", + "outputs":1, + "x":2568.8688888549805, + "y":369.01511573791504, + "z":"85858cc8.f3e21", + "wires":[ [ - "d860ff65.a2e1" + "612b673.300ba98" ] ] }, { - "id": "d860ff65.a2e1", - "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": 2953.6309127807617, - "y": 365.01495933532715, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "500ad4c6.47f08c", - "type": "outcome", - "name": "deactivate", - "xml": "<outcome value='deactivate'>\n", - "comments": "", - "outputs": 1, - "x": 341.7142791748047, - "y": 605.4762363433838, - "z": "32fe6314.d27544", - "wires": [ + "id":"612b673.300ba98", + "type":"outcome", + "name":"NULL", + "xml":"<outcome value=''>", + "comments":"", + "outputs":1, + "x":2785.8688621520996, + "y":368.01512145996094, + "z":"85858cc8.f3e21", + "wires":[ [ - "4bb419b5.b0e6e" + "7afa06c2.9e5448" ] ] }, { - "id": "22013026.8cc88", - "type": "outcome", - "name": "delete", - "xml": "<outcome value='delete'>\n", - "comments": "", - "outputs": 1, - "x": 345.42866134643555, - "y": 932.1907939910889, - "z": "32fe6314.d27544", - "wires": [ - [ - "4023bbbc.b8c3c4" - ] + "id":"7afa06c2.9e5448", + "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":2964.297576904297, + "y":369.01512145996094, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "750fe4a3.ade904", - "type": "other", - "name": "other", - "xml": "<outcome value='Other'>\n", - "comments": "", - "outputs": 1, - "x": 343.1905403137207, - "y": 886.619062423706, - "z": "32fe6314.d27544", - "wires": [ + "id":"e71878f5.f29958", + "type":"outcome", + "name":"deactivate", + "xml":"<outcome value='deactivate'>\n", + "comments":"", + "outputs":1, + "x":352.38094329833984, + "y":609.4763984680176, + "z":"85858cc8.f3e21", + "wires":[ [ - "3dd4d642.9cafa2" + "239b0e93.1dcdc2" ] ] }, { - "id": "3dd4d642.9cafa2", - "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": 496.7621154785156, - "y": 889.2382063865662, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "f7be75b2.d145f8", - "type": "block", - "name": "block", - "xml": "<block>\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 1582.7142486572266, - "y": 257.761926651001, - "z": "32fe6314.d27544", - "wires": [ + "id":"9addc920.903ef8", + "type":"outcome", + "name":"delete", + "xml":"<outcome value='delete'>\n", + "comments":"", + "outputs":1, + "x":356.0953254699707, + "y":780.1909561157227, + "z":"85858cc8.f3e21", + "wires":[ [ - "26bdae61.564c5a", - "395e8b66.7b0f1c", - "84048547.624768" + "f1a885d0.8cce28" ] ] }, { - "id": "97add15a.4cb3a8", - "type": "switchNode", - "name": "switch request-action", - "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n", - "comments": "", - "outputs": 1, - "x": 831.0000152587891, - "y": 336.7143363952637, - "z": "32fe6314.d27544", - "wires": [ + "id":"428444e0.ca842c", + "type":"other", + "name":"other", + "xml":"<outcome value='Other'>\n", + "comments":"", + "outputs":1, + "x":353.85720443725586, + "y":734.6192245483398, + "z":"85858cc8.f3e21", + "wires":[ [ - "76502e63.ceb1a", - "1255dbb4.75c26c" + "e64ba27d.4c375" ] ] }, { - "id": "76502e63.ceb1a", - "type": "other", - "name": "CreateNetworkInstance", - "xml": "<outcome value='CreateNetworkInstance'>", - "comments": "", - "outputs": 1, - "x": 1097.000015258789, - "y": 295.7143363952637, - "z": "32fe6314.d27544", - "wires": [ - [ - "afc2e177.f42c" - ] + "id":"e64ba27d.4c375", + "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":507.4287796020508, + "y":737.2383685112, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "1255dbb4.75c26c", - "type": "other", - "name": "Other", - "xml": "<outcome value='Other'>", - "comments": "", - "outputs": 1, - "x": 1051.000015258789, - "y": 345.7143363952637, - "z": "32fe6314.d27544", - "wires": [ + "id":"e6126a8f.3bd648", + "type":"block", + "name":"block", + "xml":"<block>\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1593.3809127807617, + "y":261.76208877563477, + "z":"85858cc8.f3e21", + "wires":[ [ - "dfb2157e.4f1ae" + "ccd87bc0.9164f8", + "cb2894ec.bd74d8", + "6058dc0f.f41074" ] ] }, { - "id": "dfb2157e.4f1ae", - "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=create\" />\n", - "comments": "", - "x": 1220.000015258789, - "y": 345.7143363952637, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "afc2e177.f42c", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 1322.000015258789, - "y": 284.7143363952637, - "z": "32fe6314.d27544", - "wires": [ + "id":"f6c08df5.6fb1", + "type":"switchNode", + "name":"switch request-action", + "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n", + "comments":"", + "outputs":1, + "x":841.6666793823242, + "y":340.71449851989746, + "z":"85858cc8.f3e21", + "wires":[ [ - "d1354c61.d70e7" + "a05b6ee5.e1145", + "5ba95b98.5de334" ] ] }, { - "id": "26bdae61.564c5a", - "type": "set", - "name": "clear tmp-data", - "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n", - "comments": "", - "x": 1774.7143096923828, - "y": 212.00002479553223, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "395e8b66.7b0f1c", - "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": 1763.7143096923828, - "y": 302.0000247955322, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "84048547.624768", - "type": "switchNode", - "name": "switch name", - "xml": "<switch test=\"'$tmp.name'\">\n", - "comments": "", - "outputs": 1, - "x": 1742.7143096923828, - "y": 396.0000247955322, - "z": "32fe6314.d27544", - "wires": [ + "id":"a05b6ee5.e1145", + "type":"other", + "name":"CreateNetworkInstance", + "xml":"<outcome value='CreateNetworkInstance'>", + "comments":"", + "outputs":1, + "x":1107.6666793823242, + "y":299.71449851989746, + "z":"85858cc8.f3e21", + "wires":[ [ - "91870d3c.00766", - "9673ceac.9d128", - "2fa6afd4.470c68", - "208a2db6.5cd29a", - "a6950835.4f1f88", - "f6a60960.64ec1", - "3f6ebe83.24fb02", - "6691ccb6.43ba2c", - "3e734965.e53836", - "7c1d0f2f.d390d8", - "90835e79.55fda", - "98d98d4e.90457", - "c55ddc64.709ea", - "d3d96688.947678", - "de824513.d08848", - "bd1ecf5f.f7c2b", - "499053bc.575afc" + "90527be5.0854c8" ] ] }, { - "id": "91870d3c.00766", - "type": "outcome", - "name": "NULL", - "xml": "<outcome value=''>", - "comments": "", - "outputs": 1, - "x": 2282.285598754883, - "y": 899, - "z": "32fe6314.d27544", - "wires": [ + "id":"5ba95b98.5de334", + "type":"other", + "name":"Other", + "xml":"<outcome value='Other'>", + "comments":"", + "outputs":1, + "x":1061.6666793823242, + "y":349.71449851989746, + "z":"85858cc8.f3e21", + "wires":[ [ - "49ed5fbd.14e1c8" + "df81cf43.83855" ] ] }, { - "id": "49ed5fbd.14e1c8", - "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": 2457.285598754883, - "y": 898, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "9673ceac.9d128", - "type": "other", - "name": "name", - "xml": "<outcome value='name'>", - "comments": "", - "outputs": 1, - "x": 2259.285598754883, - "y": 21, - "z": "32fe6314.d27544", - "wires": [ - [ - "560f8ff1.549fe8" - ] + "id":"df81cf43.83855", + "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=create\" />\n", + "comments":"", + "x":1230.6666793823242, + "y":349.71449851989746, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "2fa6afd4.470c68", - "type": "other", - "name": "service-type", - "xml": "<outcome value='service-type'>", - "comments": "", - "outputs": 1, - "x": 2262.285598754883, - "y": 88, - "z": "32fe6314.d27544", - "wires": [ + "id":"90527be5.0854c8", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":1332.6666793823242, + "y":288.71449851989746, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "6c4b1b37.01f564" ] ] }, { - "id": "3f6ebe83.24fb02", - "type": "other", - "name": "sna2_name", - "xml": "<outcome value='sna2_name'>", - "comments": "", - "outputs": 1, - "x": 2266.285598754883, - "y": 317, - "z": "32fe6314.d27544", - "wires": [ - [ - "560f8ff1.549fe8" - ] + "id":"ccd87bc0.9164f8", + "type":"set", + "name":"clear tmp-data", + "xml":"<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n", + "comments":"", + "x":1785.380973815918, + "y":216.00018692016602, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "208a2db6.5cd29a", - "type": "other", - "name": "site1-name", - "xml": "<outcome value='site1-name'>", - "comments": "", - "outputs": 1, - "x": 2263.285598754883, - "y": 149, - "z": "32fe6314.d27544", - "wires": [ - [ - "560f8ff1.549fe8" - ] + "id":"cb2894ec.bd74d8", + "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":1774.380973815918, + "y":306.000186920166, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "a6950835.4f1f88", - "type": "other", - "name": "site2-name", - "xml": "<outcome value='site2-name'>", - "comments": "", - "outputs": 1, - "x": 2259.285598754883, - "y": 206, - "z": "32fe6314.d27544", - "wires": [ + "id":"6058dc0f.f41074", + "type":"switchNode", + "name":"switch name", + "xml":"<switch test=\"'$tmp.name'\">\n", + "comments":"", + "outputs":1, + "x":1753.380973815918, + "y":400.000186920166, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "225fa6e2.e42a6a", + "b1cea899.45bb78", + "b9c18c6.d77387", + "3d722919.f81306", + "7b7495f0.75885c", + "588a0bcd.6eb034", + "c510015f.64592", + "2187bd96.9aa5b2", + "10a4fa76.533046", + "f5abb1ff.c1ae", + "a7b43175.17a1e", + "7088b07a.e19a", + "6b511ebf.25f2b", + "77d1b8f5.2028a8", + "e96ec4f5.f46868", + "25d82e93.97f172", + "2c0ed5ac.b6f0aa" ] ] }, { - "id": "f6a60960.64ec1", - "type": "other", - "name": "sna1_name", - "xml": "<outcome value='sna1_name'>", - "comments": "", - "outputs": 1, - "x": 2262.285598754883, - "y": 263, - "z": "32fe6314.d27544", - "wires": [ + "id":"225fa6e2.e42a6a", + "type":"outcome", + "name":"NULL", + "xml":"<outcome value=''>", + "comments":"", + "outputs":1, + "x":2292.952262878418, + "y":903.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "9eb7590.5f32fa8" ] ] }, { - "id": "6691ccb6.43ba2c", - "type": "other", - "name": "pe1_id", - "xml": "<outcome value='pe1_id'>", - "comments": "", - "outputs": 1, - "x": 2266.285598754883, - "y": 368, - "z": "32fe6314.d27544", - "wires": [ - [ - "560f8ff1.549fe8" - ] + "id":"9eb7590.5f32fa8", + "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":2467.952262878418, + "y":902.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "3e734965.e53836", - "type": "other", - "name": "pe2_id", - "xml": "<outcome value='pe2_id'>", - "comments": "", - "outputs": 1, - "x": 2269.285598754883, - "y": 416, - "z": "32fe6314.d27544", - "wires": [ + "id":"b1cea899.45bb78", + "type":"other", + "name":"name", + "xml":"<outcome value='name'>", + "comments":"", + "outputs":1, + "x":2269.952262878418, + "y":25.00016212463379, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "7c1d0f2f.d390d8", - "type": "other", - "name": "ac1-id", - "xml": "<outcome value='ac1-id'>", - "comments": "", - "outputs": 1, - "x": 2274.285598754883, - "y": 465, - "z": "32fe6314.d27544", - "wires": [ + "id":"b9c18c6.d77387", + "type":"other", + "name":"service-type", + "xml":"<outcome value='service-type'>", + "comments":"", + "outputs":1, + "x":2272.952262878418, + "y":92.00016212463379, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "90835e79.55fda", - "type": "other", - "name": "ac2-id", - "xml": "<outcome value='ac2-id'>", - "comments": "", - "outputs": 1, - "x": 2276.285598754883, - "y": 520, - "z": "32fe6314.d27544", - "wires": [ + "id":"c510015f.64592", + "type":"other", + "name":"sna2_name", + "xml":"<outcome value='sna2_name'>", + "comments":"", + "outputs":1, + "x":2276.952262878418, + "y":321.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "98d98d4e.90457", - "type": "other", - "name": "ac1-ip", - "xml": "<outcome value='ac1-ip'>", - "comments": "", - "outputs": 1, - "x": 2276.285598754883, - "y": 572, - "z": "32fe6314.d27544", - "wires": [ + "id":"3d722919.f81306", + "type":"other", + "name":"site1-name", + "xml":"<outcome value='site1-name'>", + "comments":"", + "outputs":1, + "x":2273.952262878418, + "y":153.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "c55ddc64.709ea", - "type": "other", - "name": "ac2-ip", - "xml": "<outcome value='ac2-ip'>", - "comments": "", - "outputs": 1, - "x": 2278.285598754883, - "y": 633, - "z": "32fe6314.d27544", - "wires": [ + "id":"7b7495f0.75885c", + "type":"other", + "name":"site2-name", + "xml":"<outcome value='site2-name'>", + "comments":"", + "outputs":1, + "x":2269.952262878418, + "y":210.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "d3d96688.947678", - "type": "other", - "name": "ac1_peer_ip", - "xml": "<outcome value='ac1_peer_ip'>", - "comments": "", - "outputs": 1, - "x": 2280.285598754883, - "y": 683, - "z": "32fe6314.d27544", - "wires": [ + "id":"588a0bcd.6eb034", + "type":"other", + "name":"sna1_name", + "xml":"<outcome value='sna1_name'>", + "comments":"", + "outputs":1, + "x":2272.952262878418, + "y":267.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "de824513.d08848", - "type": "other", - "name": "ac2_peer_ip", - "xml": "<outcome value='ac2_peer_ip'>", - "comments": "", - "outputs": 1, - "x": 2276.285598754883, - "y": 731, - "z": "32fe6314.d27544", - "wires": [ + "id":"2187bd96.9aa5b2", + "type":"other", + "name":"pe1_id", + "xml":"<outcome value='pe1_id'>", + "comments":"", + "outputs":1, + "x":2276.952262878418, + "y":372.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "bd1ecf5f.f7c2b", - "type": "other", - "name": "ac1_svlan", - "xml": "<outcome value='ac1_svlan'>", - "comments": "", - "outputs": 1, - "x": 2278.285598754883, - "y": 784, - "z": "32fe6314.d27544", - "wires": [ + "id":"10a4fa76.533046", + "type":"other", + "name":"pe2_id", + "xml":"<outcome value='pe2_id'>", + "comments":"", + "outputs":1, + "x":2279.952262878418, + "y":420.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "499053bc.575afc", - "type": "other", - "name": "ac2_svlan", - "xml": "<outcome value='ac2_svlan'>", - "comments": "", - "outputs": 1, - "x": 2280.285598754883, - "y": 845, - "z": "32fe6314.d27544", - "wires": [ + "id":"f5abb1ff.c1ae", + "type":"other", + "name":"ac1-id", + "xml":"<outcome value='ac1-id'>", + "comments":"", + "outputs":1, + "x":2284.952262878418, + "y":469.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "560f8ff1.549fe8" + "29338172.3d043e" ] ] }, { - "id": "4023bbbc.b8c3c4", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 276.5714340209961, - "y": 1013.8572435379028, - "z": "32fe6314.d27544", - "wires": [ + "id":"a7b43175.17a1e", + "type":"other", + "name":"ac2-id", + "xml":"<outcome value='ac2-id'>", + "comments":"", + "outputs":1, + "x":2286.952262878418, + "y":524.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "97e7ce10.7c85b8", - "9dc996b.23ff3e8" + "29338172.3d043e" ] ] }, { - "id": "97e7ce10.7c85b8", - "type": "other", - "name": "DeleteNetworkInstance", - "xml": "<outcome value='DeleteNetworkInstance'>", - "comments": "", - "outputs": 1, - "x": 292.2857246398926, - "y": 1069.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"7088b07a.e19a", + "type":"other", + "name":"ac1-ip", + "xml":"<outcome value='ac1-ip'>", + "comments":"", + "outputs":1, + "x":2286.952262878418, + "y":576.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "841c3464.e35208" + "29338172.3d043e" ] ] }, { - "id": "9dc996b.23ff3e8", - "type": "other", - "name": "Other", - "xml": "<outcome value='Other'>", - "comments": "", - "outputs": 1, - "x": 246.28572463989258, - "y": 1119.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"6b511ebf.25f2b", + "type":"other", + "name":"ac2-ip", + "xml":"<outcome value='ac2-ip'>", + "comments":"", + "outputs":1, + "x":2288.952262878418, + "y":637.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "6b8e362b.376518" + "29338172.3d043e" ] ] }, { - "id": "6b8e362b.376518", - "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=delete\" />\n", - "comments": "", - "x": 415.2857246398926, - "y": 1119.8572072982788, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "841c3464.e35208", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 517.2857246398926, - "y": 1058.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"77d1b8f5.2028a8", + "type":"other", + "name":"ac1_peer_ip", + "xml":"<outcome value='ac1_peer_ip'>", + "comments":"", + "outputs":1, + "x":2290.952262878418, + "y":687.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "abf4d6e7.91759" + "29338172.3d043e" ] ] }, { - "id": "abf4d6e7.91759", - "type": "for", - "name": "for each 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": 339.2857246398926, - "y": 1213.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"e96ec4f5.f46868", + "type":"other", + "name":"ac2_peer_ip", + "xml":"<outcome value='ac2_peer_ip'>", + "comments":"", + "outputs":1, + "x":2286.952262878418, + "y":735.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "4d50d8cc.46e0a" + "29338172.3d043e" ] ] }, { - "id": "4d50d8cc.46e0a", - "type": "block", - "name": "block", - "xml": "<block>\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 332.2857246398926, - "y": 1298.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"25d82e93.97f172", + "type":"other", + "name":"ac1_svlan", + "xml":"<outcome value='ac1_svlan'>", + "comments":"", + "outputs":1, + "x":2288.952262878418, + "y":788.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "5c906df.eb09894" + "29338172.3d043e" ] ] }, { - "id": "5c906df.eb09894", - "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": 515.2857246398926, - "y": 1291.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"2c0ed5ac.b6f0aa", + "type":"other", + "name":"ac2_svlan", + "xml":"<outcome value='ac2_svlan'>", + "comments":"", + "outputs":1, + "x":2290.952262878418, + "y":849.0001621246338, + "z":"85858cc8.f3e21", + "wires":[ [ - "1e0b11b0.0c1596" + "29338172.3d043e" ] ] }, { - "id": "1e0b11b0.0c1596", - "type": "outcomeTrue", - "name": "true", - "xml": "<outcome value='true'>\n", - "comments": "", - "outputs": 1, - "x": 696.2857246398926, - "y": 1290.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"f1a885d0.8cce28", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":287.23809814453125, + "y":861.8574056625366, + "z":"85858cc8.f3e21", + "wires":[ [ - "6bd99898.8a25c8" + "53246327.3f169c", + "4ad8f670.2e7cb8" ] ] }, { - "id": "6bd99898.8a25c8", - "type": "switchNode", - "name": "switch value", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n", - "comments": "", - "outputs": 1, - "x": 860.2857246398926, - "y": 1290.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"53246327.3f169c", + "type":"other", + "name":"DeleteNetworkInstance", + "xml":"<outcome value='DeleteNetworkInstance'>", + "comments":"", + "outputs":1, + "x":302.95238876342773, + "y":917.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "2612c750.3f1de" + "b6255d3e.ce53d" ] ] }, { - "id": "2612c750.3f1de", - "type": "outcome", - "name": "NULL", - "xml": "<outcome value=''>", - "comments": "", - "outputs": 1, - "x": 729.2857246398926, - "y": 1414.8572072982788, - "z": "32fe6314.d27544", - "wires": [ + "id":"4ad8f670.2e7cb8", + "type":"other", + "name":"Other", + "xml":"<outcome value='Other'>", + "comments":"", + "outputs":1, + "x":256.95238876342773, + "y":967.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "27237901.158d7e" + "5f2c6750.3bbae8" ] ] }, { - "id": "27237901.158d7e", - "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": 907.7144393920898, - "y": 1415.8572072982788, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "a9f01ff9.d40278", - "type": "outcome", - "name": "activate", - "xml": "<outcome value='activate'>\n", - "comments": "", - "outputs": 1, - "x": 340.4285697937012, - "y": 539.7619791030884, - "z": "32fe6314.d27544", - "wires": [ - [ - "24b1be4.4b9cb42" - ] + "id":"5f2c6750.3bbae8", + "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=delete\" />\n", + "comments":"", + "x":425.95238876342773, + "y":967.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ + ] }, { - "id": "24b1be4.4b9cb42", - "type": "switchNode", - "name": "switch request-action", - "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n", - "comments": "", - "outputs": 1, - "x": 523.2857360839844, - "y": 536.9048290252686, - "z": "32fe6314.d27544", - "wires": [ + "id":"b6255d3e.ce53d", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":527.9523887634277, + "y":906.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "534344f8.99bd8c", - "3efa7868.7d6d6" + "6d8480b4.bbdb8" ] ] }, { - "id": "534344f8.99bd8c", - "type": "other", - "name": "ActivateNetworkInstance", - "xml": "<outcome value='ActivateNetworkInstance'>", - "comments": "", - "outputs": 1, - "x": 789.2857360839844, - "y": 495.90482902526855, - "z": "32fe6314.d27544", - "wires": [ + "id":"6d8480b4.bbdb8", + "type":"for", + "name":"for each 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":349.95238876342773, + "y":1061.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "dbc11e26.b1b04" + "30a4ecd8.0d1034" ] ] }, { - "id": "3efa7868.7d6d6", - "type": "other", - "name": "Other", - "xml": "<outcome value='Other'>", - "comments": "", - "outputs": 1, - "x": 743.2857360839844, - "y": 545.9048290252686, - "z": "32fe6314.d27544", - "wires": [ + "id":"30a4ecd8.0d1034", + "type":"block", + "name":"block", + "xml":"<block>\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":342.95238876342773, + "y":1146.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "7054bbc2.d71e3c" + "c6454200.70fda" ] ] }, { - "id": "7054bbc2.d71e3c", - "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 ActivateNetworkInstance for svc-action=activate\" />\n", - "comments": "", - "x": 912.2857360839844, - "y": 545.9048290252686, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "dbc11e26.b1b04", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 1014.2857360839844, - "y": 484.90482902526855, - "z": "32fe6314.d27544", - "wires": [ + "id":"c6454200.70fda", + "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":525.9523887634277, + "y":1139.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "bae11bcf.54b4c8" + "f7a7412d.0d646" ] ] }, { - "id": "4bb419b5.b0e6e", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 509, - "y": 609.7620029449463, - "z": "32fe6314.d27544", - "wires": [ + "id":"f7a7412d.0d646", + "type":"outcomeTrue", + "name":"true", + "xml":"<outcome value='true'>\n", + "comments":"", + "outputs":1, + "x":706.9523887634277, + "y":1138.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "15adf5d0.a38402", - "a37cc3b4.9b7a68" + "8bfc5d6c.baf0e" ] ] }, { - "id": "15adf5d0.a38402", - "type": "other", - "name": "DeactivateNetworkInstance", - "xml": "<outcome value='DeactivateNetworkInstance'>", - "comments": "", - "outputs": 1, - "x": 606.1428909301758, - "y": 687.1905641555786, - "z": "32fe6314.d27544", - "wires": [ + "id":"8bfc5d6c.baf0e", + "type":"switchNode", + "name":"switch value", + "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n", + "comments":"", + "outputs":1, + "x":870.9523887634277, + "y":1138.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "a95baf99.9c4a6" + "6c6337cf.113798" ] ] }, { - "id": "a37cc3b4.9b7a68", - "type": "other", - "name": "Other", - "xml": "<outcome value='Other'>", - "comments": "", - "outputs": 1, - "x": 560.1428909301758, - "y": 737.1905641555786, - "z": "32fe6314.d27544", - "wires": [ + "id":"6c6337cf.113798", + "type":"outcome", + "name":"NULL", + "xml":"<outcome value=''>", + "comments":"", + "outputs":1, + "x":739.9523887634277, + "y":1262.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ [ - "77245576.2c267c" + "e60613b0.6ba12" ] ] }, { - "id": "77245576.2c267c", - "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 DeactivateNetworkInstance for svc-action=deactivate\" />\n", - "comments": "", - "x": 729.1428909301758, - "y": 737.1905641555786, - "z": "32fe6314.d27544", - "wires": [] - }, - { - "id": "a95baf99.9c4a6", - "type": "block", - "name": "block : atomic", - "xml": "<block atomic=\"true\">", - "atomic": "true", - "outputs": 1, - "x": 831.1428909301758, - "y": 676.1905641555786, - "z": "32fe6314.d27544", - "wires": [ + "id":"e60613b0.6ba12", + "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":918.381103515625, + "y":1263.8573694229126, + "z":"85858cc8.f3e21", + "wires":[ + + ] + }, + { + "id":"55e08239.49f15c", + "type":"outcome", + "name":"activate", + "xml":"<outcome value='activate'>\n", + "comments":"", + "outputs":1, + "x":351.0952339172363, + "y":543.7621412277222, + "z":"85858cc8.f3e21", + "wires":[ [ - "3994558.cdec22a" + "b69a14cd.1d3d68" ] ] }, { - "id": "3994558.cdec22a", - "type": "for", - "name": "for each 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": 653.1428909301758, - "y": 831.1905641555786, - "z": "32fe6314.d27544", - "wires": [ + "id":"b69a14cd.1d3d68", + "type":"switchNode", + "name":"switch request-action", + "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n", + "comments":"", + "outputs":1, + "x":533.9524002075195, + "y":540.9049911499023, + "z":"85858cc8.f3e21", + "wires":[ [ - "a7f759b2.2be768" + "d54c9f22.ae97d", + "b12bd94e.696e48" ] ] }, { - "id": "a7f759b2.2be768", - "type": "block", - "name": "block", - "xml": "<block>\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 934.7143325805664, - "y": 804.7619962692261, - "z": "32fe6314.d27544", - "wires": [ + "id":"d54c9f22.ae97d", + "type":"other", + "name":"ActivateDCINetworkInstance", + "xml":"<outcome value='ActivateDCINetworkInstance'>", + "comments":"", + "outputs":1, + "x":799.9524002075195, + "y":499.90499114990234, + "z":"85858cc8.f3e21", + "wires":[ [ - "c9fb60d0.70a518" + "cf772b80.a4cba8" ] ] }, { - "id": "c9fb60d0.70a518", - "type": "switchNode", - "name": "switch id", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].id == 'id'`\">\n", - "comments": "", - "outputs": 1, - "x": 950.5715255737305, - "y": 860.6191473007202, - "z": "32fe6314.d27544", - "wires": [ + "id":"b12bd94e.696e48", + "type":"other", + "name":"Other", + "xml":"<outcome value='Other'>", + "comments":"", + "outputs":1, + "x":753.9524002075195, + "y":549.9049911499023, + "z":"85858cc8.f3e21", + "wires":[ [ - "56941bc3.f5be04" + "bef2ee40.874af" ] ] }, { - "id": "56941bc3.f5be04", - "type": "outcomeTrue", - "name": "true", - "xml": "<outcome value='true'>\n", - "comments": "", - "outputs": 1, - "x": 1131.5715255737305, - "y": 859.6191473007202, - "z": "32fe6314.d27544", - "wires": [ + "id":"bef2ee40.874af", + "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 ActivateNetworkInstance for svc-action=activate\" />\n", + "comments":"", + "x":922.9524002075195, + "y":549.9049911499023, + "z":"85858cc8.f3e21", + "wires":[ + + ] + }, + { + "id":"cf772b80.a4cba8", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "outputs":1, + "x":1024.9524002075195, + "y":488.90499114990234, + "z":"85858cc8.f3e21", + "wires":[ [ - "35a7f799.be48f" + "36dbd61d.c5357a" ] ] }, { - "id": "35a7f799.be48f", - "type": "switchNode", - "name": "switch value", - "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n", - "comments": "", - "outputs": 1, - "x": 1208.4286346435547, - "y": 938.1905860900879, - "z": "32fe6314.d27544", - "wires": [ + "id":"8b8b3296.f79f8", + "type":"other", + "name":"DeActivateDCINetworkInstance", + "xml":"<outcome value='DeActivateDCINetworkInstance'>", + "comments":"", + "outputs":1, + "x":795.8095703125, + "y":611.1907920837402, + "z":"85858cc8.f3e21", + "wires":[ [ - "ba107d78.943578" + ] ] }, { - "id": "ba107d78.943578", - "type": "outcome", - "name": "NULL", - "xml": "<outcome value=''>", - "comments": "", - "outputs": 1, - "x": 1117.4285774230957, - "y": 1022.1905422210693, - "z": "32fe6314.d27544", - "wires": [ + "id":"c54688aa.82e958", + "type":"other", + "name":"Other", + "xml":"<outcome value='Other'>", + "comments":"", + "outputs":1, + "x":710.8095626831055, + "y":680.1907997131348, + "z":"85858cc8.f3e21", + "wires":[ [ - "b43b580a.2bbc7" + "d62ac2c7.17544" ] ] }, { - "id": "b43b580a.2bbc7", - "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": 1295.857292175293, - "y": 1023.1905422210693, - "z": "32fe6314.d27544", - "wires": [] + "id":"d62ac2c7.17544", + "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 DeactivateNetworkInstance for svc-action=deactivate\" />\n", + "comments":"", + "x":891.8095779418945, + "y":681.1907997131348, + "z":"85858cc8.f3e21", + "wires":[ + + ] }, { - "id": "bae11bcf.54b4c8", - "type": "call", - "name": "call validate-overlay-network-input-parameters", - "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n", - "comments": "", - "outputs": 1, - "x": 1322.1510696411133, - "y": 486.3333520889282, - "z": "32fe6314.d27544", - "wires": [ - [] + "id":"36dbd61d.c5357a", + "type":"call", + "name":"call validate-overlay-network-input-parameters", + "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n", + "comments":"", + "outputs":1, + "x":1332.8177337646484, + "y":490.333514213562, + "z":"85858cc8.f3e21", + "wires":[ + [ + + ] + ] + }, + { + "id":"239b0e93.1dcdc2", + "type":"switchNode", + "name":"switch request-action", + "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n", + "comments":"", + "outputs":1, + "x":532.6666259765625, + "y":611.6666259765625, + "z":"85858cc8.f3e21", + "wires":[ + [ + "8b8b3296.f79f8", + "c54688aa.82e958" + ] ] } -] +]
\ 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 ebd32db5..d0a402c7 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 @@ -132,6 +132,19 @@ <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" /> <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" /> </set> + <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="dci-network-topology-operation-activate" /> + <parameter name="field3" value="dci-connects.name" /> + <parameter name="field4" value="$prop.dci-connects.name" /> + <parameter name="field5" value="dci-connects.id" /> + <parameter name="field6" value="`$prop.dci-connects.id`" /> + <parameter name="field7" value="dci-connects.tunnelType" /> + <parameter name="field8" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" /> + <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" /> + </record> <switch test="`$prop.dci-connects.tunnelType`"> <outcome value="L3-DCI"> <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> @@ -277,6 +290,19 @@ <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" /> <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" /> </set> + <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="dci-network-topology-operation-activate" /> + <parameter name="field3" value="dci-connects.name" /> + <parameter name="field4" value="$prop.dci-connects.name" /> + <parameter name="field5" value="dci-connects.id" /> + <parameter name="field6" value="`$prop.dci-connects.id`" /> + <parameter name="field7" value="dci-connects.tunnelType" /> + <parameter name="field8" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" /> + <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" /> + </record> <switch test="`$prop.dci-connects.tunnelType`"> <outcome value="L3-DCI"> <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> @@ -303,6 +329,39 @@ </switch> </block> </block> + <block atomic="true"> + <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID"> + <parameter name="ctx-destination" value="prop.dci.network-id" /> + </execute> + <switch test="`$service-data.networks.network_length`"> + <outcome value=""> + <set> + <parameter name="nidx" value="0" /> + </set> + </outcome> + <outcome value="Other"> + <set> + <parameter name="nidx" value="`$service-data.networks.network_length`" /> + </set> + </outcome> + </switch> + <set> + <parameter name="service-data.networks.network[$nidx].network-id" value="`$prop.dci.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`" /> + <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> + <set> + <parameter name="networkId" value="`$prop.dci.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.dci.network-id + '/network-data/'` " /> + </set> + </block> </block> <return status="success"> <parameter name="ack-final-indicator" value="Y" /> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml index 3a9e57dc..3de08ffe 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml @@ -3,89 +3,175 @@ <method rpc="dci-connects-network-topology-operation-deactivate" mode="sync"> <block atomic="true"> <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" /> - <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`"> - <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`"> - <outcome value="true"> - <set> - <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" /> - </set> - </outcome> - </switch> - </for> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="dci-connects" key="dci-connects.id AND depth = '1'" pfx="tmp.aai.dci-connects" local-only="false"> - <outcome value="success"> + <block atomic="true"> + <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`"> + <block> + <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`"> + <outcome value="true"> + <set> + <parameter name="prop.dci-connects.id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" /> + </set> + </outcome> + </switch> + <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`"> + <outcome value="true"> + <set> + <parameter name="prop.dci-connects.tunnelType" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" /> + </set> + </outcome> + </switch> + </block> + </for> + <block atomic="true"> + <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false"> + <outcome value="success"> + <block atomic="true" /> + </outcome> + <outcome value="not-found"> + <return status="failure"> + <parameter name="error-code" value="" /> + <parameter name="error-message" value="" /> + </return> + </outcome> + <outcome value="Other"> + <return status="failure"> + <parameter name="error-code" value="" /> + <parameter name="error-message" value="" /> + </return> + </outcome> + </get-resource> + <set> + <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" /> + <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" /> + <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" /> + <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" /> + </set> + <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="dci-network-topology-operation-deactivate" /> + <parameter name="field3" value="dci-connects.id" /> + <parameter name="field4" value="`$prop.dci-connects.id`" /> + <parameter name="field5" value="dci-connects.tunnelType" /> + <parameter name="field6" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field7" value="dci-connects.tunnelType" /> + <parameter name="field8" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" /> + <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" /> + </record> + <switch test="`$prop.dci-connects.tunnelType`"> + <outcome value="L3-DCI"> + <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> + <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" /> + <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> + <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> + <parameter name="format" value="json" /> + <parameter name="httpMethod" value="delete" /> + <parameter name="responsePrefix" value="restapi-result" /> + </execute> + </outcome> + <outcome value="L2-DCI"> + <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> + <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" /> + <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> + <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> + <parameter name="format" value="json" /> + <parameter name="httpMethod" value="delete" /> + <parameter name="responsePrefix" value="restapi-result" /> + </execute> + </outcome> + </switch> + </block> + </block> + <block atomic="true"> + <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`"> + <block> + <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`"> + <outcome value="true"> + <set> + <parameter name="prop.dci-connects.id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" /> + </set> + </outcome> + </switch> + </block> + </for> + <block atomic="true"> + <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false"> + <outcome value="success"> + <block atomic="true" /> + </outcome> + <outcome value="not-found"> + <return status="failure"> + <parameter name="error-code" value="" /> + <parameter name="error-message" value="" /> + </return> + </outcome> + <outcome value="Other"> + <return status="failure"> + <parameter name="error-code" value="" /> + <parameter name="error-message" value="" /> + </return> + </outcome> + </get-resource> <set> - <parameter name="prop.dci-connects.tunnelType" value="`$tmp.aai.dci-connects.dci-connects.serviceType`" /> + <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" /> + <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" /> + <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" /> + <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" /> </set> - </outcome> - <outcome value="not-found"> - <return status="failure"> - <parameter name="error-code" value="" /> - <parameter name="error-message" value="" /> - </return> - </outcome> - <outcome value="Other"> - <return status="failure"> - <parameter name="error-code" value="" /> - <parameter name="error-message" value="" /> - </return> - </outcome> - </get-resource> - <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="network-topology-operation-deactivate" /> - <parameter name="field3" value="dci-connects.id" /> - <parameter name="field4" value="`$prop.dci-connects.id`" /> - <parameter name="field5" value="dci-connects.tunnelType" /> - <parameter name="field6" value="`$prop.dci-connects.tunnelType`" /> - </record> + <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="dci-network-topology-operation-deactivate" /> + <parameter name="field3" value="dci-connects.id" /> + <parameter name="field4" value="`$prop.dci-connects.id`" /> + <parameter name="field5" value="dci-connects.tunnelType" /> + <parameter name="field6" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field7" value="dci-connects.tunnelType" /> + <parameter name="field8" value="`$prop.dci-connects.tunnelType`" /> + <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" /> + <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" /> + </record> + <switch test="`$prop.dci-connects.tunnelType`"> + <outcome value="L3-DCI"> + <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> + <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" /> + <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> + <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> + <parameter name="format" value="json" /> + <parameter name="httpMethod" value="delete" /> + <parameter name="responsePrefix" value="restapi-result" /> + </execute> + </outcome> + <outcome value="L2-DCI"> + <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> + <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" /> + <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> + <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> + <parameter name="format" value="json" /> + <parameter name="httpMethod" value="delete" /> + <parameter name="responsePrefix" value="restapi-result" /> + </execute> + </outcome> + </switch> + </block> + </block> <block atomic="true"> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false"> - <outcome value="success"> - <block atomic="true" /> - </outcome> - <outcome value="not-found"> - <return status="failure"> - <parameter name="error-code" value="" /> - <parameter name="error-message" value="" /> - </return> - </outcome> - <outcome value="Other"> - <return status="failure"> - <parameter name="error-code" value="" /> - <parameter name="error-message" value="" /> - </return> - </outcome> - </get-resource> <set> - <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" /> - <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" /> - <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" /> - <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" /> + <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" /> + <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" /> + </set> + <set> + <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" /> + </set> + <set> + <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/' + $networkId + '/network-data/network-topology/'` " /> + </set> + <set> + <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" /> + <parameter name="service-data.networks.network[$tmp.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[$tmp.nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" /> </set> - <switch test="`$prop.dci-connects.tunnelType`"> - <outcome value="L3-DCI"> - <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> - <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" /> - <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> - <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> - <parameter name="format" value="json" /> - <parameter name="httpMethod" value="delete" /> - <parameter name="responsePrefix" value="restapi-result" /> - </execute> - </outcome> - <outcome value="L2-DCI"> - <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> - <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" /> - <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" /> - <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" /> - <parameter name="format" value="json" /> - <parameter name="httpMethod" value="delete" /> - <parameter name="responsePrefix" value="restapi-result" /> - </execute> - </outcome> - </switch> </block> <return status="success"> <parameter name="ack-final-indicator" value="Y" /> 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 00848f98..13e2583a 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 @@ -65,59 +65,59 @@ </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>
+ <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">
+ <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">
- <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="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">
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml index 367abdfa..6ba9d230 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml @@ -228,7 +228,7 @@ </outcome>
<outcome value="activate">
<switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="ActivateNetworkInstance">
+ <outcome value="ActivateDCINetworkInstance">
<block atomic="true">
<call module="GENERIC-RESOURCE-API" rpc="validate-overlay-network-input-parameters" mode="sync" />
</block>
@@ -243,28 +243,8 @@ </switch>
</outcome>
<outcome value="deactivate">
- <block atomic="true">
- <outcome value="DeactivateNetworkInstance">
- <block atomic="true">
- <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].id == 'id'`">
- <outcome value="true">
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].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.name is a required input" />
- </return>
- </outcome>
- </switch>
- </outcome>
- </switch>
- </block>
- </for>
- </block>
- </outcome>
+ <switch test="`$network-topology-operation-input.request-information.request-action`">
+ <outcome value="DeActivateDCINetworkInstance" />
<outcome value="Other">
<return status="failure">
<parameter name="ack-final" value="Y" />
@@ -272,7 +252,7 @@ <parameter name="error-message" value="request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate" />
</return>
</outcome>
- </block>
+ </switch>
</outcome>
<outcome value="Other">
<return status="failure">
@@ -316,4 +296,4 @@ </switch>
</block>
</method>
-</service-logic>
+</service-logic>
\ No newline at end of file |