Fixes from DG testing

Issue-ID: SDNC-199
Change-Id: I46dfbb194df8ae03d72f832f17a2226e906c981d
Signed-off-by: Brian Freeman <bf1936@att.com>

Former-commit-id: 751b1f66506b73ce55b6227f07041a3203fc9a26

2 files changed, 18 insertions, 13 deletions

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>