Fixes for 11-17 tests

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

Former-commit-id: 40d2109693a464d15c55de3475ce8617b05725a9

5 files changed, 48 insertions, 28 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index 9f49fbeb..5e1fbe7b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
@@ -200,9 +200,7 @@ tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[1].preload-data[0].vnf-topology
 <set>

 <parameter name='tmp.brg-match-vnf-name' value="`'VGW2BRG-'+ $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address`" />

 

-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >

-<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />

-</execute><for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >

+</set><for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >

                                

 

 

@@ -316,9 +314,7 @@ brg-topology-operation-input.service-information.service-instance-id
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

-</return></outcome></execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >

-<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />

-</execute><set>

+</return></outcome></execute><set>

 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />

 <parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>

 <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
index dd10e543..a844fa53 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
@@ -3,18 +3,29 @@
 </get-resource><for index='vnfidx' start='0' end='`$tmp.vnfdata.vnfs.vnf-list_length`' >

 

 

-<switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.search.parent-service-instance-id`'>

+<block>

+<set>

+<parameter name='tmp.debug.tmp.search.parent-service-instance-id' value='`$tmp.search.parent-service-instance-id`' />

+</set><switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.search.parent-service-instance-id`'>

 

 

 <outcome value='true'>

 <block>

 <set>

-<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />

-</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >

-																													<outcome value='failure'>

+<parameter name='tmp.debug.service-instance.id1' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id`' />

+<parameter name='tmp.debug.service-instance.id2' value='`$tmp.search.parent-service-instance-id`' />

+<parameter name='tmp.debug.service-instance.id3.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].vnf-id`' />

+

+

+

+</set><set>

+<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].vnf-id`' />

+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].vnf-id/service-data/' pfx='parent-service-instance' >

+																													

+						<outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" 

     value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />

-</return></outcome></get-resource></block></outcome></switch></for></block></method></service-logic>

+</return></outcome></get-resource><break></break></block></outcome></switch></block></for></block></method></service-logic>

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 27c49fce..4a787cbb 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
@@ -86,6 +86,7 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />

 -->

 <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`' />

+<parameter name='tmp.service.vnf.vf-module.vg-lan-ip' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vg-ip`' />

 

 

 

@@ -94,6 +95,8 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />

 -->

 <parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />

+<parameter name='tmp.vg-lan-ip-match' value='vgw_private_ip_0' />

+

 

 

 

@@ -102,6 +105,9 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'><outcome value='true'>

 <set>

 <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />

+</set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>

+<set>

+<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />

 </set></outcome></switch></block></for><set>

 <!--

 <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.'

@@ -110,13 +116,9 @@ service-data.service-topology.service-topology-identifier.service-instance-id
    value='$tmp.vfmodule.' />

 -->

 <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'

-   value='$tmp.vfmodule.' /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >

-<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />

-</execute></block></outcome></switch></block></for></block></outcome><outcome value='Other'>

+   value='$tmp.vfmodule.' /></set></block></outcome></switch></block></for></block></outcome><outcome value='Other'>

 <block>

-<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >

-<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.failure.log' />

-</execute><return status='failure'>

+<return status='failure'>

 <parameter name='error-code' value='500' />

 <parameter name='error-message' value='Did not find vGW Preload' />

 </return></block></outcome></switch></block></method></service-logic>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
index b0104542..4d75a2fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
@@ -67,13 +67,28 @@
 <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="allotted-resource" 

+		key="customer.global-customer-id = $tunnelxconn-topology-operation-input.service-information.global-customer-id AND

+			service-subscription.service-type = $tunnelxconn-topology-operation-input.service-information.subscription-service-type AND

+			service-instance.service-instance-id = $tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id AND

+			allotted-resource.id = $tmp.ar.allotted-resource-id"

+        pfx='pfx' local-only='false' force='false'>

+	<parameter name="operational-status" value="in-service-path" />

+

+

+<!--

+

+<set>

+$tunnelxconn-topology-operation-input.service-information.global-customer-id

+$tunnelxconn-topology-operation-input.service-information.subscription-service-type

+

 		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

 			service-subscription.service-type = $service-data.service-information.subscription-service-type AND

 			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND

 			allotted-resource.id = $tmp.ar.allotted-resource-id"

-        pfx='pfx' local-only='false' force='false'>

-	<parameter name="operational-status" value="in-service-path" />

-<outcome value='failure'>

+			

+			$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id

+			

+--><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -115,4 +130,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>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index 666caad6..ee306af1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
@@ -2,6 +2,8 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

+<parameter name='tmp.search.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

+

 

 

 </set><set>

@@ -25,13 +27,7 @@
     <parameter name='httpMethod' value='GET' />

     <parameter name="responsePrefix" value="mdsal-ar" />

 

-<outcome value='success'>

-<return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" 

-    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />

-</return></outcome><outcome value='Other'>

+<outcome value='Other'>

 

 <call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >

 <outcome value='success'>