Update brg activate and tunnelxconn create DGs

This update adds RestApiCallNode calls to tunnelxconn
create DG to configure xconnect for vCPE VNFs
and fixes order of vxlan tunnel create on brg activate
DG and tunnelxconn create DG. It also converts
tabs to spaces in brg-allotted-resource.json
and tunnelxconn-allotted-resource.json.

Issue-Id: SDNC-164
Change-Id: I72c70762df7f778ab9a8aca2040f5c424eb4dc0d
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Former-commit-id: 90aab828a230896fa60398c3f66f6fee57c73be5

1 files changed, 267 insertions, 25 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
index ff283bb4..3c40e1d3 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
@@ -77,7 +77,12 @@
         "aa97b18b.1226d",
         "ca99974a.a9c178",
         "d3a78d9e.83f7f",
-        "cdf3b3de.27f5e"
+        "cdf3b3de.27f5e",
+        "33ab2b01.6cab74",
+        "4de82e6d.f68d1",
+        "39a8ddb.60b2222",
+        "b7b31c06.60266",
+        "a21afe27.1472c"
       ]
     ]
   },
@@ -87,8 +92,8 @@
     "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":450.33348846435547,
-    "y":1410.8813753128052,
+    "x":447.0001220703125,
+    "y":1739.2145948410034,
     "z":"87a856d9.9ec508",
     "wires":[
 
@@ -100,8 +105,8 @@
     "name":"set output to api handler",
     "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments":"",
-    "x":479.08740234375,
-    "y":1375.003921508789,
+    "x":475.75403594970703,
+    "y":1703.3371410369873,
     "z":"87a856d9.9ec508",
     "wires":[
 
@@ -660,12 +665,12 @@
   {
     "id":"f965b29a.1efa5",
     "type":"execute",
-    "name":"execute RestApiCallNode - setup BRG 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.brg.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",
+    "name":"execute RestApiCallNode - setup BRG to vgMux 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":578.3332977294922,
-    "y":1116.6665744781494,
+    "x":606.6666564941406,
+    "y":1121.6666297912598,
     "z":"87a856d9.9ec508",
     "wires":[
       [
@@ -757,11 +762,11 @@
     "id":"16a55bb0.8c20f4",
     "type":"execute",
     "name":"execute RestApiCallNode - setup BRG vxlan bridge domain",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.vpp-bridge-domain.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",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.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":598.3334350585938,
-    "y":1276.6667137145996,
+    "x":588.3334197998047,
+    "y":1268.3334243297577,
     "z":"87a856d9.9ec508",
     "wires":[
       [
@@ -852,11 +857,11 @@
   {
     "id":"d3a78d9e.83f7f",
     "type":"set",
-    "name":"set BRG VXLAN Tunnel Port Props",
-    "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-id` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+    "name":"set BRG to vgMUX VXLAN Tunnel Port Props",
+    "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
     "comments":"",
-    "x":509.44446563720703,
-    "y":986.6668643951416,
+    "x":542.7778015136719,
+    "y":986.6668891906738,
     "z":"87a856d9.9ec508",
     "wires":[
 
@@ -865,12 +870,12 @@
   {
     "id":"ca99974a.a9c178",
     "type":"execute",
-    "name":"generate brg-vpp-honeycomb url",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-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",
+    "name":"generate full brg-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":502.77777099609375,
-    "y":1043.3333501815796,
+    "x":514.4444427490234,
+    "y":1041.6666679382324,
     "z":"87a856d9.9ec508",
     "wires":[
       [
@@ -881,12 +886,12 @@
   {
     "id":"aa97b18b.1226d",
     "type":"execute",
-    "name":"generate honeycomb-url",
+    "name":"generate honeycomb-url to vBRG",
     "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=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":476.11109924316406,
-    "y":933.3332643508911,
+    "x":504.4444122314453,
+    "y":933.3332271575928,
     "z":"87a856d9.9ec508",
     "wires":[
       [
@@ -900,11 +905,248 @@
     "name":"set BRG Bridge Domain Props",
     "xml":"<set>\n<parameter name='tmp.bridge-domain' value=\"bridge-domain-10\" />\n<parameter name='tmp.split-horizon-group' value=\"2\" />",
     "comments":"",
-    "x":502.7777557373047,
-    "y":1196.666582584381,
+    "x":497.7777557373047,
+    "y":1193.3332996368408,
     "z":"87a856d9.9ec508",
     "wires":[
 
     ]
+  },
+  {
+    "id":"b7b31c06.60266",
+    "type":"execute",
+    "name":"execute RestApiCallNode - setup vgMux to BRG 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":605.1625823974609,
+    "y":1510.2343139648438,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "aba59524.bc77c8",
+        "e1789de0.06c8d",
+        "f925fc50.89e98"
+      ]
+    ]
+  },
+  {
+    "id":"aba59524.bc77c8",
+    "type":"not-found",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":977.1372489929199,
+    "y":1564.8991645798087,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "59180579.1119ac"
+      ]
+    ]
+  },
+  {
+    "id":"e1789de0.06c8d",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":968.1372985839844,
+    "y":1533.3991903290153,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "59180579.1119ac"
+      ]
+    ]
+  },
+  {
+    "id":"f925fc50.89e98",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":971.887336730957,
+    "y":1503.7562952041626,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "997a6286.bc8a6"
+      ]
+    ]
+  },
+  {
+    "id":"59180579.1119ac",
+    "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 brg-allotted-resource\" />\n",
+    "comments":"",
+    "x":1137.887336730957,
+    "y":1534.1492141708732,
+    "z":"87a856d9.9ec508",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"997a6286.bc8a6",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1113.5433044433594,
+    "y":1499.9484643936157,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"4de82e6d.f68d1",
+    "type":"set",
+    "name":"set vgMUX to BRG VXLAN Tunnel Port Props",
+    "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+    "comments":"",
+    "x":546.273681640625,
+    "y":1391.9011373519897,
+    "z":"87a856d9.9ec508",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"39a8ddb.60b2222",
+    "type":"execute",
+    "name":"generate full vgMUX-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":529.6070098876953,
+    "y":1450.2342700958252,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"33ab2b01.6cab74",
+    "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=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip`\"/>\n",
+    "comments":"",
+    "outputs":1,
+    "x":516.2736663818359,
+    "y":1336.900857925415,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"a21afe27.1472c",
+    "type":"execute",
+    "name":"execute RestApiCallNode - setup vgMUX to BRG 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":623.3333129882812,
+    "y":1609.9998779296875,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "9f350be0.c73188",
+        "b487c24.98b254",
+        "b0b52d79.1d3db"
+      ]
+    ]
+  },
+  {
+    "id":"9f350be0.c73188",
+    "type":"not-found",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":974.3080177307129,
+    "y":1690.6647199615836,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "6d663e66.14fad"
+      ]
+    ]
+  },
+  {
+    "id":"b487c24.98b254",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":965.3080673217773,
+    "y":1659.1647457107902,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "6d663e66.14fad"
+      ]
+    ]
+  },
+  {
+    "id":"b0b52d79.1d3db",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":969.05810546875,
+    "y":1629.5218505859375,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+        "c9430c21.30428"
+      ]
+    ]
+  },
+  {
+    "id":"6d663e66.14fad",
+    "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 brg-allotted-resource\" />\n",
+    "comments":"",
+    "x":1135.05810546875,
+    "y":1659.914769552648,
+    "z":"87a856d9.9ec508",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"c9430c21.30428",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1110.7140731811523,
+    "y":1625.7140197753906,
+    "z":"87a856d9.9ec508",
+    "wires":[
+      [
+
+      ]
+    ]
   }
 ]
\ No newline at end of file