diff options
author | 2018-06-02 07:58:23 -0500 | |
---|---|---|
committer | 2018-06-02 07:58:36 -0500 | |
commit | 3f86c5791aacffd2c4d28ba1936b609fbf5e7361 (patch) | |
tree | 36d60e009bd1db7daba7d3ed1cebcf70096c00c7 /platform-logic/generic-resource-api/src/main/xml | |
parent | 0aa48c020cde77282f40cefe48ef06552dc5b523 (diff) |
Fix for multi tunnelxconnv1.3.42.0.0-ONAP2.0.0-ONAP
Issue-ID: INT-517
Change-Id: Ib8b3508f0b2fece22437b09b9ced328522dd1561
Signed-off-by: Brian Freeman <bf1936@att.com>
Former-commit-id: 6507b4e0edbb287cbd7583a8ee4f1e565cb8ab82
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml | 21 |
1 files changed, 17 insertions, 4 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 8f2c40b9..f7384186 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml @@ -21,7 +21,10 @@ service-data.service-topology.service-topology-identifier.service-instance-id <block atomic='true'><set>
<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
-<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' /></set><switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'><outcome value='true'>
+<!--
+this is null
+<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />
+--></set><switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'><outcome value='true'>
<block>
<set>
<parameter name='tmp.brg-macaddress'
@@ -41,6 +44,11 @@ service-data.service-topology.service-topology-identifier.service-instance-id -->
</set><set>
+<parameter name='tmp.vg-vgmux-tunnel-vni'
+ value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />
+<parameter name='tmp.vg-ip'
+ value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
+</set><set>
<parameter name='tmp.thisIsVGW' value='true' />
</set></block></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>
<outcome value='true'>
@@ -109,11 +117,16 @@ service-data.service-topology.service-topology-identifier.service-instance-id <block>
<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'><outcome value='true'>
<set>
+<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-vgmux-tunnel-vni`' />
+
+<!--
<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />
-</set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>
+--></set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>
<set>
+<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-ip`' />
+<!--
<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
-</set></outcome></switch></block></for><set>
+--></set></outcome></switch></block></for><set>
<!--
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'
@@ -126,4 +139,4 @@ service-data.service-topology.service-topology-identifier.service-instance-id <return status='failure'>
<parameter name='error-code' value='500' />
<parameter name='error-message' value='Did not find vGW Preload' />
-</return></block></outcome></switch></block></method></service-logic>
+</return></block></outcome></switch></block></method></service-logic>
\ No newline at end of file |