Updates for vCPE Testing

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_gw-vfmodule-update.xml

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 4a787cb..8f2c40b 100644 (file)
--- 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
@@ -3,12 +3,13 @@
 <set>\r
 <!--\r
 <parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\r
-<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+\r
 \r
 <parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\r
 service-data.service-topology.service-topology-identifier.service-instance-id\r
 \r
 -->\r
+<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
 <parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
 </set><set>\r
 <parameter name='tmp.thisIsVGW' value='false' />\r
@@ -27,14 +28,18 @@ service-data.service-topology.service-topology-identifier.service-instance-id
       value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\r
 \r
 </set><set>\r
+<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
+\r
+<!--\r
 <parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\r
 <parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+-->\r
 <!--\r
 <parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\r
 service-data.service-topology.service-topology-identifier.service-instance-id\r
 \r
 -->\r
-<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
 </set><set>\r
 <parameter name='tmp.thisIsVGW' value='true' />\r
 </set></block></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>\r