From: Brian Freeman <bf1936@att.com>
Date: Sat, 2 Jun 2018 12:58:23 +0000 (-0500)
Subject: Fix for multi tunnelxconn
X-Git-Tag: v1.3.4^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=3f86c5791aacffd2c4d28ba1936b609fbf5e7361

Fix for multi tunnelxconn

Issue-ID: INT-517
Change-Id: Ib8b3508f0b2fece22437b09b9ced328522dd1561
Signed-off-by: Brian Freeman <bf1936@att.com>

Former-commit-id: 6507b4e0edbb287cbd7583a8ee4f1e565cb8ab82
---

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
index c08887c8..4732ab3f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
@@ -1 +1 @@
-[{"id":"c1453738.42a898","type":"dgstart","name":"DGSTART","outputs":1,"x":251,"y":162,"z":"3b92925f.163c6e","wires":[["d3e07181.eedbb8"]]},{"id":"d3e07181.eedbb8","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":347.2380790710449,"y":222.95239067077637,"z":"3b92925f.163c6e","wires":[["adbf57db.5116"]]},{"id":"adbf57db.5116","type":"method","name":"gw-vfmodule-update","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":231.15488815307617,"y":316.1904306411743,"z":"3b92925f.163c6e","wires":[["9a46a9fa.3aafa"]]},{"id":"9a46a9fa.3aafa","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":347.9999809265137,"y":416.0000009536743,"z":"3b92925f.163c6e","wires":[["2c968d51.0bd2e2","b741cf13.457da8","873df790.867b68","17c420b4.7c0eb7"]]},{"id":"b8b1c133.6f2e","type":"execute","name":"generate vnf service-info url - vnf-d","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url1`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url2\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id`\"/>\n\n","comments":"","outputs":1,"x":2107.2500610351562,"y":1586.0002136230469,"z":"3b92925f.163c6e","wires":[[]]},{"id":"20782ff0.3e5288","type":"execute","name":"execute RestApiCallNode - PUT service into service","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.services.vnf.vfmodule.templatefile`\" />\n   <!--\n   <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url3`' />\n   -->\n   <parameter name='restapiUrl' value='`$tmp.vf-module-object-path`' />\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-vfmodule-vgw\" />\n\n","comments":"","outputs":1,"x":1693.9999389648438,"y":2117.0001831054688,"z":"3b92925f.163c6e","wires":[["1f1c6bc6.f69f14"]]},{"id":"8dfc09cc.422228","type":"execute","name":"generate vnf service-info url - service-instance-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.service.vnf.vfmodule-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url1\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.service-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":2152.7500610351562,"y":1543.2502136230469,"z":"3b92925f.163c6e","wires":[[]]},{"id":"560eb9b1.1f1f7","type":"execute","name":"generate vnf service-info url - vf-module-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url2`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url3\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id`\"/>\n\n","comments":"","outputs":1,"x":2131.5000610351562,"y":1627.0002136230469,"z":"3b92925f.163c6e","wires":[[]]},{"id":"2fd02508.da9e42","type":"set","name":"set tmp.vgw.vg_mux_tunnel.vni","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\n<parameter name='tmp.service.vnf.vf-module.vg-lan-ip' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vg-ip`' />\n\n\n\n","comments":"","x":1685.2500610351562,"y":1704.5002136230469,"z":"3b92925f.163c6e","wires":[]},{"id":"9fc7771a.9c8f9","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.service.vnf.vf-module.vf-module-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />","comments":"","x":2147.75,"y":1384.0834045410156,"z":"3b92925f.163c6e","wires":[]},{"id":"eb138cbb.85dbe","type":"set","name":"set tmp.service-data.vnf-information.vnf-id","xml":"<set>\n<parameter name='tmp.service-data.vnf-information.vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n","comments":"","x":2114,"y":1344.0834045410156,"z":"3b92925f.163c6e","wires":[]},{"id":"dc872333.0afd98","type":"set","name":"set tmp.service-data.service-information.service-instance-id","xml":"<set>\n<parameter name='tmp.service-data.service-information.service-instance-id' value='6e34b9fb-9ec1-4c95-9e12-0326c434c623' />\n","comments":"","x":2162.7499389648438,"y":1289.083251953125,"z":"3b92925f.163c6e","wires":[]},{"id":"50b6bdad.79abd4","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\n","comments":"","x":1667.75,"y":1422.8333435058594,"z":"3b92925f.163c6e","wires":[]},{"id":"18ead3e8.6a792c","type":"execute","name":"execute Propertis gen-res-api-dg","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":1675.2498779296875,"y":1214.0834045410156,"z":"3b92925f.163c6e","wires":[[]]},{"id":"1f1c6bc6.f69f14","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1975.2499389648438,"y":2168.2501831054688,"z":"3b92925f.163c6e","wires":[["53fb6e2d.3ab58"]]},{"id":"53fb6e2d.3ab58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed on PUT vf-module parameters to MD0SAL' />\n","comments":"","x":2165.2499389648438,"y":2177.0001831054688,"z":"3b92925f.163c6e","wires":[]},{"id":"17c420b4.7c0eb7","type":"set","name":"set  consuming service-instance","xml":"<set>\n<!--\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":722.0000610351562,"y":428.08343505859375,"z":"3b92925f.163c6e","wires":[]},{"id":"daaeb9ef.8b4378","type":"get-resource","name":"get-resource vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\n","comments":"","outputs":1,"x":884.3055419921875,"y":759.7499694824219,"z":"3b92925f.163c6e","wires":[[]]},{"id":"1ece97b8.8a8b7","type":"for","name":"for tmp.vnfs","xml":"<for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\n\n\n","comments":"","outputs":1,"x":878.1944580078125,"y":861.9723510742188,"z":"3b92925f.163c6e","wires":[["fc6621e2.aa04c"]]},{"id":"48fed561.a74c4c","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\n\n\n","comments":"","outputs":1,"x":1166.1942749023438,"y":877.361083984375,"z":"3b92925f.163c6e","wires":[["359f934e.d31b64"]]},{"id":"359f934e.d31b64","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1324.91650390625,"y":1023.5,"z":"3b92925f.163c6e","wires":[["ba0967af.51efe"]]},{"id":"ba0967af.51efe","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1240,"y":1483.5,"z":"3b92925f.163c6e","wires":[["a67acd63.bafec8","18ead3e8.6a792c","50b6bdad.79abd4","e4b74198.b4a08","3fffba2f.87934e","fa44659.2bd9398","1b6c5025.a28cb","d503c7f6.04f208","2fd02508.da9e42","b45646b7.e1cbe"]]},{"id":"483a348f.22282c","type":"comment","name":"vnfidx ","info":"","comments":"","x":1486.2499389648438,"y":897.2500305175781,"z":"3b92925f.163c6e","wires":[]},{"id":"a67acd63.bafec8","type":"for","name":"for each vnf parameter copy to vf_module_parameter","xml":"<for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\n<!--\n\n     \"preload-data\": {\n          \"vnf-topology-information\": {\n            \"vnf-parameters\": [\n            \n            -->\n","comments":"","outputs":1,"x":1742.4999389648438,"y":1092.25,"z":"3b92925f.163c6e","wires":[["f753321a.6c2d1"]]},{"id":"237abfdc.8fde88","type":"set","name":"set name/values","xml":"<set>\n<parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\n<parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' />","comments":"","x":2247.6389770507812,"y":1161.9722595214844,"z":"3b92925f.163c6e","wires":[]},{"id":"2c968d51.0bd2e2","type":"get-resource","name":"get-resource tunnelxcon-allotted-resources","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \n         key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >\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":664.3635559082031,"y":528.8182067871094,"z":"3b92925f.163c6e","wires":[["11d74753.206f81"]]},{"id":"5ee10ee7.c6cf","type":"for","name":"for tmp.xconns.tunnelxconn-allotted-resoruces.tunnelxonn-alloted-resource[]","xml":"<for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n","comments":"","outputs":1,"x":1135.4544982910156,"y":551.9090576171875,"z":"3b92925f.163c6e","wires":[["240fab80.3e4614"]]},{"id":"c9248b80.346018","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1521,"y":683.7423706054688,"z":"3b92925f.163c6e","wires":[["e3a95b7d.6e3cc8"]]},{"id":"e3a95b7d.6e3cc8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1689.5,"y":754.060546875,"z":"3b92925f.163c6e","wires":[["e36cb24f.8f8238"]]},{"id":"da18c149.35236","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":2036.8182373046875,"y":868.5454711914062,"z":"3b92925f.163c6e","wires":[]},{"id":"b741cf13.457da8","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":584.8181762695312,"y":478.81817626953125,"z":"3b92925f.163c6e","wires":[]},{"id":"873df790.867b68","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":396.3636474609375,"y":587.3637084960938,"z":"3b92925f.163c6e","wires":[["56eeee6b.c37618","6aee2248.0c84ac"]]},{"id":"56eeee6b.c37618","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":419.090909090909,"y":669.1818181818181,"z":"3b92925f.163c6e","wires":[["98aba483.4d0d2"]]},{"id":"98aba483.4d0d2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":600.6747436523438,"y":857.293701171875,"z":"3b92925f.163c6e","wires":[["daaeb9ef.8b4378","1ece97b8.8a8b7"]]},{"id":"fc6621e2.aa04c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":956.666748046875,"y":912.1112060546875,"z":"3b92925f.163c6e","wires":[["48fed561.a74c4c","674d487f.eb7e1"]]},{"id":"240fab80.3e4614","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1290,"y":615.4444580078125,"z":"3b92925f.163c6e","wires":[["c9248b80.346018","ccce1d51.01276"]]},{"id":"f753321a.6c2d1","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2045.4166259765625,"y":1124.1944885253906,"z":"3b92925f.163c6e","wires":[["237abfdc.8fde88"]]},{"id":"11d74753.206f81","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":749.6666666666665,"y":579.2222222222222,"z":"3b92925f.163c6e","wires":[["5ee10ee7.c6cf"]]},{"id":"ccce1d51.01276","type":"set","name":"set txconns.tunnelxconn-allotted-resources.tunnelxconn-alloted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id","xml":"<set>\n<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />","comments":"","x":1392,"y":254,"z":"3b92925f.163c6e","wires":[]},{"id":"674d487f.eb7e1","type":"set","name":"set test3","xml":"<set>\n<parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\n<parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\n\n\n","comments":"","x":1118,"y":803,"z":"3b92925f.163c6e","wires":[]},{"id":"e4b74198.b4a08","type":"set","name":"set length of for  endLoop1","xml":"<set>\n<parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' />","comments":"","x":1656.25,"y":1018.5,"z":"3b92925f.163c6e","wires":[]},{"id":"3fffba2f.87934e","type":"set","name":"set vf-module-object-path","xml":"<set>\n<parameter name='tmp.vf-module-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $service-data.service-topology.service-topology-identifier.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \n + '/'`\"/>\n","comments":"","x":1592.5,"y":1483.5,"z":"3b92925f.163c6e","wires":[]},{"id":"fa44659.2bd9398","type":"set","name":"copy  vf-module-parameters","xml":"<set>\n<!--\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'\n\n                 service-data.vnfs.vnf\\[0\\].       vnf-data.vf-modules.vf-module\\[0\\]             .vf-module-data.vf-module-topology.vf-module-parameters.param.\n   value='$tmp.vfmodule.' />\n-->\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\n   value='$tmp.vfmodule.' />","comments":"","x":1630.0000610351562,"y":1889.2499389648438,"z":"3b92925f.163c6e","wires":[]},{"id":"78311370.3a2a8c","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />\n","comments":"","outputs":1,"x":1566.2500610351562,"y":1944.7499389648438,"z":"3b92925f.163c6e","wires":[[]]},{"id":"1b6c5025.a28cb","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1676.2501831054688,"y":1156,"z":"3b92925f.163c6e","wires":[]},{"id":"5b7de177.d6649","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1317.5,"y":1703.5,"z":"3b92925f.163c6e","wires":[]},{"id":"d503c7f6.04f208","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1665,"y":1803.5,"z":"3b92925f.163c6e","wires":[["aa9ad258.364768"]]},{"id":"c3b85a56.a27c6","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'>","comments":"","outputs":1,"x":2162.5,"y":1872.25,"z":"3b92925f.163c6e","wires":[["f9a8b460.0aebc8"]]},{"id":"f9a8b460.0aebc8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2480,"y":1899.75,"z":"3b92925f.163c6e","wires":[["5f636c63.51455c"]]},{"id":"5f636c63.51455c","type":"set","name":"set vni in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\n","comments":"","x":2692.5,"y":1937.25,"z":"3b92925f.163c6e","wires":[]},{"id":"b45646b7.e1cbe","type":"set","name":"set switch test string","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\n<parameter name='tmp.vg-lan-ip-match' value='vgw_private_ip_0' />\n\n\n\n\n","comments":"","x":1655,"y":1753.5,"z":"3b92925f.163c6e","wires":[]},{"id":"aa9ad258.364768","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1871.25,"y":1798.5,"z":"3b92925f.163c6e","wires":[["c3b85a56.a27c6","e00e9048.087e"]]},{"id":"5402a6e0.bb6a08","type":"set","name":"set to see tmpvfmodule.param[].name","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.test.param[$paramIdx].name' value='`$tmp.vfmodule.param[$paramIdx].name`' />\n\n\n\n","comments":"","x":2150.0000610351562,"y":1791,"z":"3b92925f.163c6e","wires":[]},{"id":"95928c0a.48109","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1662.4999084472656,"y":2043.5,"z":"3b92925f.163c6e","wires":[]},{"id":"f383d653.4e192","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2145,"y":1494.75,"z":"3b92925f.163c6e","wires":[]},{"id":"5b061076.f69d08","type":"set","name":"set MACADDRESS fa:16:3e:8f:ea:68 ","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n","comments":"","x":639,"y":380,"z":"3b92925f.163c6e","wires":[]},{"id":"12c5fa84.c32cbd","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n\n<!--\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n-->\n<!--\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n","comments":"","x":2179,"y":801,"z":"3b92925f.163c6e","wires":[]},{"id":"e36cb24f.8f8238","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1835,"y":784,"z":"3b92925f.163c6e","wires":[["da18c149.35236","12c5fa84.c32cbd","9353e1b2.a30a7"]]},{"id":"9353e1b2.a30a7","type":"set","name":"set MACADDRESS tmp.txconcs...brg-wan-mac-address","xml":"<set>\n<parameter name='tmp.brg-macaddress' \n      value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\n\n","comments":"","x":2153,"y":738,"z":"3b92925f.163c6e","wires":[]},{"id":"6aee2248.0c84ac","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":359,"y":828,"z":"3b92925f.163c6e","wires":[["a86b65a1.1c30c8"]]},{"id":"b0589543.c2b0f8","type":"returnFailure","name":"return failure Did not find vGW Preload","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Did not find vGW Preload' />\n","comments":"","x":617,"y":994,"z":"3b92925f.163c6e","wires":[]},{"id":"a86b65a1.1c30c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":371,"y":906,"z":"3b92925f.163c6e","wires":[["b0589543.c2b0f8"]]},{"id":"db862ccc.ab0a8","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.failure.log' />\n","comments":"","outputs":1,"x":567,"y":943,"z":"3b92925f.163c6e","wires":[[]]},{"id":"e00e9048.087e","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'>","comments":"","outputs":1,"x":2156,"y":1937,"z":"3b92925f.163c6e","wires":[["62e8c19f.5ebc3"]]},{"id":"62e8c19f.5ebc3","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2473.5,"y":1964.5,"z":"3b92925f.163c6e","wires":[["a833b7f7.da47"]]},{"id":"a833b7f7.da47","type":"set","name":"set lan-ip[ in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n","comments":"","x":2686,"y":2002,"z":"3b92925f.163c6e","wires":[]},{"id":"7226ef2a.8b2378","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1908,"y":1939,"z":"3b92925f.163c6e","wires":[]}]
+[{"id":"3806658c.26497a","type":"dgstart","name":"DGSTART","outputs":1,"x":147.88333129882812,"y":88.88333129882812,"z":"bc96058f.0be17","wires":[["45fcd240.2d898c"]]},{"id":"45fcd240.2d898c","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":244.12141036987305,"y":149.8357219696045,"z":"bc96058f.0be17","wires":[["40e26cd9.3c35a4"]]},{"id":"40e26cd9.3c35a4","type":"method","name":"gw-vfmodule-update","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":128.0382194519043,"y":243.07376194000244,"z":"bc96058f.0be17","wires":[["5bd01702.fa9438"]]},{"id":"5bd01702.fa9438","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":244.8833122253418,"y":342.88333225250244,"z":"bc96058f.0be17","wires":[["d48c04fa.2c4798","624df7c1.860c6","882c4631.3dd488","b22dc7b6.0678d"]]},{"id":"77492a71.217b24","type":"execute","name":"generate vnf service-info url - vnf-d","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url1`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url2\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id`\"/>\n\n","comments":"","outputs":1,"x":2004.1333923339844,"y":1512.883544921875,"z":"bc96058f.0be17","wires":[[]]},{"id":"9c97aad1.b5c07","type":"execute","name":"execute RestApiCallNode - PUT service into service","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.services.vnf.vfmodule.templatefile`\" />\n   <!--\n   <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url3`' />\n   -->\n   <parameter name='restapiUrl' value='`$tmp.vf-module-object-path`' />\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-vfmodule-vgw\" />\n\n","comments":"","outputs":1,"x":1590.8832702636719,"y":2043.8835144042969,"z":"bc96058f.0be17","wires":[["b5a49632.9fe928"]]},{"id":"5d685b37.cddc0c","type":"execute","name":"generate vnf service-info url - service-instance-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.service.vnf.vfmodule-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url1\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.service-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":2049.6333923339844,"y":1470.133544921875,"z":"bc96058f.0be17","wires":[[]]},{"id":"492fb368.715544","type":"execute","name":"generate vnf service-info url - vf-module-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url2`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url3\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id`\"/>\n\n","comments":"","outputs":1,"x":2028.3833923339844,"y":1553.883544921875,"z":"bc96058f.0be17","wires":[[]]},{"id":"52ea6240.b2f2dc","type":"set","name":"set tmp.vgw.vg_mux_tunnel.vni","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\n<parameter name='tmp.service.vnf.vf-module.vg-lan-ip' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vg-ip`' />\n\n\n\n","comments":"","x":1582.1333923339844,"y":1631.383544921875,"z":"bc96058f.0be17","wires":[]},{"id":"77b6a8fb.175e6","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.service.vnf.vf-module.vf-module-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />","comments":"","x":2044.6333312988281,"y":1310.9667358398438,"z":"bc96058f.0be17","wires":[]},{"id":"4601a28d.aedf2c","type":"set","name":"set tmp.service-data.vnf-information.vnf-id","xml":"<set>\n<parameter name='tmp.service-data.vnf-information.vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n","comments":"","x":2010.8833312988281,"y":1270.9667358398438,"z":"bc96058f.0be17","wires":[]},{"id":"5b7201c1.a4887","type":"set","name":"set tmp.service-data.service-information.service-instance-id","xml":"<set>\n<parameter name='tmp.service-data.service-information.service-instance-id' value='6e34b9fb-9ec1-4c95-9e12-0326c434c623' />\n","comments":"","x":2059.633270263672,"y":1215.9665832519531,"z":"bc96058f.0be17","wires":[]},{"id":"5bbba697.75684","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\n","comments":"","x":1564.6333312988281,"y":1349.7166748046875,"z":"bc96058f.0be17","wires":[]},{"id":"dfa8d8c7.ea1108","type":"execute","name":"execute Propertis gen-res-api-dg","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":1572.1332092285156,"y":1140.9667358398438,"z":"bc96058f.0be17","wires":[[]]},{"id":"b5a49632.9fe928","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1872.1332702636719,"y":2095.133514404297,"z":"bc96058f.0be17","wires":[["80ab6de6.18d81"]]},{"id":"80ab6de6.18d81","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed on PUT vf-module parameters to MD0SAL' />\n","comments":"","x":2062.133270263672,"y":2103.883514404297,"z":"bc96058f.0be17","wires":[]},{"id":"b22dc7b6.0678d","type":"set","name":"set  consuming service-instance","xml":"<set>\n<!--\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":512.8833923339844,"y":352.9667663574219,"z":"bc96058f.0be17","wires":[]},{"id":"237b9de9.473f7a","type":"get-resource","name":"get-resource vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\n","comments":"","outputs":1,"x":781.1888732910156,"y":686.63330078125,"z":"bc96058f.0be17","wires":[[]]},{"id":"dc53e24a.603c38","type":"for","name":"for tmp.vnfs","xml":"<for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\n\n\n","comments":"","outputs":1,"x":753.0777587890625,"y":773.855712890625,"z":"bc96058f.0be17","wires":[["4ae6c68e.7a2a08"]]},{"id":"acf3fd29.776b08","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\n\n\n","comments":"","outputs":1,"x":1063.0776062011719,"y":804.2444152832031,"z":"bc96058f.0be17","wires":[["f475d495.514cd"]]},{"id":"f475d495.514cd","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1221.7998352050781,"y":950.3833312988281,"z":"bc96058f.0be17","wires":[["de288eb6.69fc3"]]},{"id":"de288eb6.69fc3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1136.8833312988281,"y":1410.3833312988281,"z":"bc96058f.0be17","wires":[["a6b3e3e9.90a84","dfa8d8c7.ea1108","5bbba697.75684","d86083dc.da76d","a38f37f9.e78618","b822a12f.b44248","68a4fb65.a2c4c4","a19da93c.73dc5","52ea6240.b2f2dc","7c3272df.84a3ac"]]},{"id":"36f176a8.742e0a","type":"comment","name":"vnfidx ","info":"","comments":"","x":1383.1332702636719,"y":824.1333618164062,"z":"bc96058f.0be17","wires":[]},{"id":"a6b3e3e9.90a84","type":"for","name":"for each vnf parameter copy to vf_module_parameter","xml":"<for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\n<!--\n\n     \"preload-data\": {\n          \"vnf-topology-information\": {\n            \"vnf-parameters\": [\n            \n            -->\n","comments":"","outputs":1,"x":1639.3832702636719,"y":1019.1333312988281,"z":"bc96058f.0be17","wires":[["140e457f.d81f6b"]]},{"id":"a69e097b.7c0ed8","type":"set","name":"set name/values","xml":"<set>\n<parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\n<parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' />","comments":"","x":2144.5223083496094,"y":1088.8555908203125,"z":"bc96058f.0be17","wires":[]},{"id":"d48c04fa.2c4798","type":"get-resource","name":"get-resource tunnelxcon-allotted-resources","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \n         key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >\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":561.2468872070312,"y":455.7015380859375,"z":"bc96058f.0be17","wires":[["12acbf73.3ab131"]]},{"id":"5b0bb137.e67718","type":"for","name":"for tmp.xconns.tunnelxconn-allotted-resoruces.tunnelxonn-alloted-resource[]","xml":"<for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n","comments":"","outputs":1,"x":1032.3378295898438,"y":478.7923889160156,"z":"bc96058f.0be17","wires":[["34d79c6a.7822fc"]]},{"id":"e278c805.0d6108","type":"switchNode","name":"switch consuming-service-instance-id","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1417.8833312988281,"y":610.6257019042969,"z":"bc96058f.0be17","wires":[["f19bb37c.7732c8"]]},{"id":"f19bb37c.7732c8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1586.3833312988281,"y":680.9438781738281,"z":"bc96058f.0be17","wires":[["2ce4d935.c2c536"]]},{"id":"14ac448b.1e69bb","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":1933.70166015625,"y":835.4288330078125,"z":"bc96058f.0be17","wires":[]},{"id":"624df7c1.860c6","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":481.7015075683594,"y":405.7015075683594,"z":"bc96058f.0be17","wires":[]},{"id":"882c4631.3dd488","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":293.2469787597656,"y":514.2470397949219,"z":"bc96058f.0be17","wires":[["471004f2.b1042c","410482e7.5c2ae4"]]},{"id":"471004f2.b1042c","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":315.97424038973713,"y":596.0651494806463,"z":"bc96058f.0be17","wires":[["18c6a218.701ff6"]]},{"id":"18c6a218.701ff6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":497.5580749511719,"y":784.1770324707031,"z":"bc96058f.0be17","wires":[["237b9de9.473f7a","dc53e24a.603c38"]]},{"id":"4ae6c68e.7a2a08","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":853.5500793457031,"y":838.9945373535156,"z":"bc96058f.0be17","wires":[["acf3fd29.776b08","f1bf508c.bd629"]]},{"id":"34d79c6a.7822fc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1186.8833312988281,"y":542.3277893066406,"z":"bc96058f.0be17","wires":[["e278c805.0d6108","bb4386f8.ea48b8"]]},{"id":"140e457f.d81f6b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1942.2999572753906,"y":1051.0778198242188,"z":"bc96058f.0be17","wires":[["a69e097b.7c0ed8"]]},{"id":"12acbf73.3ab131","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":646.5499979654946,"y":506.1055535210503,"z":"bc96058f.0be17","wires":[["5b0bb137.e67718"]]},{"id":"bb4386f8.ea48b8","type":"set","name":"set test consuming service id tunnelxconn-allotted-resource-identifiers.consuming-service-instance-id","xml":"<set>\n<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<!--\nthis is null\n<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />\n-->","comments":"","x":1654.88330078125,"y":543.8832702636719,"z":"bc96058f.0be17","wires":[]},{"id":"f1bf508c.bd629","type":"set","name":"set test3","xml":"<set>\n<parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\n<parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\n\n\n","comments":"","x":1014.8833312988281,"y":729.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"d86083dc.da76d","type":"set","name":"set length of for  endLoop1","xml":"<set>\n<parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' />","comments":"","x":1553.1333312988281,"y":945.3833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"a38f37f9.e78618","type":"set","name":"set vf-module-object-path","xml":"<set>\n<parameter name='tmp.vf-module-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $service-data.service-topology.service-topology-identifier.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \n + '/'`\"/>\n","comments":"","x":1489.3833312988281,"y":1410.3833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"b822a12f.b44248","type":"set","name":"copy  vf-module-parameters","xml":"<set>\n<!--\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'\n\n                 service-data.vnfs.vnf\\[0\\].       vnf-data.vf-modules.vf-module\\[0\\]             .vf-module-data.vf-module-topology.vf-module-parameters.param.\n   value='$tmp.vfmodule.' />\n-->\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\n   value='$tmp.vfmodule.' />","comments":"","x":1526.8833923339844,"y":1816.1332702636719,"z":"bc96058f.0be17","wires":[]},{"id":"a429838.1a19f","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />\n","comments":"","outputs":1,"x":1463.1333923339844,"y":1871.6332702636719,"z":"bc96058f.0be17","wires":[[]]},{"id":"68a4fb65.a2c4c4","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1573.1335144042969,"y":1082.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"42e73536.d72f4c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1214.3833312988281,"y":1630.3833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"a19da93c.73dc5","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1561.8833312988281,"y":1730.3833312988281,"z":"bc96058f.0be17","wires":[["7d547fc4.1adf08"]]},{"id":"82836bf9.38d2b","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'>","comments":"","outputs":1,"x":2059.383331298828,"y":1799.1333312988281,"z":"bc96058f.0be17","wires":[["45b12bfc.a4b0c4"]]},{"id":"45b12bfc.a4b0c4","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2376.883331298828,"y":1826.6333312988281,"z":"bc96058f.0be17","wires":[["c13aaa81.4af1"]]},{"id":"c13aaa81.4af1","type":"set","name":"set vni in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-vgmux-tunnel-vni`' />\n\n<!--\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\n-->","comments":"","x":2589.383331298828,"y":1864.1333312988281,"z":"bc96058f.0be17","wires":[]},{"id":"7c3272df.84a3ac","type":"set","name":"set switch test string","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\n<parameter name='tmp.vg-lan-ip-match' value='vgw_private_ip_0' />\n\n\n\n\n","comments":"","x":1551.8833312988281,"y":1680.3833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"7d547fc4.1adf08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1768.1333312988281,"y":1725.3833312988281,"z":"bc96058f.0be17","wires":[["82836bf9.38d2b","3a91d5b1.ed18e2"]]},{"id":"93a3aef6.595498","type":"set","name":"set to see tmpvfmodule.param[].name","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.test.param[$paramIdx].name' value='`$tmp.vfmodule.param[$paramIdx].name`' />\n\n\n\n","comments":"","x":2046.8833923339844,"y":1717.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"32d9e6bc.6b7b1a","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1559.3832397460938,"y":1970.3833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"255c43c1.03152c","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2041.8833312988281,"y":1421.6333312988281,"z":"bc96058f.0be17","wires":[]},{"id":"d31c84e2.95ef98","type":"set","name":"set MACADDRESS fa:16:3e:8f:ea:68 ","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n","comments":"","x":538.88330078125,"y":253.88333129882812,"z":"bc96058f.0be17","wires":[]},{"id":"90adc253.a591d","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n\n<!--\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n-->\n<!--\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n","comments":"","x":2075.88330078125,"y":726.88330078125,"z":"bc96058f.0be17","wires":[]},{"id":"2ce4d935.c2c536","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1731.8833312988281,"y":710.8833312988281,"z":"bc96058f.0be17","wires":[["14ac448b.1e69bb","90adc253.a591d","c883d2d4.0b377","7e472b82.55e40c"]]},{"id":"c883d2d4.0b377","type":"set","name":"set MACADDRESS tmp.txconcs...brg-wan-mac-address","xml":"<set>\n<parameter name='tmp.brg-macaddress' \n      value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\n\n","comments":"","x":2049.883331298828,"y":664.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"410482e7.5c2ae4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":255.88333129882812,"y":754.8833312988281,"z":"bc96058f.0be17","wires":[["c0e9ce09.8d6c28"]]},{"id":"90cc4165.e57f28","type":"returnFailure","name":"return failure Did not find vGW Preload","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Did not find vGW Preload' />\n","comments":"","x":513.8833312988281,"y":920.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"c0e9ce09.8d6c28","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":267.8833312988281,"y":832.8833312988281,"z":"bc96058f.0be17","wires":[["90cc4165.e57f28"]]},{"id":"ffcaa277.9c9268","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.failure.log' />\n","comments":"","outputs":1,"x":463.8833312988281,"y":869.8833312988281,"z":"bc96058f.0be17","wires":[[]]},{"id":"3a91d5b1.ed18e2","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'>","comments":"","outputs":1,"x":2052.883331298828,"y":1863.8833312988281,"z":"bc96058f.0be17","wires":[["84f06b0c.c3c108"]]},{"id":"84f06b0c.c3c108","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2370.383331298828,"y":1891.3833312988281,"z":"bc96058f.0be17","wires":[["646b48f6.2f6d28"]]},{"id":"646b48f6.2f6d28","type":"set","name":"set lan-ip[ in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-ip`' />\n<!--\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n-->","comments":"","x":2582.883331298828,"y":1928.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"5231bd00.7e3c04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1804.8833312988281,"y":1865.8833312988281,"z":"bc96058f.0be17","wires":[]},{"id":"7e472b82.55e40c","type":"set","name":"set VNI and VG-IP","xml":"<set>\n<parameter name='tmp.vg-vgmux-tunnel-vni' \n    value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\n<parameter name='tmp.vg-ip' \n    value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n","comments":"","x":1941.716796875,"y":785.88330078125,"z":"bc96058f.0be17","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
index 8f2c40b9..f7384186 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
@@ -21,7 +21,10 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 
 <block atomic='true'><set>
 <parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
-<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' /></set><switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'><outcome value='true'>
+<!--
+this is null
+<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />
+--></set><switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'><outcome value='true'>
 <block>
 <set>
 <parameter name='tmp.brg-macaddress' 
@@ -41,6 +44,11 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 
 -->
 </set><set>
+<parameter name='tmp.vg-vgmux-tunnel-vni' 
+    value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />
+<parameter name='tmp.vg-ip' 
+    value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
+</set><set>
 <parameter name='tmp.thisIsVGW' value='true' />
 </set></block></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>
 <outcome value='true'>
@@ -109,11 +117,16 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <block>
 <switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'><outcome value='true'>
 <set>
+<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-vgmux-tunnel-vni`' />
+
+<!--
 <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />
-</set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>
+--></set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>
 <set>
+<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-ip`' />
+<!--
 <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
-</set></outcome></switch></block></for><set>
+--></set></outcome></switch></block></for><set>
 <!--
 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'
 
@@ -126,4 +139,4 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <return status='failure'>
 <parameter name='error-code' value='500' />
 <parameter name='error-message' value='Did not find vGW Preload' />
-</return></block></outcome></switch></block></method></service-logic>
+</return></block></outcome></switch></block></method></service-logic>
\ No newline at end of file