From 923760e351b66e980cef9547cd8cb2934265e0cc Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 10 Nov 2017 14:37:09 -0800 Subject: Update brg-topo-activate DG + vG setup 1. Change get-vgmux-lan-ip DG to pull whole tunnelxconn allotted resource which allows the use of both vgmux-lan-ip and vG-ip from tunnelxconn 2. Add vG vxlan tunnel and bridge domain setup to brg-topo-activate Issue-Id: SDNC-182 Change-Id: I29b1efce59d5b2f81f2937fa793e06ec96e8da7a Signed-off-by: Marcus G K Williams Former-commit-id: 5afd798760522289162f0681b8dcc09280cb4b4b --- ...SOURCE-API_brg-topology-operation-activate.json | 445 +++++++++++++++++---- .../GENERIC-RESOURCE-API_get-tunnelxconn-ar.json | 162 ++++++++ .../GENERIC-RESOURCE-API_get-vgmux-lan-ip.json | 162 -------- .../src/main/resources/graph.versions | 2 +- ...ESOURCE-API_brg-topology-operation-activate.xml | 78 +++- .../GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml | 18 + .../xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml | 18 - 7 files changed, 635 insertions(+), 250 deletions(-) create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json delete mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json index 13cd485e..b31d50be 100755 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json @@ -55,8 +55,8 @@ "atomic":"true", "comments":"", "outputs":1, - "x":153.47619247436523, - "y":285.5237879753113, + "x":140.97620391845703, + "y":1138.0237922668457, "z":"f97ade34.d219f", "wires":[ [ @@ -86,7 +86,14 @@ "60d1bf52.ad3d6", "ac82543e.0a2288", "4a0f8ea5.474a2", - "5f66c498.33c76c" + "5f66c498.33c76c", + "eab64b.710229b8", + "36e0c301.ee8e2c", + "5f18f40a.7db70c", + "ecf121e2.af8c8", + "496f8c72.09c0b4", + "9e2897fc.bd5fd8", + "fc322e28.718d1" ] ] }, @@ -96,8 +103,8 @@ "name":"return success", "xml":"\n\n\n\n", "comments":"", - "x":405.0001220703125, - "y":1954.8816022872925, + "x":420.00017166137695, + "y":2417.3817806243896, "z":"f97ade34.d219f", "wires":[ @@ -109,8 +116,8 @@ "name":"set output to api handler", "xml":"\n\n\n\n \n", "comments":"", - "x":433.75403594970703, - "y":1919.0041484832764, + "x":448.7540855407715, + "y":2381.5043268203735, "z":"f97ade34.d219f", "wires":[ @@ -787,8 +794,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":892.6414623260498, - "y":1522.9985412582755, + "x":965.9747314453125, + "y":1502.9985536560416, "z":"f97ade34.d219f", "wires":[ [ @@ -803,8 +810,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":883.6415119171143, - "y":1491.498567007482, + "x":956.974781036377, + "y":1471.4985794052482, "z":"f97ade34.d219f", "wires":[ [ @@ -819,8 +826,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":887.3915500640869, - "y":1461.8556718826294, + "x":960.7248191833496, + "y":1441.8556842803955, "z":"f97ade34.d219f", "wires":[ [ @@ -834,8 +841,8 @@ "name":"return failure", "xml":"\n\t\n\t\n \n", "comments":"", - "x":1053.391550064087, - "y":1492.24859084934, + "x":1126.7248191833496, + "y":1472.248603247106, "z":"f97ade34.d219f", "wires":[ @@ -849,8 +856,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":1029.0475177764893, - "y":1458.0478410720825, + "x":1102.380786895752, + "y":1438.0478534698486, "z":"f97ade34.d219f", "wires":[ [ @@ -922,8 +929,8 @@ "name":"save service data for BRG to md-sal for SO to do GET ", "info":"http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config/GENERIC-RESOURCE-API:services/service/e565bb6b-de14-4a5c-a992-65a681771a7a/service-data/service-topology/\n\n\nservice-instance-id is of the vBRG (in VNF-API data)", "comments":"", - "x":519.2949829101562, - "y":1504.9380531311035, + "x":199.2949981689453, + "y":1965.7714748382568, "z":"f97ade34.d219f", "wires":[ @@ -936,8 +943,8 @@ "xml":"\n \n \n \n \n \n \n\n", "comments":"", "outputs":1, - "x":516.5014190673828, - "y":1630.3347854614258, + "x":531.5014686584473, + "y":2092.834963798523, "z":"f97ade34.d219f", "wires":[ [ @@ -953,8 +960,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":805.3213386535645, - "y":1627.7141289710999, + "x":820.3213882446289, + "y":2090.214307308197, "z":"f97ade34.d219f", "wires":[ [ @@ -970,8 +977,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":986.3212928771973, - "y":1628.214078426361, + "x":1001.3213424682617, + "y":2090.7142567634583, "z":"f97ade34.d219f", "wires":[ [ @@ -987,8 +994,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1232.178539276123, - "y":1662.4998416900635, + "x":1247.1785888671875, + "y":2125.0000200271606, "z":"f97ade34.d219f", "wires":[ [ @@ -1003,8 +1010,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1423.1785430908203, - "y":1662.4998393058777, + "x":1438.1785926818848, + "y":2125.000017642975, "z":"f97ade34.d219f", "wires":[ [ @@ -1018,8 +1025,8 @@ "name":"set service-data from get", "xml":"\n\n", "comments":"", - "x":1823.0356788635254, - "y":1663.071263551712, + "x":1838.0357284545898, + "y":2125.571441888809, "z":"f97ade34.d219f", "wires":[ @@ -1033,8 +1040,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":1594.0355262756348, - "y":1663.071308374405, + "x":1609.0355758666992, + "y":2125.571486711502, "z":"f97ade34.d219f", "wires":[ [ @@ -1049,8 +1056,8 @@ "name":"GET vnf-api service info", "info":"", "comments":"", - "x":421.89267349243164, - "y":1593.642481803894, + "x":436.8927230834961, + "y":2056.142660140991, "z":"f97ade34.d219f", "wires":[ @@ -1063,8 +1070,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1806.7498970031738, - "y":1714.6426887512207, + "x":1821.7499465942383, + "y":2177.142867088318, "z":"f97ade34.d219f", "wires":[ [ @@ -1080,8 +1087,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":2046.6354598999023, - "y":1679.071237564087, + "x":2061.635509490967, + "y":2141.571415901184, "z":"f97ade34.d219f", "wires":[ [ @@ -1096,8 +1103,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":2072.3498344421387, - "y":1714.499828338623, + "x":2087.349884033203, + "y":2177.00000667572, "z":"f97ade34.d219f", "wires":[ [ @@ -1111,8 +1118,8 @@ "name":"Set service-data", "info":"", "comments":"", - "x":395.9879341125488, - "y":1678.499674797058, + "x":410.9879837036133, + "y":2140.9998531341553, "z":"f97ade34.d219f", "wires":[ @@ -1124,8 +1131,8 @@ "name":"save backup copy of mdsal-ar for rollback", "xml":"\n\n", "comments":"", - "x":1311.8928718566895, - "y":1628.2141704559326, + "x":1326.892921447754, + "y":2090.71434879303, "z":"f97ade34.d219f", "wires":[ @@ -1138,8 +1145,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":805.0831336975098, - "y":1663.9283018112183, + "x":820.0831832885742, + "y":2126.4284801483154, "z":"f97ade34.d219f", "wires":[ [ @@ -1155,8 +1162,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":985.0830841064453, - "y":1664.5948524475098, + "x":1000.0831336975098, + "y":2127.095030784607, "z":"f97ade34.d219f", "wires":[ [ @@ -1172,8 +1179,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":2261.1059761047363, - "y":1680.4468717575073, + "x":2276.106025695801, + "y":2142.9470500946045, "z":"f97ade34.d219f", "wires":[ [ @@ -1188,8 +1195,8 @@ "xml":"\n \n \n \n \n", "comments":"", "outputs":1, - "x":442.3108825683594, - "y":1551.7634887695312, + "x":452.3109130859375, + "y":2014.2635564804077, "z":"f97ade34.d219f", "wires":[ [ @@ -1204,8 +1211,8 @@ "xml":"\n \n \n \n \n \n \n \n\n", "comments":"", "outputs":1, - "x":516.5966033935547, - "y":1807.0018367767334, + "x":531.5966529846191, + "y":2269.5020151138306, "z":"f97ade34.d219f", "wires":[ [ @@ -1222,8 +1229,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1022.8094596862793, - "y":1801.5238494873047, + "x":1037.8095092773438, + "y":2264.024027824402, "z":"f97ade34.d219f", "wires":[ [ @@ -1238,8 +1245,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1013.8095092773438, - "y":1770.0238752365112, + "x":1028.8095588684082, + "y":2232.5240535736084, "z":"f97ade34.d219f", "wires":[ [ @@ -1254,8 +1261,8 @@ "xml":"\n", "comments":"", "outputs":1, - "x":1017.5595474243164, - "y":1740.3809801116586, + "x":1032.5595970153809, + "y":2202.8811584487557, "z":"f97ade34.d219f", "wires":[ [ @@ -1269,8 +1276,8 @@ "name":"return failure", "xml":"\n\t\n\t\n \n", "comments":"", - "x":1183.5595474243164, - "y":1770.7738990783691, + "x":1198.5595970153809, + "y":2233.2740774154663, "z":"f97ade34.d219f", "wires":[ @@ -1284,8 +1291,8 @@ "atomic":"false", "comments":"", "outputs":1, - "x":1159.2155151367188, - "y":1736.5731493011117, + "x":1174.2155647277832, + "y":2199.073327638209, "z":"f97ade34.d219f", "wires":[ [ @@ -1300,8 +1307,8 @@ "xml":"\n \n \n \n \n", "comments":"", "outputs":1, - "x":419.92994689941406, - "y":1766.5256357192993, + "x":434.9299964904785, + "y":2229.0258140563965, "z":"f97ade34.d219f", "wires":[ [ @@ -1371,13 +1378,315 @@ "id":"5f66c498.33c76c", "type":"set", "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip", - "xml":"\n\n", + "xml":"\n\n", "comments":"", "x":593.3332672119141, "y":1056.6665697097778, "z":"f97ade34.d219f", "wires":[ + ] + }, + { + "id":"e5c25a7.36cf4a8", + "type":"comment", + "name":"Change to POST and just update service?", + "info":"", + "comments":"", + "x":627.8571662902832, + "y":2293.928587913513, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"9e2897fc.bd5fd8", + "type":"execute", + "name":"execute RestApiCallNode - setup BRG to vgMux vxlan tunnel port", + "xml":"\n \n \n \n \n \n \n \n\n", + "comments":"", + "outputs":1, + "x":571.6666870117188, + "y":1769.1666793823242, + "z":"f97ade34.d219f", + "wires":[ + [ + "d26a8b7a.d9ece8", + "fbdedf10.5454a", + "57356d95.5d51a4" + ] + ] + }, + { + "id":"d26a8b7a.d9ece8", + "type":"not-found", + "name":"not-found", + "xml":"\n", + "comments":"", + "outputs":1, + "x":905.6414756774902, + "y":1828.4982913956046, + "z":"f97ade34.d219f", + "wires":[ + [ + "44fec79e.04adb8" + ] + ] + }, + { + "id":"fbdedf10.5454a", + "type":"failure", + "name":"failure", + "xml":"\n", + "comments":"", + "outputs":1, + "x":896.6415252685547, + "y":1796.9983171448112, + "z":"f97ade34.d219f", + "wires":[ + [ + "44fec79e.04adb8" + ] + ] + }, + { + "id":"57356d95.5d51a4", + "type":"success", + "name":"success", + "xml":"\n", + "comments":"", + "outputs":1, + "x":900.3915634155273, + "y":1767.3554220199585, + "z":"f97ade34.d219f", + "wires":[ + [ + "267bd26d.8679be" + ] + ] + }, + { + "id":"44fec79e.04adb8", + "type":"returnFailure", + "name":"return failure", + "xml":"\n\t\n\t\n \n", + "comments":"", + "x":1066.3915634155273, + "y":1797.748340986669, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"267bd26d.8679be", + "type":"block", + "name":"block", + "xml":"\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1042.0475311279297, + "y":1763.5475912094116, + "z":"f97ade34.d219f", + "wires":[ + [ + + ] + ] + }, + { + "id":"fc322e28.718d1", + "type":"execute", + "name":"execute RestApiCallNode - setup BRG vxlan bridge domain", + "xml":"\n \n \n \n \n \n \n \n\n", + "comments":"", + "outputs":1, + "x":551.6668167114258, + "y":1875.833604812622, + "z":"f97ade34.d219f", + "wires":[ + [ + "2e288f38.66f4a", + "bb6fb110.a62d", + "2d9ebec0.87afb2" + ] + ] + }, + { + "id":"2e288f38.66f4a", + "type":"not-found", + "name":"not-found", + "xml":"\n", + "comments":"", + "outputs":1, + "x":896.3081550598145, + "y":1956.498349569738, + "z":"f97ade34.d219f", + "wires":[ + [ + "171f1a40.fd48f6" + ] + ] + }, + { + "id":"bb6fb110.a62d", + "type":"failure", + "name":"failure", + "xml":"\n", + "comments":"", + "outputs":1, + "x":887.3082046508789, + "y":1924.9983753189445, + "z":"f97ade34.d219f", + "wires":[ + [ + "171f1a40.fd48f6" + ] + ] + }, + { + "id":"2d9ebec0.87afb2", + "type":"success", + "name":"success", + "xml":"\n", + "comments":"", + "outputs":1, + "x":891.0582427978516, + "y":1895.3554801940918, + "z":"f97ade34.d219f", + "wires":[ + [ + "8bfdc2b2.d6b66" + ] + ] + }, + { + "id":"171f1a40.fd48f6", + "type":"returnFailure", + "name":"return failure", + "xml":"\n\t\n\t\n \n", + "comments":"", + "x":1057.0582427978516, + "y":1925.7483991608024, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"8bfdc2b2.d6b66", + "type":"block", + "name":"block", + "xml":"\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1032.714210510254, + "y":1891.547649383545, + "z":"f97ade34.d219f", + "wires":[ + [ + + ] + ] + }, + { + "id":"ecf121e2.af8c8", + "type":"set", + "name":"set vG to vgMUX VXLAN Tunnel Port Props", + "xml":"\n\n\n\n", + "comments":"", + "x":501.4445343017578, + "y":1669.1668691635132, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"496f8c72.09c0b4", + "type":"execute", + "name":"generate full brg-vpp-honeycomb url", + "xml":"\n \n \n \n \n", + "comments":"", + "outputs":1, + "x":481.1111755371094, + "y":1724.1666479110718, + "z":"f97ade34.d219f", + "wires":[ + [ + + ] + ] + }, + { + "id":"5f18f40a.7db70c", + "type":"execute", + "name":"generate honeycomb-url to vG", + "xml":"\n \n \n \n \n", + "comments":"", + "outputs":1, + "x":460.44456481933594, + "y":1609.499843597412, + "z":"f97ade34.d219f", + "wires":[ + [ + + ] + ] + }, + { + "id":"eab64b.710229b8", + "type":"set", + "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip", + "xml":"\n\n", + "comments":"", + "x":570.0000457763672, + "y":1506.666633605957, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"36e0c301.ee8e2c", + "type":"set", + "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip", + "xml":"\n\n", + "comments":"", + "x":608.3333435058594, + "y":1556.6665630340576, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"a70320e9.12944", + "type":"comment", + "name":"Setup VXLAN Tunnel - vG to vgMUX", + "info":"", + "comments":"", + "x":155, + "y":1509.999852180481, + "z":"f97ade34.d219f", + "wires":[ + + ] + }, + { + "id":"a334503d.66fee", + "type":"comment", + "name":"Setup VXLAN Tunnel - vBRG to vgMUX", + "info":"", + "comments":"", + "x":157.1666717529297, + "y":860.0001373291016, + "z":"f97ade34.d219f", + "wires":[ + ] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json new file mode 100644 index 00000000..a263325a --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json @@ -0,0 +1,162 @@ +[ + { + "id":"39f3ae67.7e9242", + "type":"dgstart", + "name":"DGSTART", + "outputs":1, + "x":186.66665649414062, + "y":111.66666412353516, + "z":"e0aca357.6f32a", + "wires":[ + [ + "a29ec69.164b938" + ] + ] + }, + { + "id":"a29ec69.164b938", + "type":"service-logic", + "name":"GENERIC-RESOURCE-API ${project.version}", + "module":"GENERIC-RESOURCE-API", + "version":"${project.version}", + "comments":"", + "xml":"", + "outputs":1, + "x":282.90473556518555, + "y":172.61905479431152, + "z":"e0aca357.6f32a", + "wires":[ + [ + "4705cb34.a0c174" + ] + ] + }, + { + "id":"4705cb34.a0c174", + "type":"method", + "name":"get-tunnelxconn-ar", + "xml":"\n", + "comments":"", + "outputs":1, + "x":303.82152938842773, + "y":241.1904535293579, + "z":"e0aca357.6f32a", + "wires":[ + [ + "7864ada9.710574" + ] + ] + }, + { + "id":"7864ada9.710574", + "type":"block", + "name":"block : atomic", + "xml":"", + "atomic":"true", + "comments":"", + "outputs":1, + "x":237.14284896850586, + "y":351.19045209884644, + "z":"e0aca357.6f32a", + "wires":[ + [ + "2c32d527.ae06da", + "9e578822.5550a8" + ] + ] + }, + { + "id":"9e578822.5550a8", + "type":"for", + "name":"for tmp.tunnel-ar", + "xml":"\n\n\n", + "comments":"", + "outputs":1, + "x":421.66666412353516, + "y":359.9999370574951, + "z":"e0aca357.6f32a", + "wires":[ + [ + "4655d18f.1efdc" + ] + ] + }, + { + "id":"2c32d527.ae06da", + "type":"get-resource", + "name":"get-resource tunnelxconn-ar", + "xml":"\n", + "comments":"", + "outputs":1, + "x":499.99998474121094, + "y":301.33330726623535, + "z":"e0aca357.6f32a", + "wires":[ + [ + + ] + ] + }, + { + "id":"4655d18f.1efdc", + "type":"switchNode", + "name":"switch consuming-service-instance-id match", + "xml":"\n\n\n", + "comments":"", + "outputs":1, + "x":706.3333587646484, + "y":358.9999713897705, + "z":"e0aca357.6f32a", + "wires":[ + [ + "d430e328.d45e6" + ] + ] + }, + { + "id":"d430e328.d45e6", + "type":"success", + "name":"true", + "xml":"\n", + "comments":"", + "outputs":1, + "x":900.3333625793457, + "y":299.99995613098145, + "z":"e0aca357.6f32a", + "wires":[ + [ + "bbaf2c6f.a5b81" + ] + ] + }, + { + "id":"bbaf2c6f.a5b81", + "type":"block", + "name":"block", + "xml":"\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1124.9999465942383, + "y":333.6666135787964, + "z":"e0aca357.6f32a", + "wires":[ + [ + "885aaec0.195b" + ] + ] + }, + { + "id":"885aaec0.195b", + "type":"set", + "name":"set tmp.tunnelxconn-ar", + "xml":"\n\n", + "comments":"", + "x":1310.6668128967285, + "y":330.3332872390747, + "z":"e0aca357.6f32a", + "wires":[ + + ] + } +] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json deleted file mode 100644 index 75b0fac8..00000000 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json +++ /dev/null @@ -1,162 +0,0 @@ -[ - { - "id":"39f3ae67.7e9242", - "type":"dgstart", - "name":"DGSTART", - "outputs":1, - "x":186.66665649414062, - "y":111.66666412353516, - "z":"e0aca357.6f32a", - "wires":[ - [ - "a29ec69.164b938" - ] - ] - }, - { - "id":"a29ec69.164b938", - "type":"service-logic", - "name":"GENERIC-RESOURCE-API ${project.version}", - "module":"GENERIC-RESOURCE-API", - "version":"${project.version}", - "comments":"", - "xml":"", - "outputs":1, - "x":282.90473556518555, - "y":172.61905479431152, - "z":"e0aca357.6f32a", - "wires":[ - [ - "4705cb34.a0c174" - ] - ] - }, - { - "id":"4705cb34.a0c174", - "type":"method", - "name":"get-vgmux-lan-ip", - "xml":"\n", - "comments":"", - "outputs":1, - "x":303.82152938842773, - "y":241.1904535293579, - "z":"e0aca357.6f32a", - "wires":[ - [ - "7864ada9.710574" - ] - ] - }, - { - "id":"7864ada9.710574", - "type":"block", - "name":"block : atomic", - "xml":"", - "atomic":"true", - "comments":"", - "outputs":1, - "x":237.14284896850586, - "y":351.19045209884644, - "z":"e0aca357.6f32a", - "wires":[ - [ - "2c32d527.ae06da", - "9e578822.5550a8" - ] - ] - }, - { - "id":"9e578822.5550a8", - "type":"for", - "name":"for tmp.tunnel-ar", - "xml":"\n\n\n", - "comments":"", - "outputs":1, - "x":421.66666412353516, - "y":359.9999370574951, - "z":"e0aca357.6f32a", - "wires":[ - [ - "4655d18f.1efdc" - ] - ] - }, - { - "id":"2c32d527.ae06da", - "type":"get-resource", - "name":"get-resource tunnelxconn-ar", - "xml":"\n", - "comments":"", - "outputs":1, - "x":499.99998474121094, - "y":301.33330726623535, - "z":"e0aca357.6f32a", - "wires":[ - [ - - ] - ] - }, - { - "id":"4655d18f.1efdc", - "type":"switchNode", - "name":"switch consuming-service-instance-id match", - "xml":"\n\n\n", - "comments":"", - "outputs":1, - "x":706.3333587646484, - "y":358.9999713897705, - "z":"e0aca357.6f32a", - "wires":[ - [ - "d430e328.d45e6" - ] - ] - }, - { - "id":"d430e328.d45e6", - "type":"success", - "name":"true", - "xml":"\n", - "comments":"", - "outputs":1, - "x":900.3333625793457, - "y":299.99995613098145, - "z":"e0aca357.6f32a", - "wires":[ - [ - "bbaf2c6f.a5b81" - ] - ] - }, - { - "id":"bbaf2c6f.a5b81", - "type":"block", - "name":"block", - "xml":"\n", - "atomic":"false", - "comments":"", - "outputs":1, - "x":1124.9999465942383, - "y":333.6666135787964, - "z":"e0aca357.6f32a", - "wires":[ - [ - "885aaec0.195b" - ] - ] - }, - { - "id":"885aaec0.195b", - "type":"set", - "name":"set tmp.vgmux-lan-ip", - "xml":"\n\n", - "comments":"", - "x":1310.6668128967285, - "y":330.3332872390747, - "z":"e0aca357.6f32a", - "wires":[ - - ] - } -] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions index c9b9e1c9..8fb1451e 100644 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -20,7 +20,7 @@ GENERIC-RESOURCE-API eipam-create-network-role-pool ${project.version} sync GENERIC-RESOURCE-API generate-l3network-network-id ${project.version} sync GENERIC-RESOURCE-API generate-panorama-name ${project.version} sync GENERIC-RESOURCE-API generate-unique-name ${project.version} sync -GENERIC-RESOURCE-API get-vgmux-lan-ip ${project.version} sync +GENERIC-RESOURCE-API get-tunnelxconn-ar ${project.version} sync GENERIC-RESOURCE-API gw-vfmodule-update ${project.version} sync GENERIC-RESOURCE-API manage-ipaddr-assignment ${project.version} sync GENERIC-RESOURCE-API manage-vni-assignment ${project.version} sync diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml index 991d22f8..8a0333c2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml @@ -138,7 +138,7 @@ - + @@ -214,6 +214,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml new file mode 100644 index 00000000..f74ec8e3 --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml deleted file mode 100644 index 563e4bf8..00000000 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit 1.2.3-korg