diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-11-14 20:34:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-14 20:34:06 +0000 |
| commit | f3172e8d818224776d108f0ee2c15718798c8d29 (patch) | |
| tree | be971fdf72a4b7e2768bbd21b9c793a7a4d0e0c6 /platform-logic | |
| parent | a347e10eee024991ff7c0bf7487aa9e2b78f9a84 (diff) | |
| parent | 058e2a65a7a18a5914767a6fa16b0f84f692d85f (diff) | |
Merge "Fix tunnelxconn create/delete ip bugs"
Former-commit-id: e2453f4d1e1dc23cf3eb292db8ac908367d0844c
Diffstat (limited to 'platform-logic')
7 files changed, 1238 insertions, 732 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json new file mode 100644 index 00000000..8de156fe --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json @@ -0,0 +1,208 @@ +[ + { + "id":"ca9867f0.bee9b8", + "type":"for", + "name":"for tmp.vnfs", + "xml":"<for index='vnfidx' start='0' end='`$tmp.vnfdata.vnfs.vnf-list_length`' >\n\n\n", + "comments":"", + "outputs":1, + "x":490.9999313354492, + "y":347.3333616256714, + "z":"113743e5.c5805c", + "wires":[ + [ + "c8f3625d.8c17" + ] + ] + }, + { + "id":"5f5355c8.d5e21c", + "type":"dgstart", + "name":"DGSTART", + "outputs":1, + "x":121.66665649414062, + "y":80, + "z":"113743e5.c5805c", + "wires":[ + [ + "72be46c0.39b648" + ] + ] + }, + { + "id":"72be46c0.39b648", + "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":272.90473556518555, + "y":147.95239067077637, + "z":"113743e5.c5805c", + "wires":[ + [ + "f67f0e3d.eb57b" + ] + ] + }, + { + "id":"f67f0e3d.eb57b", + "type":"method", + "name":"get-vnf-api-parent-instance", + "xml":"<method rpc='get-vnf-api-parent-instance' mode='sync'>\n", + "comments":"", + "outputs":1, + "x":326.8215026855469, + "y":207.19044494628906, + "z":"113743e5.c5805c", + "wires":[ + [ + "26d836cd.d8f48a" + ] + ] + }, + { + "id":"26d836cd.d8f48a", + "type":"block", + "name":"block : atomic", + "xml":"<block atomic=\"true\">", + "atomic":"true", + "comments":"", + "outputs":1, + "x":227.14284896850586, + "y":326.5237879753113, + "z":"113743e5.c5805c", + "wires":[ + [ + "c3cef9b4.0af4e8", + "ca9867f0.bee9b8" + ] + ] + }, + { + "id":"c3cef9b4.0af4e8", + "type":"get-resource", + "name":"get-resource vnf-api vnfs", + "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs' pfx='tmp.vnfdata' >\n", + "comments":"", + "outputs":1, + "x":535.9999847412109, + "y":286.9999952316284, + "z":"113743e5.c5805c", + "wires":[ + [ + + ] + ] + }, + { + "id":"c8f3625d.8c17", + "type":"switchNode", + "name":"switch parent-service-instance-id matches", + "xml":"<switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.search.parent-service-instance-id`'>\n\n\n", + "comments":"", + "outputs":1, + "x":763.9999847412109, + "y":349.6666841506958, + "z":"113743e5.c5805c", + "wires":[ + [ + "929c05d0.10e968" + ] + ] + }, + { + "id":"8e1b44d6.600948", + "type":"get-resource", + "name":"get-resource parent service instance", + "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t", + "comments":"", + "outputs":1, + "x":1265.3333053588867, + "y":324.6666851043701, + "z":"113743e5.c5805c", + "wires":[ + [ + "2e1a8d2c.7d2b72" + ] + ] + }, + { + "id":"2e1a8d2c.7d2b72", + "type":"failure", + "name":"failure", + "xml":"<outcome value='failure'>\n", + "comments":"", + "outputs":1, + "x":1490.666654586792, + "y":324.33336639404297, + "z":"113743e5.c5805c", + "wires":[ + [ + "b633d9b1.a67d28" + ] + ] + }, + { + "id":"929c05d0.10e968", + "type":"success", + "name":"true", + "xml":"<outcome value='true'>\n", + "comments":"", + "outputs":1, + "x":1003.0000076293945, + "y":240.66669464111328, + "z":"113743e5.c5805c", + "wires":[ + [ + "40f0e6cc.970498" + ] + ] + }, + { + "id":"40f0e6cc.970498", + "type":"block", + "name":"block", + "xml":"<block>\n", + "atomic":"false", + "comments":"", + "outputs":1, + "x":1036.0000534057617, + "y":327.6667003631592, + "z":"113743e5.c5805c", + "wires":[ + [ + "5f33dc50.216f34", + "8e1b44d6.600948" + ] + ] + }, + { + "id":"5f33dc50.216f34", + "type":"set", + "name":"set tmp.old-service-data.vnf-id", + "xml":"<set>\n<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />\n", + "comments":"", + "x":1255.0000228881836, + "y":231.00003814697266, + "z":"113743e5.c5805c", + "wires":[ + + ] + }, + { + "id":"b633d9b1.a67d28", + "type":"returnFailure", + "name":"return failure - parent service instance not found", + "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\" \n value=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n", + "comments":"", + "x":1759.6666259765625, + "y":316.6666564941406, + "z":"113743e5.c5805c", + "wires":[ + + ] + } +]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json index f9cf0bea..bc414275 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json @@ -1,20 +1,20 @@ [ { - "id":"5d8427a4.b9ce18", + "id":"5425b93c.ce35a8", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":289.9999694824219, - "y":176.66666221618652, - "z":"1213c43c.2b234c", + "x":144.99998474121094, + "y":96.66666412353516, + "z":"7bef9372.a9efdc", "wires":[ [ - "2a707879.08ed58" + "eba50a1f.c2b9f8" ] ] }, { - "id":"2a707879.08ed58", + "id":"eba50a1f.c2b9f8", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,147 +22,152 @@ "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":386.2380485534668, - "y":237.6190528869629, - "z":"1213c43c.2b234c", + "x":241.23806381225586, + "y":157.61905479431152, + "z":"7bef9372.a9efdc", "wires":[ [ - "f18a9dbb.977df" + "3b82c53f.b432fa" ] ] }, { - "id":"f18a9dbb.977df", + "id":"3b82c53f.b432fa", "type":"method", "name":"tunnelxconn-topology-operation-create", "xml":"<method rpc='tunnelxconn-topology-operation-create' mode='sync'>\n", "comments":"", "outputs":1, - "x":432.1548271179199, - "y":272.8571081161499, - "z":"1213c43c.2b234c", + "x":287.154842376709, + "y":192.85711002349854, + "z":"7bef9372.a9efdc", "wires":[ [ - "7f262885.6d59b8" + "b9ac8d12.754da" ] ] }, { - "id":"7f262885.6d59b8", + "id":"b9ac8d12.754da", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":340.4761619567871, - "y":416.1904501914978, - "z":"1213c43c.2b234c", + "x":147.97617721557617, + "y":928.6904685497284, + "z":"7bef9372.a9efdc", "wires":[ [ - "9a047ca3.43842", - "89ae09fa.b55dc8", - "d311ed47.69e1d", - "55ae20df.fc8b9", - "1acbd514.a1254b", - "8c2cd18b.e8d76", - "ddfe771b.c87dd8", - "83a795f7.2396f8", - "ba77d55a.14d7b8", - "60d77360.0d0b1c", - "4aacb3a2.ee73cc", - "f2d67a4f.b5fbd8", - "3ddd0b30.9a33e4", - "9e5a94b9.112208", - "6c7d53f3.fcddcc", - "5ed77e12.ca895", - "58a8145.b4b65ec", - "5dffc587.4020dc", - "be1a85fd.d9b228", - "b5d6eac2.9b2138", - "b3164bc6.a02478", - "8ddeb7ba.6380c8", - "d69c7a00.1f6db8", - "5964855c.5ef3ac", - "aac1998d.738588" + "69ac42e1.e4d65c", + "b1c7a6a5.9defc8", + "39cc3f5d.10819", + "aed16d9f.f38a6", + "24c37fbf.0780f", + "9893b8d2.7016f8", + "320bee92.b28692", + "bbe36c7f.834ce", + "8450ac72.a6ffe", + "2361b6a0.550aba", + "3832691b.944b76", + "38ea87d.d0fea78", + "878792.b509187", + "bfa803e4.9c9d5", + "b656aebd.2a962", + "62741dc6.9f6564", + "f70642e.d81d4c", + "ed4187ae.8c9468", + "8e49c0c7.84eb3", + "f1bd41f.de5a0c", + "cd883182.ab7d", + "ccabc2bd.56b01", + "fb4ecf8f.0cfea", + "a988246.e1abcd8", + "7f5d2095.048d", + "edcb1551.a2e428", + "1abc1fc5.56324", + "25500f6b.4a337", + "708247b5.c2c728", + "4fcdad71.18ebe4" ] ] }, { - "id":"89ae09fa.b55dc8", + "id":"b1c7a6a5.9defc8", "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":587.6669006347656, - "y":2225.2146220207214, - "z":"1213c43c.2b234c", + "x":447.6669464111328, + "y":2405.214709043503, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"9a047ca3.43842", + "id":"69ac42e1.e4d65c", "type":"set", "name":"set output to api handler", "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments":"", - "x":616.4208145141602, - "y":2189.3371682167053, - "z":"1213c43c.2b234c", + "x":476.42086029052734, + "y":2369.3372552394867, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"60d77360.0d0b1c", + "id":"2361b6a0.550aba", "type":"set", "name":"set allotted-resource-oper-status", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments":"", - "x":646.7541885375977, - "y":796.7180624008179, - "z":"1213c43c.2b234c", + "x":501.7542037963867, + "y":716.7180643081665, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"55ae20df.fc8b9", + "id":"aed16d9f.f38a6", "type":"set", "name":"set tmp.ar.self-link", "xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n", "comments":"", - "x":602.7380332946777, - "y":389.9999876022339, - "z":"1213c43c.2b234c", + "x":457.7380485534668, + "y":309.9999895095825, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"d311ed47.69e1d", + "id":"39cc3f5d.10819", "type":"set", "name":"set tmp.ar.allotted-resource-id,etc", "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments":"", - "x":649.9972953796387, - "y":356.2592535018921, - "z":"1213c43c.2b234c", + "x":504.99731063842773, + "y":276.2592554092407, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"1acbd514.a1254b", + "id":"24c37fbf.0780f", "type":"execute", "name":"execute Properties", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n", "comments":"", "outputs":1, - "x":608.9933891296387, - "y":425.8981866836548, - "z":"1213c43c.2b234c", + "x":459.99342346191406, + "y":345.89820289611816, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -170,32 +175,32 @@ ] }, { - "id":"ddfe771b.c87dd8", + "id":"320bee92.b28692", "type":"execute", "name":"execute RestApiCallNode - Get AR by id", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments":"", "outputs":1, - "x":671.5187225341797, - "y":587.1261539459229, - "z":"1213c43c.2b234c", + "x":526.5187377929688, + "y":507.1261558532715, + "z":"7bef9372.a9efdc", "wires":[ [ - "ec9853b.e3a8bb", - "58aa3152.ce73e" + "986dd975.a11b18", + "6fb21962.e12b08" ] ] }, { - "id":"8c2cd18b.e8d76", + "id":"9893b8d2.7016f8", "type":"execute", "name":"generate allotted-resource url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments":"", "outputs":1, - "x":637.0648231506348, - "y":485.6838912963867, - "z":"1213c43c.2b234c", + "x":492.0648384094238, + "y":405.68389320373535, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -203,307 +208,307 @@ ] }, { - "id":"ec9853b.e3a8bb", + "id":"986dd975.a11b18", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":928.8148612976074, - "y":585.9339144229889, - "z":"1213c43c.2b234c", + "x":783.8148765563965, + "y":505.9339163303375, + "z":"7bef9372.a9efdc", "wires":[ [ - "c2add8c3.e31ee8" + "9c66d6d7.fd60d8" ] ] }, { - "id":"83a795f7.2396f8", + "id":"bbe36c7f.834ce", "type":"execute", "name":"execute RestApiCallNode - PUT AR by id", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments":"", "outputs":1, - "x":679.5292816162109, - "y":940.100793838501, - "z":"1213c43c.2b234c", + "x":524.5293121337891, + "y":843.4342184066772, + "z":"7bef9372.a9efdc", "wires":[ [ - "d53ba2b2.4949a", - "c75a2aee.7c7e38", - "cfb46e43.3d1c1" + "c63722bb.9ab6f", + "cb190783.fa1958", + "ea1ec053.16697" ] ] }, { - "id":"d53ba2b2.4949a", + "id":"c63722bb.9ab6f", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":947.8373222351074, - "y":1001.0991134643555, - "z":"1213c43c.2b234c", + "x":832.8373527526855, + "y":847.7658462524414, + "z":"7bef9372.a9efdc", "wires":[ [ - "3676f0e6.efdff" + "f487696.3fa4098" ] ] }, { - "id":"c75a2aee.7c7e38", + "id":"cb190783.fa1958", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":940.8373489379883, - "y":961.5990203842521, - "z":"1213c43c.2b234c", + "x":825.8373794555664, + "y":808.265753172338, + "z":"7bef9372.a9efdc", "wires":[ [ - "3676f0e6.efdff" + "f487696.3fa4098" ] ] }, { - "id":"cfb46e43.3d1c1", + "id":"ea1ec053.16697", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":944.5873870849609, - "y":931.9561252593994, - "z":"1213c43c.2b234c", + "x":829.5874176025391, + "y":778.6228580474854, + "z":"7bef9372.a9efdc", "wires":[ [ - "24baad99.05ac02" + "1f67dcbd.359013" ] ] }, { - "id":"3676f0e6.efdff", + "id":"f487696.3fa4098", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1110.587387084961, - "y":962.34904422611, - "z":"1213c43c.2b234c", + "x":995.5874176025391, + "y":809.0157770141959, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"c2add8c3.e31ee8", + "id":"9c66d6d7.fd60d8", "type":"block", "name":"block: atomic", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":1109.8148155212402, - "y":586.4338638782501, - "z":"1213c43c.2b234c", + "x":964.8148307800293, + "y":506.43386578559875, + "z":"7bef9372.a9efdc", "wires":[ [ - "6281b16a.56ebc", - "9fdaaaf9.7e4e18" + "d0782591.fde1d8", + "93e07a98.9095d8" ] ] }, { - "id":"6281b16a.56ebc", + "id":"d0782591.fde1d8", "type":"switchNode", "name":"switch tx length", "xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n", "comments":"", "outputs":1, - "x":1355.672061920166, - "y":620.7196271419525, - "z":"1213c43c.2b234c", + "x":1210.672077178955, + "y":540.7196290493011, + "z":"7bef9372.a9efdc", "wires":[ [ - "3c62713c.75fd9e" + "341aa40b.170f5c" ] ] }, { - "id":"3c62713c.75fd9e", + "id":"341aa40b.170f5c", "type":"other", "name":"outcome 1", "xml":"<outcome value='1'>\n", "comments":"", "outputs":1, - "x":1546.6720657348633, - "y":620.7196247577667, - "z":"1213c43c.2b234c", + "x":1401.6720809936523, + "y":540.7196266651154, + "z":"7bef9372.a9efdc", "wires":[ [ - "43730d98.9d5c24" + "442c58ec.bf8ed8" ] ] }, { - "id":"ad911155.ba691", + "id":"23b8c983.6faf26", "type":"set", "name":"set tx-ar from get", "xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n", "comments":"", - "x":1946.5292015075684, - "y":621.2910490036011, - "z":"1213c43c.2b234c", + "x":1801.5292167663574, + "y":541.2910509109497, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"43730d98.9d5c24", + "id":"442c58ec.bf8ed8", "type":"block", "name":"block: atomic", "xml":"<block atomic='true'>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1717.5290489196777, - "y":621.291093826294, - "z":"1213c43c.2b234c", + "x":1572.5290641784668, + "y":541.2910957336426, + "z":"7bef9372.a9efdc", "wires":[ [ - "ad911155.ba691", - "a06440e2.caca5", - "3d53634b.24490c" + "23b8c983.6faf26", + "11fbc01e.51de6", + "643f62c0.e6644c" ] ] }, { - "id":"a06440e2.caca5", + "id":"11fbc01e.51de6", "type":"set", "name":"set oper-status", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments":"", - "x":1944.5294456481934, - "y":688.7196130752563, - "z":"1213c43c.2b234c", + "x":1799.5294609069824, + "y":608.719614982605, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"7e8f0846.a53858", + "id":"979c0497.6764e8", "type":"comment", "name":"GET tunnelxconn-allotted-resource from mdsal", "info":"", "comments":"", - "x":696.8147850036621, - "y":550.4338548183441, - "z":"1213c43c.2b234c", + "x":551.8148002624512, + "y":470.43385672569275, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"3d53634b.24490c", + "id":"643f62c0.e6644c", "type":"switchNode", "name":"switch order-status", "xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments":"", "outputs":1, - "x":1954.529224395752, - "y":654.2910470962524, - "z":"1213c43c.2b234c", + "x":1809.529239654541, + "y":574.2910490036011, + "z":"7bef9372.a9efdc", "wires":[ [ - "5c815fc3.bd0b5", - "d3694d17.ea994" + "538f3b15.287974", + "f19583cb.5aa08" ] ] }, { - "id":"5c815fc3.bd0b5", + "id":"538f3b15.287974", "type":"outcome", "name":"outcome PendingCreate", "xml":"<outcome value='PendingCreate'>\n", "comments":"", "outputs":1, - "x":2166.129180908203, - "y":615.2910470962524, - "z":"1213c43c.2b234c", + "x":2021.1291961669922, + "y":535.2910490036011, + "z":"7bef9372.a9efdc", "wires":[ [ - "bda3fa8a.d4fd18" + "8fca37d0.fb1e08" ] ] }, { - "id":"d3694d17.ea994", + "id":"f19583cb.5aa08", "type":"outcome", "name":"outcome Other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":2191.8435554504395, - "y":650.7196378707886, - "z":"1213c43c.2b234c", + "x":2046.8435707092285, + "y":570.7196397781372, + "z":"7bef9372.a9efdc", "wires":[ [ - "bda3fa8a.d4fd18" + "8fca37d0.fb1e08" ] ] }, { - "id":"f64004fd.6126d8", + "id":"4d62a09e.e2147", "type":"comment", "name":"Set allotted-resource-identifiers", "info":"", "comments":"", - "x":652.3386077880859, - "y":641.0053081512451, - "z":"1213c43c.2b234c", + "x":507.338623046875, + "y":561.0053100585938, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"9fdaaaf9.7e4e18", + "id":"93e07a98.9095d8", "type":"set", "name":"save backup copy of mdsal-ar for rollback", "xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n", "comments":"", - "x":1435.3863945007324, - "y":586.4339559078217, - "z":"1213c43c.2b234c", + "x":1290.3864097595215, + "y":506.4339578151703, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"7dd5966e.d350a8", + "id":"103274a2.86396b", "type":"comment", "name":"Create urls for restapi", "info":"", "comments":"", - "x":607.9576301574707, - "y":455.29101848602295, - "z":"1213c43c.2b234c", + "x":462.95764541625977, + "y":375.2910203933716, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"24baad99.05ac02", + "id":"1f67dcbd.359013", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1086.2433547973633, - "y":928.1482944488525, - "z":"1213c43c.2b234c", + "x":971.2433853149414, + "y":774.8150272369385, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -511,28 +516,28 @@ ] }, { - "id":"8d8b45bf.b1aca8", + "id":"6351b35c.deaecc", "type":"comment", "name":"TO DO: vnf/put parent", "info":"", "comments":"", - "x":620.2433471679688, - "y":862.1482162475584, - "z":"1213c43c.2b234c", + "x":475.2433624267578, + "y":782.148218154907, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"ba77d55a.14d7b8", + "id":"8450ac72.a6ffe", "type":"execute", "name":"execute getTime", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments":"", "outputs":1, - "x":594.243350982666, - "y":758.1482172012329, - "z":"1213c43c.2b234c", + "x":449.2433662414551, + "y":678.1482191085815, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -540,32 +545,32 @@ ] }, { - "id":"58aa3152.ce73e", + "id":"6fb21962.e12b08", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":928.5766563415527, - "y":622.1480872631073, - "z":"1213c43c.2b234c", + "x":783.5766716003418, + "y":542.1480891704559, + "z":"7bef9372.a9efdc", "wires":[ [ - "d1a0b9e4.751918" + "9291fcc2.8c1d9" ] ] }, { - "id":"d1a0b9e4.751918", + "id":"9291fcc2.8c1d9", "type":"block", "name":"block: atomic", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":1108.5766067504883, - "y":622.8146378993988, - "z":"1213c43c.2b234c", + "x":963.5766220092773, + "y":542.8146398067474, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -573,29 +578,29 @@ ] }, { - "id":"4aacb3a2.ee73cc", + "id":"3832691b.944b76", "type":"set", "name":"set id", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />", "comments":"", - "x":577.2433929443359, - "y":677.8148288726807, - "z":"1213c43c.2b234c", + "x":424.2434196472168, + "y":599.8148612976074, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"bda3fa8a.d4fd18", + "id":"8fca37d0.fb1e08", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":2380.599697113037, - "y":616.6666812896729, - "z":"1213c43c.2b234c", + "x":2235.599712371826, + "y":536.6666831970215, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -603,95 +608,95 @@ ] }, { - "id":"6c7d53f3.fcddcc", + "id":"b656aebd.2a962", "type":"execute", "name":"execute RestApiCallNode - setup vgMUX-vG vxlan tunnel port", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":726.8331298828125, - "y":1378.1186933517456, - "z":"1213c43c.2b234c", + "x":586.8331756591797, + "y":1558.118780374527, + "z":"7bef9372.a9efdc", "wires":[ [ - "50e484ba.b86eec", - "5ed00d06.0d5ea4", - "83b3850c.d649c8" + "16285e24.067ef2", + "b6f443.c4b94bc", + "40ec4b4d.f4f564" ] ] }, { - "id":"50e484ba.b86eec", + "id":"16285e24.067ef2", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1091.1412506103516, - "y":1420.4503320679069, - "z":"1213c43c.2b234c", + "x":951.1412963867188, + "y":1600.4504190906882, + "z":"7bef9372.a9efdc", "wires":[ [ - "e150607d.ca938" + "9d48f75.a38c408" ] ] }, { - "id":"5ed00d06.0d5ea4", + "id":"b6f443.c4b94bc", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1082.141300201416, - "y":1388.9503578171134, - "z":"1213c43c.2b234c", + "x":942.1413459777832, + "y":1568.9504448398948, + "z":"7bef9372.a9efdc", "wires":[ [ - "e150607d.ca938" + "9d48f75.a38c408" ] ] }, { - "id":"83b3850c.d649c8", + "id":"40ec4b4d.f4f564", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1085.8913383483887, - "y":1359.3074626922607, - "z":"1213c43c.2b234c", + "x":945.8913841247559, + "y":1539.3075497150421, + "z":"7bef9372.a9efdc", "wires":[ [ - "3b236fc1.ae6cc" + "52614f1a.d930b" ] ] }, { - "id":"e150607d.ca938", + "id":"9d48f75.a38c408", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1251.8913383483887, - "y":1389.7003816589713, - "z":"1213c43c.2b234c", + "x":1111.8913841247559, + "y":1569.7004686817527, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"3b236fc1.ae6cc", + "id":"52614f1a.d930b", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1227.547306060791, - "y":1355.4996318817139, - "z":"1213c43c.2b234c", + "x":1087.5473518371582, + "y":1535.4997189044952, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -699,28 +704,28 @@ ] }, { - "id":"3ddd0b30.9a33e4", + "id":"878792.b509187", "type":"set", "name":"set vgMUX-vG VXLAN Tunnel Port Props", "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` \" />", "comments":"", - "x":671.9443054199219, - "y":1222.1191806793213, - "z":"1213c43c.2b234c", + "x":521.9443664550781, + "y":1450.452689409256, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"9e5a94b9.112208", + "id":"bfa803e4.9c9d5", "type":"execute", "name":"generate full vgMUX-vG vpp-honeycomb url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n", "comments":"", "outputs":1, - "x":675.9443054199219, - "y":1288.785394668579, - "z":"1213c43c.2b234c", + "x":525.9443664550781, + "y":1517.1189033985138, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -728,15 +733,15 @@ ] }, { - "id":"f2d67a4f.b5fbd8", + "id":"38ea87d.d0fea78", "type":"execute", "name":"generate honeycomb-url to vgMUX", - "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`\"/>\n", + "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip`\"/>\n", "comments":"", "outputs":1, - "x":655.2776031494141, - "y":1160.4521827697754, - "z":"1213c43c.2b234c", + "x":505.2776641845703, + "y":1388.78569149971, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -744,95 +749,95 @@ ] }, { - "id":"5ed77e12.ca895", + "id":"62741dc6.9f6564", "type":"execute", "name":"execute RestApiCallNode - setup vgMUX-vBRG vxlan tunnel xconnect", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`\" />\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":742.5000610351562, - "y":1795.6668500900269, - "z":"1213c43c.2b234c", + "x":602.5001068115234, + "y":1975.6669371128082, + "z":"7bef9372.a9efdc", "wires":[ [ - "b5e29f6d.056ee", - "86688c55.1f6a6", - "a86c1446.f356e8" + "a53d2b91.3b52c8", + "aed6109b.e3125", + "8b7f778b.fd0698" ] ] }, { - "id":"b5e29f6d.056ee", + "id":"a53d2b91.3b52c8", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1072.808141708374, - "y":1833.9983853325248, - "z":"1213c43c.2b234c", + "x":932.8081874847412, + "y":2013.9984723553061, + "z":"7bef9372.a9efdc", "wires":[ [ - "9b462d6d.1ea05" + "ae37a231.12e05" ] ] }, { - "id":"86688c55.1f6a6", + "id":"aed6109b.e3125", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1063.8081912994385, - "y":1802.4984110817313, - "z":"1213c43c.2b234c", + "x":923.8082370758057, + "y":1982.4984981045127, + "z":"7bef9372.a9efdc", "wires":[ [ - "9b462d6d.1ea05" + "ae37a231.12e05" ] ] }, { - "id":"a86c1446.f356e8", + "id":"8b7f778b.fd0698", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1067.5582294464111, - "y":1772.8555159568787, - "z":"1213c43c.2b234c", + "x":927.5582752227783, + "y":1952.85560297966, + "z":"7bef9372.a9efdc", "wires":[ [ - "6632191e.74a508" + "514e5d21.41baa4" ] ] }, { - "id":"9b462d6d.1ea05", + "id":"ae37a231.12e05", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1233.5582294464111, - "y":1803.2484349235892, - "z":"1213c43c.2b234c", + "x":1093.5582752227783, + "y":1983.2485219463706, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"6632191e.74a508", + "id":"514e5d21.41baa4", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1209.2141971588135, - "y":1769.0476851463318, - "z":"1213c43c.2b234c", + "x":1069.2142429351807, + "y":1949.0477721691132, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -840,121 +845,121 @@ ] }, { - "id":"58a8145.b4b65ec", + "id":"f70642e.d81d4c", "type":"set", "name":"set vgMUX to vG and vgMUX to vBRG VXLAN Tunnel Name", - "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n", + "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip` \" />\n", "comments":"", - "x":734.0000762939453, - "y":1066.0000352859497, - "z":"1213c43c.2b234c", + "x":579.0001068115234, + "y":1034.3334589004517, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"5dffc587.4020dc", + "id":"ed4187ae.8c9468", "type":"set", "name":"set vgMUX-vBRG VXLAN Tunnel Port Props", "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vBRG-name` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` \" />", "comments":"", - "x":674.0000610351562, - "y":1476.0000438690186, - "z":"1213c43c.2b234c", + "x":534.0001068115234, + "y":1656.0001308918, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"b5d6eac2.9b2138", + "id":"f1bd41f.de5a0c", "type":"execute", "name":"execute RestApiCallNode - setup vgMUX-vBRG vxlan tunnel port", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":726.0000305175781, - "y":1636.0000467300415, - "z":"1213c43c.2b234c", + "x":586.0000762939453, + "y":1816.0001337528229, + "z":"7bef9372.a9efdc", "wires":[ [ - "8dcf7f73.7a233", - "e17a27f6.d0d318", - "5d9263e8.e7d86c" + "7b994f6e.2ccea", + "2a62706f.9761e", + "c6bfd5ec.9a61f8" ] ] }, { - "id":"8dcf7f73.7a233", + "id":"7b994f6e.2ccea", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1092.308120727539, - "y":1618.3316387161613, - "z":"1213c43c.2b234c", + "x":952.3081665039062, + "y":1798.3317257389426, + "z":"7bef9372.a9efdc", "wires":[ [ - "e1ae12b9.d71f6" + "61f4e388.7636dc" ] ] }, { - "id":"e17a27f6.d0d318", + "id":"2a62706f.9761e", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1083.3081703186035, - "y":1586.8316644653678, - "z":"1213c43c.2b234c", + "x":943.3082160949707, + "y":1766.8317514881492, + "z":"7bef9372.a9efdc", "wires":[ [ - "e1ae12b9.d71f6" + "61f4e388.7636dc" ] ] }, { - "id":"5d9263e8.e7d86c", + "id":"c6bfd5ec.9a61f8", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1087.0582084655762, - "y":1557.1887693405151, - "z":"1213c43c.2b234c", + "x":947.0582542419434, + "y":1737.1888563632965, + "z":"7bef9372.a9efdc", "wires":[ [ - "a5fdf540.7d0928" + "5f252d74.f8afc4" ] ] }, { - "id":"e1ae12b9.d71f6", + "id":"61f4e388.7636dc", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1253.0582084655762, - "y":1587.5816883072257, - "z":"1213c43c.2b234c", + "x":1113.0582542419434, + "y":1767.581775330007, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"a5fdf540.7d0928", + "id":"5f252d74.f8afc4", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1228.7141761779785, - "y":1553.3809385299683, - "z":"1213c43c.2b234c", + "x":1088.7142219543457, + "y":1733.3810255527496, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -962,15 +967,15 @@ ] }, { - "id":"be1a85fd.d9b228", + "id":"8e49c0c7.84eb3", "type":"execute", "name":"generate full vgMUX-vBRG vpp-honeycomb url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n", "comments":"", "outputs":1, - "x":678, - "y":1528, - "z":"1213c43c.2b234c", + "x":538.0000457763672, + "y":1708.0000870227814, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -978,28 +983,28 @@ ] }, { - "id":"8ddeb7ba.6380c8", + "id":"ccabc2bd.56b01", "type":"set", "name":"set vgMUX-vBG xconnect url", "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />", "comments":"", - "x":612.0000190734863, - "y":1864.0000562667847, - "z":"1213c43c.2b234c", + "x":472.0000648498535, + "y":2044.000143289566, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"d69c7a00.1f6db8", + "id":"fb4ecf8f.0cfea", "type":"execute", "name":"generate full vgMUX-vG xconnect url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n", "comments":"", "outputs":1, - "x":639.9999694824219, - "y":1926.0000591278076, - "z":"1213c43c.2b234c", + "x":500.00001525878906, + "y":2106.000146150589, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -1007,121 +1012,121 @@ ] }, { - "id":"5964855c.5ef3ac", + "id":"a988246.e1abcd8", "type":"set", "name":"set xconnect Tunnel target", "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vBRG-name` \" />\n", "comments":"", - "x":608.0000152587891, - "y":1994.0000610351562, - "z":"1213c43c.2b234c", + "x":468.00006103515625, + "y":2174.0001480579376, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"b3164bc6.a02478", + "id":"cd883182.ab7d", "type":"set", "name":"set xconnect Tunnel target", "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />\n", "comments":"", - "x":600.0000686645508, - "y":1700.0000467300415, - "z":"1213c43c.2b234c", + "x":460.00011444091797, + "y":1880.0001337528229, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"aac1998d.738588", + "id":"7f5d2095.048d", "type":"execute", "name":"execute RestApiCallNode - setup vgMUX-vG vxlan tunnel xconnect", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`\" />\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":736.0000305175781, - "y":2082.000062942505, - "z":"1213c43c.2b234c", + "x":596.0000762939453, + "y":2262.0001499652863, + "z":"7bef9372.a9efdc", "wires":[ [ - "fffe79dd.0a7a98", - "715907d9.f67948", - "185c9679.0223ea" + "c9538bd0.5eae78", + "57a7b895.527208", + "3235e33c.e3918c" ] ] }, { - "id":"fffe79dd.0a7a98", + "id":"c9538bd0.5eae78", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1066.308111190796, - "y":2120.331598185003, - "z":"1213c43c.2b234c", + "x":926.3081569671631, + "y":2300.331685207784, + "z":"7bef9372.a9efdc", "wires":[ [ - "e4ec6e86.1b29a" + "543e5918.7ccf08" ] ] }, { - "id":"715907d9.f67948", + "id":"57a7b895.527208", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1057.3081607818604, - "y":2088.8316239342093, - "z":"1213c43c.2b234c", + "x":917.3082065582275, + "y":2268.8317109569907, + "z":"7bef9372.a9efdc", "wires":[ [ - "e4ec6e86.1b29a" + "543e5918.7ccf08" ] ] }, { - "id":"185c9679.0223ea", + "id":"3235e33c.e3918c", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1061.058198928833, - "y":2059.1887288093567, - "z":"1213c43c.2b234c", + "x":921.0582447052002, + "y":2239.188815832138, + "z":"7bef9372.a9efdc", "wires":[ [ - "5daaf322.24f75c" + "aa697d34.f0df2" ] ] }, { - "id":"e4ec6e86.1b29a", + "id":"543e5918.7ccf08", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1225.0582695007324, - "y":2089.58176612854, - "z":"1213c43c.2b234c", + "x":1085.0583152770996, + "y":2269.5818531513214, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"5daaf322.24f75c", + "id":"aa697d34.f0df2", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1202.7141666412354, - "y":2055.38089799881, - "z":"1213c43c.2b234c", + "x":1062.7142124176025, + "y":2235.380985021591, + "z":"7bef9372.a9efdc", "wires":[ [ @@ -1129,29 +1134,135 @@ ] }, { - "id":"595457bf.28e8c8", + "id":"c757be35.33e12", "type":"comment", - "name":"TO DO: get brg-wan-ip from dmaap", + "name":"Get vgmux-mgmt-ip", "info":"", "comments":"", - "x":655.0000228881836, - "y":1010.0000448226929, - "z":"1213c43c.2b234c", + "x":269.33341217041016, + "y":1082.6669282913208, + "z":"7bef9372.a9efdc", "wires":[ ] }, { - "id":"765cd931.933bf8", - "type":"comment", - "name":"TO DO: get onap-oam ip - workaround over write vgmux-bearer with onap-oam ip", - "info":"", + "id":"708247b5.c2c728", + "type":"get-resource", + "name":"get-resource IPADDR from dmaap DHCP_MAP ", + "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key=\"SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address\" pfx=\"tmp.brg-wan-ip\" >\n", + "comments":"", + "outputs":1, + "x":540, + "y":923.3333129882812, + "z":"7bef9372.a9efdc", + "wires":[ + [ + + ] + ] + }, + { + "id":"4fcdad71.18ebe4", + "type":"set", + "name":"set tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip", + "xml":"<set>\n<parameter name='tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />\n", "comments":"", - "x":796.0000305175781, - "y":1116.000036239624, - "z":"1213c43c.2b234c", + "x":706.1428833007812, + "y":979.2498970031738, + "z":"7bef9372.a9efdc", "wires":[ ] + }, + { + "id":"1abc1fc5.56324", + "type":"call", + "name":"call GENERIC-RESOURCE-API:get-vnf-api-parent-instance", + "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >\n\n", + "comments":"", + "outputs":1, + "x":575.0000610351562, + "y":1234.9999103546143, + "z":"7bef9372.a9efdc", + "wires":[ + [ + + ] + ] + }, + { + "id":"edcb1551.a2e428", + "type":"set", + "name":"set tmp.search.parent-service-instance-id to find vgmux-mgmt-ip", + "xml":"<set>\n<parameter name='tmp.search.parent-service-instance-id' value='`$tmp.ar.parent-service-instance-id`' />\n", + "comments":"", + "x":587.6667175292969, + "y":1169.9999370574951, + "z":"7bef9372.a9efdc", + "wires":[ + + ] + }, + { + "id":"9a7e693a.047c88", + "type":"set", + "name":"set vgmux-mgmt-ip", + "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip' value='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`' />\n", + "comments":"", + "x":1331.6664733886719, + "y":1296.6667757034302, + "z":"7bef9372.a9efdc", + "wires":[ + + ] + }, + { + "id":"25500f6b.4a337", + "type":"for", + "name":"for vnf-parameters in parent-service-instance", + "xml":"<for index='paramidx' start='0' end='`$parent-service-instance.vnf-topology-information.vnf-parameters_length`' >\n\n\n", + "comments":"", + "outputs":1, + "x":531.666618347168, + "y":1301.6664390563965, + "z":"7bef9372.a9efdc", + "wires":[ + [ + "789239db.cf8fb8" + ] + ] + }, + { + "id":"789239db.cf8fb8", + "type":"switchNode", + "name":"switch parameter matches vgmux_private_ip_1", + "xml":"<switch test='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == vgmux_private_ip_1`'>\n\n\n", + "comments":"", + "outputs":1, + "x":903.0000991821289, + "y":1300.6664428710938, + "z":"7bef9372.a9efdc", + "wires":[ + [ + "3b52b430.6fccec" + ] + ] + }, + { + "id":"3b52b430.6fccec", + "type":"success", + "name":"true", + "xml":"<outcome value='true'>\n", + "comments":"", + "outputs":1, + "x":1161.666446685791, + "y":1298.3331747055054, + "z":"7bef9372.a9efdc", + "wires":[ + [ + "9a7e693a.047c88" + ] + ] } ]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json index ddb5e8c9..6030e9ea 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json @@ -1,20 +1,20 @@ [ { - "id":"ea73139e.aa0d8", + "id":"825ca84c.445e48", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":169.99998474121094, - "y":139.99998474121094, - "z":"a8ee551c.260b18", + "x":128, + "y":116, + "z":"613ada42.e46534", "wires":[ [ - "a9eba997.befca8" + "cf18f6a3.a7c1d8" ] ] }, { - "id":"a9eba997.befca8", + "id":"cf18f6a3.a7c1d8", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,143 +22,148 @@ "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":266.23806381225586, - "y":200.9523754119873, - "z":"a8ee551c.260b18", + "x":224.23807907104492, + "y":176.95239067077637, + "z":"613ada42.e46534", "wires":[ [ - "b47043f8.57df9" + "6f43722e.e1375c" ] ] }, { - "id":"b47043f8.57df9", + "id":"6f43722e.e1375c", "type":"method", "name":"tunnelxconn-topology-operation-delete", "xml":"<method rpc='tunnelxconn-topology-operation-delete' mode='sync'>\n", "comments":"", "outputs":1, - "x":312.154842376709, - "y":236.19043064117432, - "z":"a8ee551c.260b18", + "x":270.15485763549805, + "y":212.19044589996338, + "z":"613ada42.e46534", "wires":[ [ - "40b778a9.840de8" + "9223e1d9.9d3d5" ] ] }, { - "id":"40b778a9.840de8", + "id":"9223e1d9.9d3d5", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":220.47617721557617, - "y":379.5237727165222, - "z":"a8ee551c.260b18", + "x":156.47621154785156, + "y":1191.523856163025, + "z":"613ada42.e46534", "wires":[ [ - "600ff80a.8e8918", - "a0e819d7.762748", - "8c7ac12e.10e65", - "2818a1dd.dc391e", - "40e08035.d84a1", - "47849254.832adc", - "4fad0ac6.b44224", - "5f3b0feb.4717", - "157cd0d2.981cff", - "34221afc.d56f56", - "5bd0792d.9a7738", - "88f9c974.152668", - "aced1738.f21668", - "9bfc16d5.7453a8", - "7935a8ba.39dbf8", - "106179bd.fb0526", - "3cf8239f.21b10c", - "6a325db2.8fa5c4", - "e4d50255.70c72", - "e6105de7.7a399", - "d18a9318.5f525" + "57095392.42df9c", + "928254df.b8f1b8", + "78ce1588.233b4c", + "b1b79d47.5b712", + "bcbc27ec.51c808", + "14dcb243.87919e", + "f375d1a2.57ce", + "f6543328.c0463", + "4fa81b0c.d25c04", + "e12d04d1.e4c6f8", + "4b2a2744.b37d78", + "509b7252.07649c", + "67c6c537.098aac", + "ac80ef88.64417", + "d6a9b477.b43e58", + "3c1eab50.8ab6e4", + "a6c06bf0.9acdf8", + "fd3c881.1134678", + "eccfefb.8a8691", + "cadbc326.95747", + "d6edf81e.59db08", + "9e3a6d03.74879", + "ec194f5.ff3e8b", + "a35bc5f0.41f1a8", + "6017aedf.2d3db", + "6a140f25.dc1a2" ] ] }, { - "id":"a0e819d7.762748", + "id":"928254df.b8f1b8", "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":474.0001449584961, - "y":1813.5478219985962, - "z":"a8ee551c.260b18", + "x":432.0001564025879, + "y":2202.8811111450195, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"600ff80a.8e8918", + "id":"57095392.42df9c", "type":"set", "name":"set output to api handler", "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments":"", - "x":502.7540588378906, - "y":1777.67036819458, - "z":"a8ee551c.260b18", + "x":460.7540702819824, + "y":2167.0036573410034, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"157cd0d2.981cff", + "id":"4fa81b0c.d25c04", "type":"set", "name":"set allotted-resource-oper-status", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments":"", - "x":526.7542037963867, - "y":760.0513849258423, - "z":"a8ee551c.260b18", + "x":484.7542190551758, + "y":736.0514001846313, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"2818a1dd.dc391e", + "id":"b1b79d47.5b712", "type":"set", "name":"set tmp.ar.self-link", "xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n", "comments":"", - "x":482.7380485534668, - "y":353.3333101272583, - "z":"a8ee551c.260b18", + "x":440.73806381225586, + "y":329.33332538604736, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"8c7ac12e.10e65", + "id":"78ce1588.233b4c", "type":"set", "name":"set tmp.ar.allotted-resource-id,etc", "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments":"", - "x":529.9973106384277, - "y":319.5925760269165, - "z":"a8ee551c.260b18", + "x":487.9973258972168, + "y":295.59259128570557, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"40e08035.d84a1", + "id":"bcbc27ec.51c808", "type":"execute", "name":"execute Properties", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n", "comments":"", "outputs":1, - "x":488.99340438842773, - "y":389.2315092086792, - "z":"a8ee551c.260b18", + "x":446.9934196472168, + "y":365.23152446746826, + "z":"613ada42.e46534", "wires":[ [ @@ -166,32 +171,32 @@ ] }, { - "id":"4fad0ac6.b44224", + "id":"f375d1a2.57ce", "type":"execute", "name":"execute RestApiCallNode - Get AR by id", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments":"", "outputs":1, - "x":551.5187377929688, - "y":550.4594764709473, - "z":"a8ee551c.260b18", + "x":509.5187530517578, + "y":526.4594917297363, + "z":"613ada42.e46534", "wires":[ [ - "c606076d.0a5aa8", - "73ac4eb1.d24c9" + "f6518fb0.ce253", + "356ea1a.9b58a5e" ] ] }, { - "id":"47849254.832adc", + "id":"14dcb243.87919e", "type":"execute", "name":"generate allotted-resource url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments":"", "outputs":1, - "x":517.0648384094238, - "y":449.01721382141113, - "z":"a8ee551c.260b18", + "x":475.0648536682129, + "y":425.0172290802002, + "z":"613ada42.e46534", "wires":[ [ @@ -199,289 +204,289 @@ ] }, { - "id":"c606076d.0a5aa8", + "id":"f6518fb0.ce253", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":808.8148765563965, - "y":549.2672369480133, - "z":"a8ee551c.260b18", + "x":766.8148918151855, + "y":525.2672522068024, + "z":"613ada42.e46534", "wires":[ [ - "c40b39d8.bef118" + "629610f3.9604d" ] ] }, { - "id":"85caba1e.01c008", + "id":"b0337e65.8f372", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":829.8373146057129, - "y":956.4323171600699, - "z":"a8ee551c.260b18", + "x":787.837329864502, + "y":932.432332418859, + "z":"613ada42.e46534", "wires":[ [ - "a57c0f9c.f0931" + "840b1c1.394d0e" ] ] }, { - "id":"f372539f.904d8", + "id":"fc786288.11187", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":820.8373641967773, - "y":924.9323429092765, - "z":"a8ee551c.260b18", + "x":778.8373794555664, + "y":900.9323581680655, + "z":"613ada42.e46534", "wires":[ [ - "a57c0f9c.f0931" + "840b1c1.394d0e" ] ] }, { - "id":"5e15025b.c0d5dc", + "id":"2102e230.72a77e", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":824.58740234375, - "y":895.2894477844238, - "z":"a8ee551c.260b18", + "x":782.5874176025391, + "y":871.2894630432129, + "z":"613ada42.e46534", "wires":[ [ - "1b40917a.94ce1f" + "6f565745.8303b8" ] ] }, { - "id":"a57c0f9c.f0931", + "id":"840b1c1.394d0e", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":990.58740234375, - "y":925.6823667511344, - "z":"a8ee551c.260b18", + "x":948.5874176025391, + "y":901.6823820099235, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"c40b39d8.bef118", + "id":"629610f3.9604d", "type":"block", "name":"block: atomic", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":989.8148307800293, - "y":549.7671864032745, - "z":"a8ee551c.260b18", + "x":947.8148460388184, + "y":525.7672016620636, + "z":"613ada42.e46534", "wires":[ [ - "932cdb22.8bb3d8", - "c0595193.968e7" + "db6398fb.5393b8", + "5570421f.b1cd1c" ] ] }, { - "id":"932cdb22.8bb3d8", + "id":"db6398fb.5393b8", "type":"switchNode", "name":"switch tx length", "xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n", "comments":"", "outputs":1, - "x":1235.672077178955, - "y":584.0529496669769, - "z":"a8ee551c.260b18", + "x":1193.6720924377441, + "y":560.052964925766, + "z":"613ada42.e46534", "wires":[ [ - "71ef54d.59862ac" + "6fdf29e8.2e0f38" ] ] }, { - "id":"71ef54d.59862ac", + "id":"6fdf29e8.2e0f38", "type":"other", "name":"outcome 1", "xml":"<outcome value='1'>\n", "comments":"", "outputs":1, - "x":1426.6720809936523, - "y":584.0529472827911, - "z":"a8ee551c.260b18", + "x":1384.6720962524414, + "y":560.0529625415802, + "z":"613ada42.e46534", "wires":[ [ - "9f15e051.0c87e" + "a18ae609.19d3c8" ] ] }, { - "id":"ae393778.e6a318", + "id":"6f978da.693bf74", "type":"set", "name":"set tx-ar from get", "xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n", "comments":"", - "x":1826.5292167663574, - "y":584.6243715286255, - "z":"a8ee551c.260b18", + "x":1784.5292320251465, + "y":560.6243867874146, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"9f15e051.0c87e", + "id":"a18ae609.19d3c8", "type":"block", "name":"block: atomic", "xml":"<block atomic='true'>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1597.5290641784668, - "y":584.6244163513184, - "z":"a8ee551c.260b18", + "x":1555.5290794372559, + "y":560.6244316101074, + "z":"613ada42.e46534", "wires":[ [ - "ae393778.e6a318", - "1a495e95.266f41", - "b3aa54ab.591ac8" + "6f978da.693bf74", + "66b9fbd6.4d38a4", + "7b6d747a.efbadc" ] ] }, { - "id":"1a495e95.266f41", + "id":"66b9fbd6.4d38a4", "type":"set", "name":"set oper-status", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments":"", - "x":1824.5294609069824, - "y":652.0529356002808, - "z":"a8ee551c.260b18", + "x":1782.5294761657715, + "y":628.0529508590698, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"a8b0bc95.97326", + "id":"a62aafbc.fe6bb", "type":"comment", "name":"GET tunnelxconn-allotted-resource from mdsal", "info":"", "comments":"", - "x":576.8148002624512, - "y":513.7671773433685, - "z":"a8ee551c.260b18", + "x":534.8148155212402, + "y":489.7671926021576, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"b3aa54ab.591ac8", + "id":"7b6d747a.efbadc", "type":"switchNode", "name":"switch order-status", "xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments":"", "outputs":1, - "x":1834.529239654541, - "y":617.6243696212769, - "z":"a8ee551c.260b18", + "x":1792.52925491333, + "y":593.6243848800659, + "z":"613ada42.e46534", "wires":[ [ - "2210dcb8.30fd74", - "ac6b248b.9ba698" + "d5b999f8.8cb468", + "f4d4f6e9.cf0858" ] ] }, { - "id":"2210dcb8.30fd74", + "id":"d5b999f8.8cb468", "type":"outcome", "name":"outcome Created", "xml":"<outcome value='Created'>\n", "comments":"", "outputs":1, - "x":2046.1291961669922, - "y":578.6243696212769, - "z":"a8ee551c.260b18", + "x":2004.1292114257812, + "y":554.6243848800659, + "z":"613ada42.e46534", "wires":[ [ - "2245c8d2.97a6a8" + "48576b51.340d84" ] ] }, { - "id":"ac6b248b.9ba698", + "id":"f4d4f6e9.cf0858", "type":"outcome", "name":"outcome Other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":2071.8435707092285, - "y":614.052960395813, - "z":"a8ee551c.260b18", + "x":2029.8435859680176, + "y":590.052975654602, + "z":"613ada42.e46534", "wires":[ [ - "2245c8d2.97a6a8" + "48576b51.340d84" ] ] }, { - "id":"b5a69050.e528d", + "id":"83b8f4eb.666af8", "type":"comment", "name":"Set allotted-resource-identifiers", "info":"", "comments":"", - "x":532.338623046875, - "y":604.3386306762695, - "z":"a8ee551c.260b18", + "x":490.33863830566406, + "y":580.3386459350586, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"c0595193.968e7", + "id":"5570421f.b1cd1c", "type":"set", "name":"save backup copy of mdsal-ar for rollback", "xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n", "comments":"", - "x":1315.3864097595215, - "y":549.7672784328461, - "z":"a8ee551c.260b18", + "x":1273.3864250183105, + "y":525.7672936916351, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"95c7c8f7.2ba9f8", + "id":"26dce256.9f5d0e", "type":"comment", "name":"Create urls for restapi", "info":"", "comments":"", - "x":487.95764541625977, - "y":418.62434101104736, - "z":"a8ee551c.260b18", + "x":445.9576606750488, + "y":394.6243562698364, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"1b40917a.94ce1f", + "id":"6f565745.8303b8", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":966.2433700561523, - "y":891.481616973877, - "z":"a8ee551c.260b18", + "x":924.2433853149414, + "y":867.481632232666, + "z":"613ada42.e46534", "wires":[ [ @@ -489,28 +494,28 @@ ] }, { - "id":"11fbb95a.26adc7", + "id":"fcabb34d.45a2a", "type":"comment", "name":"TO DO: vnf/put parent", "info":"", "comments":"", - "x":500.2433624267578, - "y":825.4815387725828, - "z":"a8ee551c.260b18", + "x":458.2433776855469, + "y":801.4815540313718, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"5f3b0feb.4717", + "id":"f6543328.c0463", "type":"execute", "name":"execute getTime", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments":"", "outputs":1, - "x":474.2433662414551, - "y":721.4815397262573, - "z":"a8ee551c.260b18", + "x":432.24338150024414, + "y":697.4815549850464, + "z":"613ada42.e46534", "wires":[ [ @@ -518,32 +523,32 @@ ] }, { - "id":"73ac4eb1.d24c9", + "id":"356ea1a.9b58a5e", "type":"other", "name":"other", "xml":"<outcome value='Other'>\n", "comments":"", "outputs":1, - "x":808.5766716003418, - "y":585.4814097881317, - "z":"a8ee551c.260b18", + "x":766.5766868591309, + "y":561.4814250469208, + "z":"613ada42.e46534", "wires":[ [ - "251543e7.8a7e7c" + "413a7bac.d6ab24" ] ] }, { - "id":"251543e7.8a7e7c", + "id":"413a7bac.d6ab24", "type":"block", "name":"block: atomic", "xml":"<block atomic=\"true\">\n", "atomic":"false", "comments":"", "outputs":1, - "x":988.5766220092773, - "y":586.1479604244232, - "z":"a8ee551c.260b18", + "x":946.5766372680664, + "y":562.1479756832123, + "z":"613ada42.e46534", "wires":[ [ @@ -551,29 +556,29 @@ ] }, { - "id":"34221afc.d56f56", + "id":"e12d04d1.e4c6f8", "type":"set", "name":"set id", "xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />", "comments":"", - "x":457.243408203125, - "y":641.1481513977051, - "z":"a8ee551c.260b18", + "x":415.24342346191406, + "y":617.1481666564941, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"2245c8d2.97a6a8", + "id":"48576b51.340d84", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":2260.599712371826, - "y":580.0000038146973, - "z":"a8ee551c.260b18", + "x":2218.5997276306152, + "y":556.0000190734863, + "z":"613ada42.e46534", "wires":[ [ @@ -581,126 +586,126 @@ ] }, { - "id":"5bd0792d.9a7738", + "id":"4b2a2744.b37d78", "type":"execute", "name":"execute RestApiCallNode - PUT AR by id", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments":"", "outputs":1, - "x":557, - "y":906.0000095367432, - "z":"a8ee551c.260b18", + "x":515.0000152587891, + "y":882.0000247955322, + "z":"613ada42.e46534", "wires":[ [ - "5e15025b.c0d5dc", - "f372539f.904d8", - "85caba1e.01c008" + "2102e230.72a77e", + "fc786288.11187", + "b0337e65.8f372" ] ] }, { - "id":"88f9c974.152668", + "id":"509b7252.07649c", "type":"set", "name":"clear tx-ar-assignments", "xml":"<set>\n<parameter name='tx-ar-assignments.' value=\"\" />\n\n\n\n", "comments":"", - "x":500.99998474121094, - "y":791.9999847412109, - "z":"a8ee551c.260b18", + "x":459, + "y":768, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"d18a9318.5f525", + "id":"d6edf81e.59db08", "type":"execute", "name":"execute RestApiCallNode - delete vgMUX to vG vxlan tunnel port", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":635.6668434143066, - "y":1719.9998292922974, - "z":"a8ee551c.260b18", + "x":593.6668548583984, + "y":2109.3331184387207, + "z":"613ada42.e46534", "wires":[ [ - "4303ed2.181d014", - "88cc7753.8d23c8", - "7e6dedf7.4245a4" + "5a2ca87c.542c08", + "ab819131.dd45", + "63ff344a.e380fc" ] ] }, { - "id":"4303ed2.181d014", + "id":"5a2ca87c.542c08", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1204.641429901123, - "y":1759.9982160553336, - "z":"a8ee551c.260b18", + "x":1162.6414413452148, + "y":2149.331505201757, + "z":"613ada42.e46534", "wires":[ [ - "9296d8d2.051ff8" + "f6c1b57a.e80c28" ] ] }, { - "id":"88cc7753.8d23c8", + "id":"ab819131.dd45", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1195.6414794921875, - "y":1728.4982418045402, - "z":"a8ee551c.260b18", + "x":1153.6414909362793, + "y":2117.8315309509635, + "z":"613ada42.e46534", "wires":[ [ - "9296d8d2.051ff8" + "f6c1b57a.e80c28" ] ] }, { - "id":"7e6dedf7.4245a4", + "id":"63ff344a.e380fc", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1199.3915176391602, - "y":1698.8553466796875, - "z":"a8ee551c.260b18", + "x":1157.391529083252, + "y":2088.188635826111, + "z":"613ada42.e46534", "wires":[ [ - "d92543a7.9c0ee" + "14140cfc.718ec3" ] ] }, { - "id":"9296d8d2.051ff8", + "id":"f6c1b57a.e80c28", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1365.3915176391602, - "y":1729.248265646398, - "z":"a8ee551c.260b18", + "x":1323.391529083252, + "y":2118.5815547928214, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"d92543a7.9c0ee", + "id":"14140cfc.718ec3", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1341.0474853515625, - "y":1695.0475158691406, - "z":"a8ee551c.260b18", + "x":1299.0474967956543, + "y":2084.380805015564, + "z":"613ada42.e46534", "wires":[ [ @@ -708,15 +713,15 @@ ] }, { - "id":"7935a8ba.39dbf8", + "id":"d6a9b477.b43e58", "type":"execute", "name":"generate full vgMUX-vG vpp-honeycomb url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-vgMUX-vG-name`\"/>\n", "comments":"", "outputs":1, - "x":563.1111030578613, - "y":1228.3335027694702, - "z":"a8ee551c.260b18", + "x":521.1111145019531, + "y":1617.6667919158936, + "z":"613ada42.e46534", "wires":[ [ @@ -724,15 +729,15 @@ ] }, { - "id":"aced1738.f21668", + "id":"67c6c537.098aac", "type":"execute", "name":"generate honeycomb-url to vgMUX", - "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`\"/>\n", + "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip`\"/>\n", "comments":"", "outputs":1, - "x":536.7778472900391, - "y":1052.3334283828735, - "z":"a8ee551c.260b18", + "x":486.7778778076172, + "y":1328.333438873291, + "z":"613ada42.e46534", "wires":[ [ @@ -740,95 +745,95 @@ ] }, { - "id":"106179bd.fb0526", + "id":"3c1eab50.8ab6e4", "type":"execute", "name":"execute RestApiCallNode - delete vG-vgMUX xconnect", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":599.6669960021973, - "y":1307.5482215881348, - "z":"a8ee551c.260b18", + "x":557.6670074462891, + "y":1696.881510734558, + "z":"613ada42.e46534", "wires":[ [ - "9817b85e.c00968", - "5426f591.bca7bc", - "7997cf81.75ec9" + "133ecf83.ed702", + "2da75da5.50c6e2", + "f90f3fc7.0dbc5" ] ] }, { - "id":"9817b85e.c00968", + "id":"133ecf83.ed702", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1208.3083686828613, - "y":1287.546325109899, - "z":"a8ee551c.260b18", + "x":1166.3083801269531, + "y":1676.8796142563224, + "z":"613ada42.e46534", "wires":[ [ - "4f542247.1b24dc" + "7f5777a.bc39688" ] ] }, { - "id":"5426f591.bca7bc", + "id":"2da75da5.50c6e2", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1199.3084182739258, - "y":1256.0463508591056, - "z":"a8ee551c.260b18", + "x":1157.3084297180176, + "y":1645.379640005529, + "z":"613ada42.e46534", "wires":[ [ - "4f542247.1b24dc" + "7f5777a.bc39688" ] ] }, { - "id":"7997cf81.75ec9", + "id":"f90f3fc7.0dbc5", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1203.0584564208984, - "y":1226.403455734253, - "z":"a8ee551c.260b18", + "x":1161.0584678649902, + "y":1615.7367448806763, + "z":"613ada42.e46534", "wires":[ [ - "dddf27f3.7e4fd8" + "9aa4cd15.2e381" ] ] }, { - "id":"4f542247.1b24dc", + "id":"7f5777a.bc39688", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1369.0584564208984, - "y":1256.7963747009635, - "z":"a8ee551c.260b18", + "x":1327.0584678649902, + "y":1646.1296638473868, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"dddf27f3.7e4fd8", + "id":"9aa4cd15.2e381", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1344.7144241333008, - "y":1222.595624923706, - "z":"a8ee551c.260b18", + "x":1302.7144355773926, + "y":1611.9289140701294, + "z":"613ada42.e46534", "wires":[ [ @@ -836,95 +841,95 @@ ] }, { - "id":"e4d50255.70c72", + "id":"eccfefb.8a8691", "type":"execute", "name":"execute RestApiCallNode - delete vgMUX to vBRG vxlan tunnel port", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":640.6666793823242, - "y":1556.6667127609253, - "z":"a8ee551c.260b18", + "x":598.666690826416, + "y":1946.0000019073486, + "z":"613ada42.e46534", "wires":[ [ - "8d08617d.8adad", - "62e37b80.0165a4", - "d4f24bfb.487518" + "4db8b84d.b2ecd8", + "ac063462.f4ca28", + "5e7c8c01.42d984" ] ] }, { - "id":"8d08617d.8adad", + "id":"4db8b84d.b2ecd8", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1207.9746589660645, - "y":1606.664863012731, - "z":"a8ee551c.260b18", + "x":1165.9746704101562, + "y":1995.9981521591544, + "z":"613ada42.e46534", "wires":[ [ - "fd96ad61.cd8bb" + "66bd1389.36824c" ] ] }, { - "id":"62e37b80.0165a4", + "id":"ac063462.f4ca28", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1198.974708557129, - "y":1575.1648887619376, - "z":"a8ee551c.260b18", + "x":1156.9747200012207, + "y":1964.498177908361, + "z":"613ada42.e46534", "wires":[ [ - "fd96ad61.cd8bb" + "66bd1389.36824c" ] ] }, { - "id":"d4f24bfb.487518", + "id":"5e7c8c01.42d984", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1202.7247467041016, - "y":1545.521993637085, - "z":"a8ee551c.260b18", + "x":1160.7247581481934, + "y":1934.8552827835083, + "z":"613ada42.e46534", "wires":[ [ - "fcd34256.847db" + "dae96ea2.d0433" ] ] }, { - "id":"fd96ad61.cd8bb", + "id":"66bd1389.36824c", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1368.7247467041016, - "y":1575.9149126037955, - "z":"a8ee551c.260b18", + "x":1326.7247581481934, + "y":1965.2482017502189, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"fcd34256.847db", + "id":"dae96ea2.d0433", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1344.380714416504, - "y":1541.714162826538, - "z":"a8ee551c.260b18", + "x":1302.3807258605957, + "y":1931.0474519729614, + "z":"613ada42.e46534", "wires":[ [ @@ -932,108 +937,108 @@ ] }, { - "id":"9bfc16d5.7453a8", + "id":"ac80ef88.64417", "type":"set", "name":"set vgMUX to vG and vgMUX to vBRG VXLAN Tunnel Name", - "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n", + "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip` \" />\n", "comments":"", - "x":617.3333129882812, - "y":1168.333236694336, - "z":"a8ee551c.260b18", + "x":571.3333129882812, + "y":1552.3332386016846, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"6a325db2.8fa5c4", + "id":"fd3c881.1134678", "type":"execute", "name":"execute RestApiCallNode - delete vBRG-vgMUX xconnect", "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n", "comments":"", "outputs":1, - "x":610.6666641235352, - "y":1459.9998760223389, - "z":"a8ee551c.260b18", + "x":568.666675567627, + "y":1849.3331651687622, + "z":"613ada42.e46534", "wires":[ [ - "15eae1c3.0d7d3e", - "6321faa9.57d8c4", - "a8ff52e4.8de23" + "66d058c6.066908", + "8879fdd0.457de", + "82ba2dc0.22ad1" ] ] }, { - "id":"a8ff52e4.8de23", + "id":"82ba2dc0.22ad1", "type":"not-found", "name":"not-found", "xml":"<outcome value='not-found'>\n", "comments":"", "outputs":1, - "x":1202.3333778381348, - "y":1453.3332767486572, - "z":"a8ee551c.260b18", + "x":1160.3333892822266, + "y":1842.6665658950806, + "z":"613ada42.e46534", "wires":[ [ - "4de064c3.4a5bec" + "700450a1.c41fd" ] ] }, { - "id":"6321faa9.57d8c4", + "id":"8879fdd0.457de", "type":"failure", "name":"failure", "xml":"<outcome value='failure'>\n", "comments":"", "outputs":1, - "x":1193.3334274291992, - "y":1421.8333024978638, - "z":"a8ee551c.260b18", + "x":1151.333438873291, + "y":1811.166591644287, + "z":"613ada42.e46534", "wires":[ [ - "4de064c3.4a5bec" + "700450a1.c41fd" ] ] }, { - "id":"15eae1c3.0d7d3e", + "id":"66d058c6.066908", "type":"success", "name":"success", "xml":"<outcome value='success'>\n", "comments":"", "outputs":1, - "x":1195.4169578552246, - "y":1383.857172012329, - "z":"a8ee551c.260b18", + "x":1153.4169692993164, + "y":1773.1904611587524, + "z":"613ada42.e46534", "wires":[ [ - "9ac5b12d.70f0f" + "2e7fb96e.6c49e6" ] ] }, { - "id":"4de064c3.4a5bec", + "id":"700450a1.c41fd", "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=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n", "comments":"", - "x":1363.0834655761719, - "y":1422.5833263397217, - "z":"a8ee551c.260b18", + "x":1321.0834770202637, + "y":1811.916615486145, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"9ac5b12d.70f0f", + "id":"2e7fb96e.6c49e6", "type":"block", "name":"block", "xml":"<block>\n", "atomic":"false", "comments":"", "outputs":1, - "x":1338.7394332885742, - "y":1388.3825765624642, - "z":"a8ee551c.260b18", + "x":1296.739444732666, + "y":1777.7158657088876, + "z":"613ada42.e46534", "wires":[ [ @@ -1041,15 +1046,15 @@ ] }, { - "id":"3cf8239f.21b10c", + "id":"a6c06bf0.9acdf8", "type":"execute", "name":"generate full vgMUX-vBRG vpp-honeycomb url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-vgMUX-vBRG-name`\"/>\n", "comments":"", "outputs":1, - "x":574, - "y":1378.3332443237305, - "z":"a8ee551c.260b18", + "x":532.0000114440918, + "y":1767.6665334701538, + "z":"613ada42.e46534", "wires":[ [ @@ -1057,15 +1062,15 @@ ] }, { - "id":"e6105de7.7a399", + "id":"cadbc326.95747", "type":"execute", "name":"generate full vgMUX-vG vpp-honeycomb url", "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-vgMUX-vG-name`\"/>\n", "comments":"", "outputs":1, - "x":565.6666488647461, - "y":1644.9999618530273, - "z":"a8ee551c.260b18", + "x":523.6666603088379, + "y":2034.3332509994507, + "z":"613ada42.e46534", "wires":[ [ @@ -1073,27 +1078,146 @@ ] }, { - "id":"8f2371ec.110dd", + "id":"6017aedf.2d3db", + "type":"get-resource", + "name":"get-resource IPADDR from dmaap DHCP_MAP ", + "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key=\"SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address\" pfx=\"tmp.brg-wan-ip\" >\n", + "comments":"", + "outputs":1, + "x":529.5001373291016, + "y":1428.0001401901245, + "z":"613ada42.e46534", + "wires":[ + [ + + ] + ] + }, + { + "id":"6a140f25.dc1a2", + "type":"set", + "name":"set tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip", + "xml":"<set>\n<parameter name='tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />\n", + "comments":"", + "x":694.1428833007812, + "y":1479.9166345596313, + "z":"613ada42.e46534", + "wires":[ + + ] + }, + { + "id":"ef15c78a.710b88", "type":"comment", - "name":"TO DO: get brg-wan-ip from dmaap", + "name":"Get vgmux-mgmt-ip", "info":"", "comments":"", - "x":530.0000610351562, - "y":1110.0000324249268, - "z":"a8ee551c.260b18", + "x":271.0000114440918, + "y":1009.5001254081726, + "z":"613ada42.e46534", "wires":[ ] }, { - "id":"81a5da98.f08d38", + "id":"ec194f5.ff3e8b", + "type":"call", + "name":"call GENERIC-RESOURCE-API:get-vnf-api-parent-instance", + "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >\n\n", + "comments":"", + "outputs":1, + "x":572.666633605957, + "y":1125.8331098556519, + "z":"613ada42.e46534", + "wires":[ + [ + + ] + ] + }, + { + "id":"9e3a6d03.74879", + "type":"set", + "name":"set tmp.search.parent-service-instance-id to find vgmux-mgmt-ip", + "xml":"<set>\n<parameter name='tmp.search.parent-service-instance-id' value='`$tmp.ar.parent-service-instance-id`' />\n", + "comments":"", + "x":585.3332901000977, + "y":1060.8331365585327, + "z":"613ada42.e46534", + "wires":[ + + ] + }, + { + "id":"3ac2ce1c.2c1862", + "type":"set", + "name":"set vgmux-mgmt-ip", + "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip' value='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`' />\n", + "comments":"", + "x":1329.3330459594727, + "y":1187.4999752044678, + "z":"613ada42.e46534", + "wires":[ + + ] + }, + { + "id":"a35bc5f0.41f1a8", + "type":"for", + "name":"for vnf-parameters in parent-service-instance", + "xml":"<for index='paramidx' start='0' end='`$parent-service-instance.vnf-topology-information.vnf-parameters_length`' >\n\n\n", + "comments":"", + "outputs":1, + "x":529.3331909179688, + "y":1192.499638557434, + "z":"613ada42.e46534", + "wires":[ + [ + "cce1cb0f.707e78" + ] + ] + }, + { + "id":"cce1cb0f.707e78", + "type":"switchNode", + "name":"switch parameter matches vgmux_private_ip_1", + "xml":"<switch test='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == vgmux_private_ip_1`'>\n\n\n", + "comments":"", + "outputs":1, + "x":900.6666717529297, + "y":1191.4996423721313, + "z":"613ada42.e46534", + "wires":[ + [ + "9d32fcca.bd388" + ] + ] + }, + { + "id":"9d32fcca.bd388", + "type":"success", + "name":"true", + "xml":"<outcome value='true'>\n", + "comments":"", + "outputs":1, + "x":1159.3330192565918, + "y":1189.166374206543, + "z":"613ada42.e46534", + "wires":[ + [ + "3ac2ce1c.2c1862" + ] + ] + }, + { + "id":"d65683ee.c2f16", "type":"comment", - "name":"TO DO: get onap-oam ip - workaround over write vgmux-bearerr with onap-oam ip", + "name":"Get brg-wan-ip", "info":"", "comments":"", - "x":668.0000152587891, - "y":1002.0001277923584, - "z":"a8ee551c.260b18", + "x":264.0000190734863, + "y":1384.00004196167, + "z":"613ada42.e46534", "wires":[ ] 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 8fb1451e..c5d3c594 100644 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -21,6 +21,7 @@ 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-tunnelxconn-ar ${project.version} sync +GENERIC-RESOURCE-API get-vnf-api-parent-instance ${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_get-vnf-api-parent-instance.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml new file mode 100644 index 00000000..d03a1c30 --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml @@ -0,0 +1,28 @@ +<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> + <method rpc='get-vnf-api-parent-instance' mode='sync'> + <block atomic="true"> + <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs' pfx='tmp.vnfdata' ></get-resource> + <for index='vnfidx' start='0' end='`$tmp.vnfdata.vnfs.vnf-list_length`' > + <switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.search.parent-service-instance-id`'> + <outcome value='true'> + <block> + <set> + <parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' /> + </set> + <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' > + <outcome value='failure'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" + value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" /> + </return> + </outcome> + </get-resource> + </block> + </outcome> + </switch> + </for> + </block> + </method> +</service-logic>
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml index bc93bea0..64ae95e8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml @@ -105,15 +105,32 @@ </return>
</outcome>
</execute>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key="SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address" pfx="tmp.brg-wan-ip" ></get-resource>
+ <set>
+ <parameter name='tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />
+ </set>
<set>
<parameter name='tmp.tunnel-vgMUX-vG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
- <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` " />
+ <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip` " />
+ </set>
+ <set>
+ <parameter name='tmp.search.parent-service-instance-id' value='`$tmp.ar.parent-service-instance-id`' />
</set>
+ <call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' ></call>
+ <for index='paramidx' start='0' end='`$parent-service-instance.vnf-topology-information.vnf-parameters_length`' >
+ <switch test='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == vgmux_private_ip_1`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip' value='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.honeycomb.url`"/>
<parameter name="outputPath" value="tmp.honeycomb.url"/>
<parameter name="target" value="{honeycomb-instance-ip}"/>
- <parameter name="replacement" value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`"/>
+ <parameter name="replacement" value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip`"/>
</execute>
<set>
<parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vG-name` " />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml index 8dbd34e1..d70fb608 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml @@ -108,15 +108,32 @@ </return>
</outcome>
</execute>
+ <set>
+ <parameter name='tmp.search.parent-service-instance-id' value='`$tmp.ar.parent-service-instance-id`' />
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' ></call>
+ <for index='paramidx' start='0' end='`$parent-service-instance.vnf-topology-information.vnf-parameters_length`' >
+ <switch test='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == vgmux_private_ip_1`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip' value='`$parent-service-instance.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.honeycomb.url`"/>
<parameter name="outputPath" value="tmp.honeycomb.url"/>
<parameter name="target" value="{honeycomb-instance-ip}"/>
- <parameter name="replacement" value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`"/>
+ <parameter name="replacement" value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-mgmt-ip`"/>
</execute>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key="SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address" pfx="tmp.brg-wan-ip" ></get-resource>
+ <set>
+ <parameter name='tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />
+ </set>
<set>
<parameter name='tmp.tunnel-vgMUX-vG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
- <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` " />
+ <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vbrg-wan-ip` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.restapi.vpp-honeycomb`"/>
|