Fixes from DG testing

Issue-ID: SDNC-199 Change-Id: I46dfbb194df8ae03d72f832f17a2226e906c981d Signed-off-by: Brian Freeman <bf1936@att.com> Former-commit-id: 751b1f66506b73ce55b6227f07041a3203fc9a26
author: Brian Freeman <bf1936@att.com> 2017-11-16 00:00:53 -0500
committer: Brian Freeman <bf1936@att.com> 2017-11-16 00:01:53 -0500
commit: c9242cc08999764ed9ee0a9eba699973a6023523 (patch)
tree: 6f8d4c290ab39df00476e0e4fdb332296bcf8517 /platform-logic/generic-resource-api/src
parent: 21bb99ad15e2697805e3915286dc965927263c79 (diff)
4 files changed, 20 insertions, 804 deletions
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 f5d7ced5..485ffacd 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":"ff331a1b.1c488","type":"dgstart","name":"DGSTART","outputs":1,"x":171,"y":61,"z":"a2d41f5.f696b6","wires":[["b1e4068e.a8248"]]},{"id":"b1e4068e.a8248","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":267.2380790710449,"y":121.95239067077637,"z":"a2d41f5.f696b6","wires":[["446ed2d0.62eac4"]]},{"id":"446ed2d0.62eac4","type":"method","name":"gw-vfmodule","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":151.15488815307617,"y":215.19043064117432,"z":"a2d41f5.f696b6","wires":[["472b6b38.991c9c"]]},{"id":"472b6b38.991c9c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":267.9999809265137,"y":315.0000009536743,"z":"a2d41f5.f696b6","wires":[["37136d7b.9d869a","ef5050d6.256b6","eb0397a.74a27e8","d4b6b0db.1e149"]]},{"id":"8b408e80.6fa7a8","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":2027.2500610351562,"y":1485.0002136230469,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"af678515.3b6dc8","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":1613.9999389648438,"y":2016.0001831054688,"z":"a2d41f5.f696b6","wires":[["91040b39.f22c2"]]},{"id":"61bfb216.427e1c","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":2072.7500610351562,"y":1442.2502136230469,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"e0830250.c2c27","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":2051.5000610351562,"y":1526.0002136230469,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"30dc1fcc.9a851","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\n\n\n","comments":"","x":1605.2500610351562,"y":1603.5002136230469,"z":"a2d41f5.f696b6","wires":[]},{"id":"669eab32.da6dc4","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":2067.75,"y":1283.0834045410156,"z":"a2d41f5.f696b6","wires":[]},{"id":"13501960.e241ff","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":2034,"y":1243.0834045410156,"z":"a2d41f5.f696b6","wires":[]},{"id":"447eb1b6.b6fa5","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":2082.7499389648438,"y":1188.083251953125,"z":"a2d41f5.f696b6","wires":[]},{"id":"5f6db3a1.3f84a4","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":1587.75,"y":1321.8333435058594,"z":"a2d41f5.f696b6","wires":[]},{"id":"3f9b4d45.aeea12","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":1595.2498779296875,"y":1113.0834045410156,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"91040b39.f22c2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1895.2499389648438,"y":2067.2501831054688,"z":"a2d41f5.f696b6","wires":[["72a0c285.aded84"]]},{"id":"72a0c285.aded84","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":2085.2499389648438,"y":2076.0001831054688,"z":"a2d41f5.f696b6","wires":[]},{"id":"37136d7b.9d869a","type":"set","name":"set VGW2BRG-fa:16:3e:8f:ea:68 & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value='VGW2BRG-fa:16:3e:8f:ea:68'/>\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.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":640.0000610351562,"y":312.08343505859375,"z":"a2d41f5.f696b6","wires":[]},{"id":"a257a1ad.5c67c8","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":804.3055419921875,"y":658.7499694824219,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"2d739416.c7e85c","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":798.1944580078125,"y":760.9723510742188,"z":"a2d41f5.f696b6","wires":[["1a3e1a43.0a466e"]]},{"id":"612e9f6e.18b6e","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":1086.1942749023438,"y":776.361083984375,"z":"a2d41f5.f696b6","wires":[["e671abf7.bf0aa8"]]},{"id":"e671abf7.bf0aa8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1244.91650390625,"y":922.5,"z":"a2d41f5.f696b6","wires":[["fd3690b6.c3232"]]},{"id":"fd3690b6.c3232","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1160,"y":1382.5,"z":"a2d41f5.f696b6","wires":[["5d3d78fd.9d7e18","3f9b4d45.aeea12","5f6db3a1.3f84a4","44a79ac4.bca8c4","86b5a8ca.a751d8","20051d0c.51867a","bd8cc978.6b6dc8","be425f83.ac7d28","ef072eb2.986228","30dc1fcc.9a851","6845b51b.470444"]]},{"id":"4803c2a3.bb47e4","type":"comment","name":"vnfidx ","info":"","comments":"","x":1406.2499389648438,"y":796.2500305175781,"z":"a2d41f5.f696b6","wires":[]},{"id":"5d3d78fd.9d7e18","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":1662.4999389648438,"y":991.25,"z":"a2d41f5.f696b6","wires":[["d1e7f1cd.6532f8"]]},{"id":"16294d67.941e83","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":2167.6389770507812,"y":1060.9722595214844,"z":"a2d41f5.f696b6","wires":[]},{"id":"ef5050d6.256b6","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":581.3635559082031,"y":411.8182067871094,"z":"a2d41f5.f696b6","wires":[["12d5ec8f.a479d3"]]},{"id":"1178542e.cb8f2c","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":1055.4544982910156,"y":450.9090576171875,"z":"a2d41f5.f696b6","wires":[["cd424057.0ab1f"]]},{"id":"fc7b6817.1b14e8","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1441,"y":582.7423706054688,"z":"a2d41f5.f696b6","wires":[["2cedbe9.a6657c2"]]},{"id":"2cedbe9.a6657c2","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1609.5,"y":653.060546875,"z":"a2d41f5.f696b6","wires":[["58ede03d.79aa"]]},{"id":"58ede03d.79aa","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":1773.8182373046875,"y":701.5454711914062,"z":"a2d41f5.f696b6","wires":[]},{"id":"eb0397a.74a27e8","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":501.81817626953125,"y":361.81817626953125,"z":"a2d41f5.f696b6","wires":[]},{"id":"d4b6b0db.1e149","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":316.3636474609375,"y":486.36370849609375,"z":"a2d41f5.f696b6","wires":[["7aacca5d.2f0d54"]]},{"id":"7aacca5d.2f0d54","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":339.09090909090907,"y":568.1818181818181,"z":"a2d41f5.f696b6","wires":[["40d2bdfb.c44124"]]},{"id":"40d2bdfb.c44124","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":520.6747436523438,"y":756.293701171875,"z":"a2d41f5.f696b6","wires":[["a257a1ad.5c67c8","2d739416.c7e85c"]]},{"id":"1a3e1a43.0a466e","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":876.666748046875,"y":811.1112060546875,"z":"a2d41f5.f696b6","wires":[["612e9f6e.18b6e","670614ea.aa072c"]]},{"id":"cd424057.0ab1f","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1210,"y":514.4444580078125,"z":"a2d41f5.f696b6","wires":[["fc7b6817.1b14e8","14eaeaa.5e2e915"]]},{"id":"d1e7f1cd.6532f8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1965.4166259765625,"y":1023.1944885253906,"z":"a2d41f5.f696b6","wires":[["16294d67.941e83"]]},{"id":"12d5ec8f.a479d3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":666.6666666666666,"y":462.22222222222223,"z":"a2d41f5.f696b6","wires":[["1178542e.cb8f2c"]]},{"id":"14eaeaa.5e2e915","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":1312,"y":153,"z":"a2d41f5.f696b6","wires":[]},{"id":"670614ea.aa072c","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":1038,"y":702,"z":"a2d41f5.f696b6","wires":[]},{"id":"44a79ac4.bca8c4","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":1576.25,"y":917.5,"z":"a2d41f5.f696b6","wires":[]},{"id":"86b5a8ca.a751d8","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":1512.5,"y":1382.5,"z":"a2d41f5.f696b6","wires":[]},{"id":"20051d0c.51867a","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":1550.0000610351562,"y":1788.2499389648438,"z":"a2d41f5.f696b6","wires":[]},{"id":"bd8cc978.6b6dc8","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":1486.2500610351562,"y":1843.7499389648438,"z":"a2d41f5.f696b6","wires":[[]]},{"id":"be425f83.ac7d28","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1596.2501831054688,"y":1055,"z":"a2d41f5.f696b6","wires":[]},{"id":"aec8c574.ac52","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1237.5,"y":1602.5,"z":"a2d41f5.f696b6","wires":[]},{"id":"ef072eb2.986228","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1585,"y":1702.5,"z":"a2d41f5.f696b6","wires":[["c6c3447d.0100b"]]},{"id":"e6c2b24.da9605","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":2082.5,"y":1771.25,"z":"a2d41f5.f696b6","wires":[["f590bc5f.01175"]]},{"id":"f590bc5f.01175","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2400,"y":1798.75,"z":"a2d41f5.f696b6","wires":[["6d7ff6e4.e0a7d8"]]},{"id":"6d7ff6e4.e0a7d8","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":2612.5,"y":1836.25,"z":"a2d41f5.f696b6","wires":[]},{"id":"6845b51b.470444","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\n\n\n","comments":"","x":1575,"y":1652.5,"z":"a2d41f5.f696b6","wires":[]},{"id":"c6c3447d.0100b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1791.25,"y":1697.5,"z":"a2d41f5.f696b6","wires":[["e6c2b24.da9605"]]},{"id":"ce6e6aac.4b2bb","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":2070.0000610351562,"y":1690,"z":"a2d41f5.f696b6","wires":[]},{"id":"aa1e338f.4ea848","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1582.4999084472656,"y":1942.5,"z":"a2d41f5.f696b6","wires":[]},{"id":"8b2e483.cf39eb8","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2065,"y":1393.75,"z":"a2d41f5.f696b6","wires":[]}]
+[{"id":"5a2ce84a.2a5768","type":"dgstart","name":"DGSTART","outputs":1,"x":149,"y":91,"z":"d1447f06.01b7f","wires":[["be8f043.98f0ef8"]]},{"id":"be8f043.98f0ef8","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111502","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":245.23807907104492,"y":151.95239067077637,"z":"d1447f06.01b7f","wires":[["94e132ae.047618"]]},{"id":"94e132ae.047618","type":"method","name":"gw-vfmodule-update","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":129.15488815307617,"y":245.19043064117432,"z":"d1447f06.01b7f","wires":[["2c97cc82.13917c"]]},{"id":"2c97cc82.13917c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":245.99998092651367,"y":345.0000009536743,"z":"d1447f06.01b7f","wires":[["6fd806f5.1e0cf8","7e47a1b6.ea6ca","ed3653e2.5212a8"]]},{"id":"318d30e7.cc194","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":2005.2500610351562,"y":1515.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"43971082.730f7","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":1591.9999389648438,"y":2046.0001831054688,"z":"d1447f06.01b7f","wires":[["cac6eda.d1dd69"]]},{"id":"27f265c4.04de6a","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":2050.7500610351562,"y":1472.2502136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"26b6b15e.7cf40e","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":2029.5000610351562,"y":1556.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"dbd1314c.923b4","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\n\n\n","comments":"","x":1583.2500610351562,"y":1633.5002136230469,"z":"d1447f06.01b7f","wires":[]},{"id":"c79e8967.5f551","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":2045.75,"y":1313.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"1743f961.36c79f","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":2012,"y":1273.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"e053f1e9.fe00e","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":2060.7499389648438,"y":1218.083251953125,"z":"d1447f06.01b7f","wires":[]},{"id":"db82c7d3.0603c8","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":1565.75,"y":1351.8333435058594,"z":"d1447f06.01b7f","wires":[]},{"id":"eff549e7.c3aa1","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":1573.2498779296875,"y":1143.0834045410156,"z":"d1447f06.01b7f","wires":[[]]},{"id":"cac6eda.d1dd69","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1873.2499389648438,"y":2097.2501831054688,"z":"d1447f06.01b7f","wires":[["118e296d.8d4b27"]]},{"id":"118e296d.8d4b27","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":2063.2499389648438,"y":2106.0001831054688,"z":"d1447f06.01b7f","wires":[]},{"id":"d77077f7.503848","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\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<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.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":620.0000610351562,"y":357.08343505859375,"z":"d1447f06.01b7f","wires":[]},{"id":"523ea527.76699c","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":782.3055419921875,"y":688.7499694824219,"z":"d1447f06.01b7f","wires":[[]]},{"id":"76a8e6e4.4fc528","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":776.1944580078125,"y":790.9723510742188,"z":"d1447f06.01b7f","wires":[["b2eff683.95cbe"]]},{"id":"91e15171.591e1","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":1064.1942749023438,"y":806.361083984375,"z":"d1447f06.01b7f","wires":[["889d8c80.f385f8"]]},{"id":"889d8c80.f385f8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1222.91650390625,"y":952.5,"z":"d1447f06.01b7f","wires":[["2cc787b4.515c08"]]},{"id":"2cc787b4.515c08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1138,"y":1412.5,"z":"d1447f06.01b7f","wires":[["d21db1e1.8f1b08","eff549e7.c3aa1","db82c7d3.0603c8","1b68e1a3.6004ae","2086475b.a51918","35c66ad8.ae3386","2e18627.f93a01e","61a05b5e.1b139c","79598fea.259c78","dbd1314c.923b4","5426cffc.d7aa3"]]},{"id":"e64a5ef3.99b52","type":"comment","name":"vnfidx ","info":"","comments":"","x":1384.2499389648438,"y":826.2500305175781,"z":"d1447f06.01b7f","wires":[]},{"id":"d21db1e1.8f1b08","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":1640.4999389648438,"y":1021.25,"z":"d1447f06.01b7f","wires":[["2c47b660.a0b01a"]]},{"id":"51e53b5d.e9a984","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":2145.6389770507812,"y":1090.9722595214844,"z":"d1447f06.01b7f","wires":[]},{"id":"6fd806f5.1e0cf8","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":562.3635559082031,"y":457.8182067871094,"z":"d1447f06.01b7f","wires":[["a14f4f30.7bf86"]]},{"id":"4ed3399b.5f757","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":1033.4544982910156,"y":480.9090576171875,"z":"d1447f06.01b7f","wires":[["1f8ab929.f4fdff"]]},{"id":"63993bff.c5d494","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1419,"y":612.7423706054688,"z":"d1447f06.01b7f","wires":[["c5f860b7.8ce078"]]},{"id":"c5f860b7.8ce078","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1587.5,"y":683.060546875,"z":"d1447f06.01b7f","wires":[["d9ee0f7e.01bf88"]]},{"id":"60344461.6714d4","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":1934.8182373046875,"y":797.5454711914062,"z":"d1447f06.01b7f","wires":[]},{"id":"7e47a1b6.ea6ca","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":482.81817626953125,"y":407.81817626953125,"z":"d1447f06.01b7f","wires":[]},{"id":"ed3653e2.5212a8","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":294.3636474609375,"y":516.3637084960938,"z":"d1447f06.01b7f","wires":[["88630163.1f719"]]},{"id":"88630163.1f719","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":317.090909090909,"y":598.1818181818181,"z":"d1447f06.01b7f","wires":[["8910cdf6.2f0ab"]]},{"id":"8910cdf6.2f0ab","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":498.67474365234375,"y":786.293701171875,"z":"d1447f06.01b7f","wires":[["523ea527.76699c","76a8e6e4.4fc528"]]},{"id":"b2eff683.95cbe","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":854.666748046875,"y":841.1112060546875,"z":"d1447f06.01b7f","wires":[["91e15171.591e1","7ac6eb03.0d1e8c"]]},{"id":"1f8ab929.f4fdff","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1188,"y":544.4444580078125,"z":"d1447f06.01b7f","wires":[["63993bff.c5d494","43685628.f5f5d"]]},{"id":"2c47b660.a0b01a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1943.4166259765625,"y":1053.1944885253906,"z":"d1447f06.01b7f","wires":[["51e53b5d.e9a984"]]},{"id":"a14f4f30.7bf86","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":647.6666666666665,"y":508.22222222222223,"z":"d1447f06.01b7f","wires":[["4ed3399b.5f757"]]},{"id":"43685628.f5f5d","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":1290,"y":183,"z":"d1447f06.01b7f","wires":[]},{"id":"7ac6eb03.0d1e8c","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":1016,"y":732,"z":"d1447f06.01b7f","wires":[]},{"id":"1b68e1a3.6004ae","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":1554.25,"y":947.5,"z":"d1447f06.01b7f","wires":[]},{"id":"2086475b.a51918","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":1490.5,"y":1412.5,"z":"d1447f06.01b7f","wires":[]},{"id":"35c66ad8.ae3386","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":1528.0000610351562,"y":1818.2499389648438,"z":"d1447f06.01b7f","wires":[]},{"id":"2e18627.f93a01e","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":1464.2500610351562,"y":1873.7499389648438,"z":"d1447f06.01b7f","wires":[[]]},{"id":"61a05b5e.1b139c","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1574.2501831054688,"y":1085,"z":"d1447f06.01b7f","wires":[]},{"id":"8dcc0569.10249","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1215.5,"y":1632.5,"z":"d1447f06.01b7f","wires":[]},{"id":"79598fea.259c78","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1563,"y":1732.5,"z":"d1447f06.01b7f","wires":[["907e0702.827b98"]]},{"id":"27ea0bf1.7371bc","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":2060.5,"y":1801.25,"z":"d1447f06.01b7f","wires":[["cd5c9ec4.ad0af8"]]},{"id":"cd5c9ec4.ad0af8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2378,"y":1828.75,"z":"d1447f06.01b7f","wires":[["bb91234f.950048"]]},{"id":"bb91234f.950048","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":2590.5,"y":1866.25,"z":"d1447f06.01b7f","wires":[]},{"id":"5426cffc.d7aa3","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\n\n\n","comments":"","x":1553,"y":1682.5,"z":"d1447f06.01b7f","wires":[]},{"id":"907e0702.827b98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1769.25,"y":1727.5,"z":"d1447f06.01b7f","wires":[["27ea0bf1.7371bc"]]},{"id":"39894545.21de32","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":2048.0000610351562,"y":1720,"z":"d1447f06.01b7f","wires":[]},{"id":"307ee0b5.e38d7","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1560.4999084472656,"y":1972.5,"z":"d1447f06.01b7f","wires":[]},{"id":"d2760d91.22b388","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2043,"y":1423.75,"z":"d1447f06.01b7f","wires":[]},{"id":"e46e612b.087e1","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":537,"y":309,"z":"d1447f06.01b7f","wires":[]},{"id":"5bb21711.d63b1","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\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<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.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":2077,"y":730,"z":"d1447f06.01b7f","wires":[]},{"id":"d9ee0f7e.01bf88","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1733,"y":713,"z":"d1447f06.01b7f","wires":[["60344461.6714d4","5bb21711.d63b1","f7dd993b.b754a"]]},{"id":"f7dd993b.b754a","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":2051,"y":667,"z":"d1447f06.01b7f","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.json
index 797986fb..aae986b1 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.json
@@ -1,790 +1 @@
-[
-    {
-        "id": "b3e2f5b2.d1ec88",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 108.33332824707031,
-        "y": 85,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "dab5982.c2d8368"
-            ]
-        ]
-    },
-    {
-        "id": "dab5982.c2d8368",
-        "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": 183.61903381347656,
-        "y": 125.23811149597168,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "c935cee3.ef7d4"
-            ]
-        ]
-    },
-    {
-        "id": "c935cee3.ef7d4",
-        "type": "method",
-        "name": "method vf-module-topology-operation-activate",
-        "xml": "<method rpc='vf-module-topology-operation-activate' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 221.76195526123047,
-        "y": 165,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "c8f7adca.75964"
-            ]
-        ]
-    },
-    {
-        "id": "5cec4e55.d222e",
-        "type": "comment",
-        "name": "vf-module-topology-operation-activate",
-        "info": "",
-        "comments": "",
-        "x": 502.67818450927734,
-        "y": 32.58634376525879,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "f55136c4.7d1fa8",
-        "type": "switchNode",
-        "name": "switch request-action",
-        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 511.85713958740234,
-        "y": 263.8571376800537,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "a5be9328.059ac",
-                "268e67a.bb73198"
-            ]
-        ]
-    },
-    {
-        "id": "a5be9328.059ac",
-        "type": "outcome",
-        "name": "CreateVfModuleInstance",
-        "xml": "<outcome value='CreateVfModuleInstance'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 762.9047546386719,
-        "y": 241.0000238418579,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "e97fb6eb.1f8fb8"
-            ]
-        ]
-    },
-    {
-        "id": "268e67a.bb73198",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 706.5713996887207,
-        "y": 286.38101291656494,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "9d82fd59.8a632"
-            ]
-        ]
-    },
-    {
-        "id": "e97fb6eb.1f8fb8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 952.7619190216064,
-        "y": 241.00005531311035,
-        "z": "836e826a.3ec22",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9d82fd59.8a632",
-        "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=\"If svc-action is 'activate' then request-action must be 'CreateVfModuleInstance'\" />\n",
-        "comments": "",
-        "x": 971.5714073181152,
-        "y": 286.71432542800903,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "c8f7adca.75964",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 153.3333282470703,
-        "y": 493.3332939147949,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "f55136c4.7d1fa8",
-                "33462c4c.518eb4",
-                "2c1ab3ca.482e0c",
-                "979e92c5.d53fe",
-                "ea5f4c6f.d1309",
-                "aae32e5.23f3cd",
-                "98ce7a09.d3e438",
-                "41d0df4e.5c136",
-                "65dc8315.181b9c",
-                "cb036b0b.8b11c8",
-                "78ecfd34.349dc4",
-                "e0f8a4a9.becc18",
-                "c3cab201.2d1ef"
-            ]
-        ]
-    },
-    {
-        "id": "2c1ab3ca.482e0c",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 556.6666564941406,
-        "y": 394.9999647140503,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "d78e72e2.ad098",
-                "224b172.962d2e8"
-            ]
-        ]
-    },
-    {
-        "id": "d78e72e2.ad098",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 797.3809280395508,
-        "y": 372.1427049636841,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "d7ea4aa1.bfcb38"
-            ]
-        ]
-    },
-    {
-        "id": "224b172.962d2e8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 797.1427688598633,
-        "y": 413.09522342681885,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "42ba44cf.9db11c"
-            ]
-        ]
-    },
-    {
-        "id": "d7ea4aa1.bfcb38",
-        "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=\"There are no VNFs defined in MD-SAL\" />\n",
-        "comments": "",
-        "x": 964.0475425720215,
-        "y": 371.4284601211548,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "42ba44cf.9db11c",
-        "type": "for",
-        "name": "for each vnf",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 959.3809127807617,
-        "y": 412.7618417739868,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "7209f5e7.76dcfc"
-            ]
-        ]
-    },
-    {
-        "id": "7209f5e7.76dcfc",
-        "type": "switchNode",
-        "name": "switch service data vnf == input vnf",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1210.7141304016113,
-        "y": 412.42852878570557,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "42a9a01e.4621d"
-            ]
-        ]
-    },
-    {
-        "id": "42a9a01e.4621d",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1440.7142219543457,
-        "y": 411.7618827819824,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "cdb3bc66.5a0d1"
-            ]
-        ]
-    },
-    {
-        "id": "33462c4c.518eb4",
-        "type": "set",
-        "name": "set vnf-index to -1",
-        "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",
-        "comments": "",
-        "x": 500.7142562866211,
-        "y": 333.09513664245605,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "717cff05.1de83",
-        "type": "set",
-        "name": "set vnf-index to idx",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
-        "comments": "",
-        "x": 1762.380859375,
-        "y": 382.7618408203125,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "979e92c5.d53fe",
-        "type": "switchNode",
-        "name": "switch vnf-index",
-        "xml": "<switch test='`$vnf-index`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 492.3809394836426,
-        "y": 459.76183891296387,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "4d87c876.5adff8"
-            ]
-        ]
-    },
-    {
-        "id": "4d87c876.5adff8",
-        "type": "outcome",
-        "name": "-1",
-        "xml": "<outcome value='-1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 670.7143249511719,
-        "y": 459.09521484375,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "f087e977.afc1b8"
-            ]
-        ]
-    },
-    {
-        "id": "f087e977.afc1b8",
-        "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=\"`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`\" />\n",
-        "comments": "",
-        "x": 830.7142333984375,
-        "y": 458.4285182952881,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "cdb3bc66.5a0d1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1589.0476837158203,
-        "y": 410.6815814971924,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "717cff05.1de83",
-                "ee458420.1b46d8"
-            ]
-        ]
-    },
-    {
-        "id": "ee458420.1b46d8",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 1724.047649383545,
-        "y": 432.3481674194336,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "aae32e5.23f3cd",
-        "type": "switchNode",
-        "name": "switch service-data...vf-module_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 564.9999694824219,
-        "y": 558.3333358764648,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "9b945904.62b6c8",
-                "9b02b5f9.8a49d8"
-            ]
-        ]
-    },
-    {
-        "id": "9b945904.62b6c8",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 815.7142791748047,
-        "y": 537.1427392959595,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "67892bd4.9c5464"
-            ]
-        ]
-    },
-    {
-        "id": "9b02b5f9.8a49d8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 815.4761199951172,
-        "y": 578.0952577590942,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "526cbef0.bed3f"
-            ]
-        ]
-    },
-    {
-        "id": "67892bd4.9c5464",
-        "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=\"`'There are no VF modules defined in MD-SAL for VNF ' + $vf-module-topology-operation-input.vnf-information.vnf-id`\" />\n",
-        "comments": "",
-        "x": 982.3808937072754,
-        "y": 536.4284944534302,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "526cbef0.bed3f",
-        "type": "for",
-        "name": "for each vf-module",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 977.7142639160156,
-        "y": 577.7618761062622,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "4f0d7647.56b958"
-            ]
-        ]
-    },
-    {
-        "id": "4f0d7647.56b958",
-        "type": "switchNode",
-        "name": "switch service data vf-module == input vf-module",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.0474243164062,
-        "y": 577.4286117553711,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "44af7ab9.eed234"
-            ]
-        ]
-    },
-    {
-        "id": "44af7ab9.eed234",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1554.047477722168,
-        "y": 575.0952167510986,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "b035b372.13799"
-            ]
-        ]
-    },
-    {
-        "id": "ea5f4c6f.d1309",
-        "type": "set",
-        "name": "set vf-module-index to -1",
-        "xml": "<set>\n<parameter name='vf-module-index' value='-1' />\n",
-        "comments": "",
-        "x": 520.714241027832,
-        "y": 508.0951747894287,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "89c9c4bd.a873a8",
-        "type": "set",
-        "name": "set vf-module-index to idx",
-        "xml": "<set>\n<parameter name='vf-module-index' value='`$idx`' />\n",
-        "comments": "",
-        "x": 1884.0475692749023,
-        "y": 546.0951957702637,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "98ce7a09.d3e438",
-        "type": "switchNode",
-        "name": "switch vf-module-index",
-        "xml": "<switch test='`$vf-module-index`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 517.3809432983398,
-        "y": 626.4285945892334,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "b9c45c6b.a9187"
-            ]
-        ]
-    },
-    {
-        "id": "b9c45c6b.a9187",
-        "type": "outcome",
-        "name": "-1",
-        "xml": "<outcome value='-1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 695.7143287658691,
-        "y": 625.7619705200195,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "d59bf3a9.b26b2"
-            ]
-        ]
-    },
-    {
-        "id": "d59bf3a9.b26b2",
-        "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=\"`'Unable to find VF module ID ' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' in MD-SAL'`\" />\n",
-        "comments": "",
-        "x": 855.7142372131348,
-        "y": 625.0952739715576,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "b035b372.13799",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1687.3810195922852,
-        "y": 574.0149564743042,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "89c9c4bd.a873a8",
-                "520e0d13.8fb9c4"
-            ]
-        ]
-    },
-    {
-        "id": "520e0d13.8fb9c4",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 1822.3809852600098,
-        "y": 595.6815423965454,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "41d0df4e.5c136",
-        "type": "set",
-        "name": "set order-status to Created",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
-        "comments": "",
-        "x": 535.0000610351562,
-        "y": 945.0000171661377,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "65dc8315.181b9c",
-        "type": "switchNode",
-        "name": "switch order-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 508.33329010009766,
-        "y": 695.6666564941406,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "6bec43cd.c6ce2c",
-                "a5ffb8bd.544748"
-            ]
-        ]
-    },
-    {
-        "id": "6bec43cd.c6ce2c",
-        "type": "outcome",
-        "name": "PendingCreate",
-        "xml": "<outcome value='PendingCreate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 720.0000343322754,
-        "y": 673.9999809265137,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "b627f4fa.590738"
-            ]
-        ]
-    },
-    {
-        "id": "a5ffb8bd.544748",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 697.0000228881836,
-        "y": 719.380952835083,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "69bb9844.70fda8"
-            ]
-        ]
-    },
-    {
-        "id": "b627f4fa.590738",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 874.8571701049805,
-        "y": 673.3333835601807,
-        "z": "836e826a.3ec22",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "69bb9844.70fda8",
-        "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=\"`'Order status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status + ' instead of PendingCreate'`\" />\n",
-        "comments": "",
-        "x": 894.3333206176758,
-        "y": 719.3810129165649,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "cb036b0b.8b11c8",
-        "type": "set",
-        "name": "copy input data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.'\n   value='$vf-module-topology-operation-input.vf-module-request-input.' />\n\n",
-        "comments": "",
-        "x": 500,
-        "y": 896.6666622161865,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "78ecfd34.349dc4",
-        "type": "save",
-        "name": "update vf-module to Active",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vf-module\"\n   key=\"vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id\n      AND generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"orchestration-status\" value=\"Active\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 533.3332672119141,
-        "y": 783.3332824707031,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "c27006c0.c436d8",
-                "912d9db6.973d9"
-            ]
-        ]
-    },
-    {
-        "id": "e2726395.5642b",
-        "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=\"`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n",
-        "comments": "",
-        "x": 930.0000267028809,
-        "y": 806.666651725769,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "c27006c0.c436d8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 742.6905937194824,
-        "y": 763.6191215515137,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "463820fb.52f55"
-            ]
-        ]
-    },
-    {
-        "id": "912d9db6.973d9",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 751.2620239257812,
-        "y": 807.9048347473145,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "e2726395.5642b"
-            ]
-        ]
-    },
-    {
-        "id": "463820fb.52f55",
-        "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 vf-module in AAI\" />\n",
-        "comments": "",
-        "x": 932.6906204223633,
-        "y": 763.4288568496704,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "e0f8a4a9.becc18",
-        "type": "update",
-        "name": "Update EIPAM_IP_ASSIGNMENTS to ACTIVE",
-        "xml": "<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n  key='UPDATE EIPAM_IP_ASSIGNMENTS SET status = \"ACTIVE\" WHERE info = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 596.6666564941406,
-        "y": 853.333306312561,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "d47fe482.1f7428"
-            ]
-        ]
-    },
-    {
-        "id": "d47fe482.1f7428",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 863.3333282470703,
-        "y": 851.6666460037231,
-        "z": "836e826a.3ec22",
-        "wires": [
-            [
-                "3aa8408e.a33f6"
-            ]
-        ]
-    },
-    {
-        "id": "3aa8408e.a33f6",
-        "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 EIPAM_IP_ASSIGNMENTS table\" />\n",
-        "comments": "",
-        "x": 1013.3333282470703,
-        "y": 849.9999589920044,
-        "z": "836e826a.3ec22",
-        "wires": []
-    },
-    {
-        "id": "c3cab201.2d1ef",
-        "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": 494.9999694824219,
-        "y": 993.3333129882812,
-        "z": "836e826a.3ec22",
-        "wires": []
-    }
-]
+[{"id":"a454005.ca0d08","type":"dgstart","name":"DGSTART","outputs":1,"x":147,"y":142.4136562347412,"z":"3a458d77.799552","wires":[["297a72c7.cc4fae"]]},{"id":"297a72c7.cc4fae","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111501","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":222.28570556640625,"y":182.6517677307129,"z":"3a458d77.799552","wires":[["217ac7fc.349988"]]},{"id":"217ac7fc.349988","type":"method","name":"method vf-module-topology-operation-activate","xml":"<method rpc='vf-module-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":260.42862701416016,"y":222.4136562347412,"z":"3a458d77.799552","wires":[["d0460fcb.62f0c"]]},{"id":"5b00e29b.70560c","type":"comment","name":"vf-module-topology-operation-activate","info":"","comments":"","x":541.344856262207,"y":90,"z":"3a458d77.799552","wires":[]},{"id":"387117c9.5e2b3","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":550.523811340332,"y":321.2707939147949,"z":"3a458d77.799552","wires":[["d1423fc.e72c4c","fb57f016.f69d48"]]},{"id":"d1423fc.e72c4c","type":"outcome","name":"CreateVfModuleInstance","xml":"<outcome value='CreateVfModuleInstance'>\n","comments":"","outputs":1,"x":801.5714263916016,"y":298.4136800765991,"z":"3a458d77.799552","wires":[["e13b99e3.f45468"]]},{"id":"fb57f016.f69d48","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":745.2380714416504,"y":343.79466915130615,"z":"3a458d77.799552","wires":[["9c5fd099.236998"]]},{"id":"e13b99e3.f45468","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":991.4285907745361,"y":298.41371154785156,"z":"3a458d77.799552","wires":[[]]},{"id":"9c5fd099.236998","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=\"If svc-action is 'activate' then request-action must be 'CreateVfModuleInstance'\" />\n","comments":"","x":1010.2380790710449,"y":344.12798166275024,"z":"3a458d77.799552","wires":[]},{"id":"d0460fcb.62f0c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":192,"y":550.7469501495361,"z":"3a458d77.799552","wires":[["387117c9.5e2b3","3a0073c0.2e62cc","65d44223.2afd14","e0d2a645.0d4a2","387e34d5.491ec4","41797325.2223c4","cebddafc.8ed5a8","df6bf686.e80248","31ad38a9.2d7408","19d65cb8.0950e3","ddfb9f67.b327f","480235fd.ba7594","6d867071.7e0d98"]]},{"id":"65d44223.2afd14","type":"switchNode","name":"switch service-data.vnfs.vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":595.3333282470703,"y":452.4136209487915,"z":"3a458d77.799552","wires":[["71b1d6b3.6d695","fd2dae38.13491"]]},{"id":"71b1d6b3.6d695","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":836.0475997924805,"y":429.5563611984253,"z":"3a458d77.799552","wires":[["314fc4d9.da81dc"]]},{"id":"fd2dae38.13491","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":835.809440612793,"y":470.50887966156006,"z":"3a458d77.799552","wires":[["b60820e7.9b9398"]]},{"id":"314fc4d9.da81dc","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=\"There are no VNFs defined in MD-SAL\" />\n","comments":"","x":1002.7142143249512,"y":428.842116355896,"z":"3a458d77.799552","wires":[]},{"id":"b60820e7.9b9398","type":"for","name":"for each vnf","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":998.0475845336914,"y":470.175498008728,"z":"3a458d77.799552","wires":[["2c271d7a.99b29a"]]},{"id":"2c271d7a.99b29a","type":"switchNode","name":"switch service data vnf == input vnf","xml":"<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":1249.380802154541,"y":469.8421850204468,"z":"3a458d77.799552","wires":[["27abd74b.47753"]]},{"id":"27abd74b.47753","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1479.3808937072754,"y":469.17553901672363,"z":"3a458d77.799552","wires":[["6f4c7da5.fe666c"]]},{"id":"3a0073c0.2e62cc","type":"set","name":"set vnf-index to -1","xml":"<set>\n<parameter name='vnf-index' value='-1' />\n","comments":"","x":539.3809280395508,"y":390.50879287719727,"z":"3a458d77.799552","wires":[]},{"id":"bb86543b.58f298","type":"set","name":"set vnf-index to idx","xml":"<set>\n<parameter name='vnf-index' value='`$idx`' />\n","comments":"","x":1801.0475311279297,"y":440.1754970550537,"z":"3a458d77.799552","wires":[]},{"id":"e0d2a645.0d4a2","type":"switchNode","name":"switch vnf-index","xml":"<switch test='`$vnf-index`'>\n","comments":"","outputs":1,"x":531.0476112365723,"y":517.1754951477051,"z":"3a458d77.799552","wires":[["4776a96c.bbeef"]]},{"id":"4776a96c.bbeef","type":"outcome","name":"-1","xml":"<outcome value='-1'>\n","comments":"","outputs":1,"x":709.3809967041016,"y":516.5088710784912,"z":"3a458d77.799552","wires":[["87a72ed3.6ce43"]]},{"id":"87a72ed3.6ce43","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=\"`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`\" />\n","comments":"","x":869.3809051513672,"y":515.8421745300293,"z":"3a458d77.799552","wires":[]},{"id":"6f4c7da5.fe666c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1627.71435546875,"y":468.0952377319336,"z":"3a458d77.799552","wires":[["bb86543b.58f298","7faae1b5.98e048"]]},{"id":"7faae1b5.98e048","type":"break","name":"break","xml":"<break>","comments":"","x":1762.7143211364746,"y":489.7618236541748,"z":"3a458d77.799552","wires":[]},{"id":"41797325.2223c4","type":"switchNode","name":"switch service-data...vf-module_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n","comments":"","outputs":1,"x":603.6666412353516,"y":615.746992111206,"z":"3a458d77.799552","wires":[["6c3a919a.1704a8","da7c9426.3ae398"]]},{"id":"6c3a919a.1704a8","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":854.3809509277344,"y":594.5563955307007,"z":"3a458d77.799552","wires":[["38385810.f15548"]]},{"id":"da7c9426.3ae398","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":854.1427917480469,"y":635.5089139938354,"z":"3a458d77.799552","wires":[["72f0a8be.095748"]]},{"id":"38385810.f15548","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=\"`'There are no VF modules defined in MD-SAL for VNF ' + $vf-module-topology-operation-input.vnf-information.vnf-id`\" />\n","comments":"","x":1021.0475654602051,"y":593.8421506881714,"z":"3a458d77.799552","wires":[]},{"id":"72f0a8be.095748","type":"for","name":"for each vf-module","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n","comments":"","outputs":1,"x":1016.3809356689453,"y":635.1755323410034,"z":"3a458d77.799552","wires":[["5098b1f7.57aa2"]]},{"id":"5098b1f7.57aa2","type":"switchNode","name":"switch service data vf-module == input vf-module","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`'>\n","comments":"","outputs":1,"x":1322.714096069336,"y":634.8422679901123,"z":"3a458d77.799552","wires":[["7c9c4c3e.dbedbc"]]},{"id":"7c9c4c3e.dbedbc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1592.7141494750977,"y":632.5088729858398,"z":"3a458d77.799552","wires":[["4597fd99.cc396c"]]},{"id":"387e34d5.491ec4","type":"set","name":"set vf-module-index to -1","xml":"<set>\n<parameter name='vf-module-index' value='-1' />\n","comments":"","x":559.3809127807617,"y":565.5088310241699,"z":"3a458d77.799552","wires":[]},{"id":"afc00e44.c54f4","type":"set","name":"set vf-module-index to idx","xml":"<set>\n<parameter name='vf-module-index' value='`$idx`' />\n","comments":"","x":1922.714241027832,"y":603.5088520050049,"z":"3a458d77.799552","wires":[]},{"id":"cebddafc.8ed5a8","type":"switchNode","name":"switch vf-module-index","xml":"<switch test='`$vf-module-index`'>\n","comments":"","outputs":1,"x":556.0476150512695,"y":683.8422508239746,"z":"3a458d77.799552","wires":[["fe303f22.65e0f"]]},{"id":"fe303f22.65e0f","type":"outcome","name":"-1","xml":"<outcome value='-1'>\n","comments":"","outputs":1,"x":734.3810005187988,"y":683.1756267547607,"z":"3a458d77.799552","wires":[["b33902ff.a3cd48"]]},{"id":"b33902ff.a3cd48","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=\"`'Unable to find VF module ID ' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' in MD-SAL'`\" />\n","comments":"","x":894.3809089660645,"y":682.5089302062988,"z":"3a458d77.799552","wires":[]},{"id":"4597fd99.cc396c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1726.0476913452148,"y":631.4286127090454,"z":"3a458d77.799552","wires":[["afc00e44.c54f4","1082c2c8.10a48d"]]},{"id":"1082c2c8.10a48d","type":"break","name":"break","xml":"<break>","comments":"","x":1861.0476570129395,"y":653.0951986312866,"z":"3a458d77.799552","wires":[]},{"id":"df6bf686.e80248","type":"set","name":"set order-status to Created","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n","comments":"","x":573.6667327880859,"y":1002.4136734008789,"z":"3a458d77.799552","wires":[]},{"id":"31ad38a9.2d7408","type":"switchNode","name":"switch order-status","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":546.9999618530273,"y":753.0803127288818,"z":"3a458d77.799552","wires":[["926f0d8c.38aa08","adabddde.06da48"]]},{"id":"926f0d8c.38aa08","type":"outcome","name":"PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":758.6667060852051,"y":731.4136371612549,"z":"3a458d77.799552","wires":[["d25461f3.78a17"]]},{"id":"adabddde.06da48","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":735.6666946411133,"y":776.7946090698242,"z":"3a458d77.799552","wires":[["f6a77785.5b0f58"]]},{"id":"d25461f3.78a17","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":913.5238418579102,"y":730.7470397949219,"z":"3a458d77.799552","wires":[[]]},{"id":"f6a77785.5b0f58","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=\"`'Order status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status + ' instead of PendingCreate'`\" />\n","comments":"","x":932.9999923706055,"y":776.7946691513062,"z":"3a458d77.799552","wires":[]},{"id":"19d65cb8.0950e3","type":"set","name":"copy input data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.'\n   value='$vf-module-topology-operation-input.vf-module-request-input.' />\n\n","comments":"","x":538.6666717529297,"y":954.0803184509277,"z":"3a458d77.799552","wires":[]},{"id":"ddfb9f67.b327f","type":"save","name":"update vf-module to Active","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vf-module\"\n   key=\"vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id\n      AND generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"orchestration-status\" value=\"Active\" />\n","comments":"","outputs":1,"x":571.9999389648438,"y":840.7469387054443,"z":"3a458d77.799552","wires":[["13ce15f.10b7a6a","68cd8ae8.715364"]]},{"id":"70609e54.5270d8","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=\"`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n","comments":"","x":968.6666984558105,"y":864.0803079605103,"z":"3a458d77.799552","wires":[]},{"id":"13ce15f.10b7a6a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":781.3572654724121,"y":821.0327777862549,"z":"3a458d77.799552","wires":[["fd18e75b.d48ac8"]]},{"id":"68cd8ae8.715364","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":789.9286956787109,"y":865.3184909820557,"z":"3a458d77.799552","wires":[["70609e54.5270d8"]]},{"id":"fd18e75b.d48ac8","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 vf-module in AAI\" />\n","comments":"","x":971.357292175293,"y":820.8425130844116,"z":"3a458d77.799552","wires":[]},{"id":"480235fd.ba7594","type":"update","name":"Update EIPAM_IP_ASSIGNMENTS to ACTIVE","xml":"<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n  key='UPDATE EIPAM_IP_ASSIGNMENTS SET status = \"ACTIVE\" WHERE info = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'>\n","comments":"","outputs":1,"x":635.3333282470703,"y":910.7469625473022,"z":"3a458d77.799552","wires":[["9bce782d.b650b8"]]},{"id":"9bce782d.b650b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":902,"y":909.0803022384644,"z":"3a458d77.799552","wires":[["54742454.0a8a7c"]]},{"id":"54742454.0a8a7c","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 EIPAM_IP_ASSIGNMENTS table\" />\n","comments":"","x":1052,"y":907.4136152267456,"z":"3a458d77.799552","wires":[]},{"id":"6d867071.7e0d98","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":533.6666412353516,"y":1050.7469692230225,"z":"3a458d77.799552","wires":[]}]
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 eb4e5c4f..8109b945 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
@@ -1,15 +1,6 @@
 <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='gw-vfmodule-update' mode='sync'>
 <block>
 <set>
-<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />
-<parameter name='tmp.brg-mac-address-match' value='VGW2BRG-fa:16:3e:8f:ea:68'/>
-<!--
-<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />
-service-data.service-topology.service-topology-identifier.service-instance-id
-
--->
-<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />
-</set><set>
 <parameter name='tmp.thisIsVGW' value='false' />
 </set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    
          key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >
@@ -20,9 +11,23 @@ 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'>
+<block>
 <set>
+<parameter name='tmp.brg-macaddress' 
+      value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />
+
+</set><set>
+<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />
+<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>
+<!--
+<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />
+service-data.service-topology.service-topology-identifier.service-instance-id
+
+-->
+<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />
+</set><set>
 <parameter name='tmp.thisIsVGW' value='true' />
-</set></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>
+</set></block></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>
 <outcome value='true'>
 <block>
 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
index 90ff55d3..b9373071 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
@@ -22,7 +22,7 @@
 <block>
 <set>
 <parameter name='vnf-index' value='`$idx`' />
-</set><break/></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>
+</set><break></break></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>
 <outcome value='-1'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
@@ -43,7 +43,7 @@
 <block>
 <set>
 <parameter name='vf-module-index' value='`$idx`' />
-</set><break/></block></outcome></switch></for></outcome></switch><switch test='`$vf-module-index`'>
+</set><break></break></block></outcome></switch></for></outcome></switch><switch test='`$vf-module-index`'>
 <outcome value='-1'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
@@ -105,4 +105,4 @@
 <parameter name="ack-final-indicator" value="Y" />
 <parameter name="error-code" value="200" />
 <parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
+</return></block></method></service-logic>
author	Brian Freeman <bf1936@att.com>	2017-11-16 00:00:53 -0500
committer	Brian Freeman <bf1936@att.com>	2017-11-16 00:01:53 -0500
commit	c9242cc08999764ed9ee0a9eba699973a6023523 (patch)
tree	6f8d4c290ab39df00476e0e4fdb332296bcf8517 /platform-logic/generic-resource-api/src
parent	21bb99ad15e2697805e3915286dc965927263c79 (diff)