integration test issues fix for sdwan and sotn

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
index ebe9422..1c7f5cb 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
@@ -260,7 +260,7 @@
                                                 </set>\r
                                             </outcome>\r
                                         </switch>\r
-                                        <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`">\r
+                                        <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">\r
                                             <outcome value='true'>\r
                                                 <set>\r
                                                     <parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\r
@@ -475,6 +475,10 @@
                                                                             <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\r
                                                                                 <outcome value='ActivateSDWANAttachmentInstance'>\r
                                                                                     <block atomic="true">\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.hub.ipAddress' value="10.2.0.2" />\r
+                                                                                            <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
                                                                                             <parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\r
@@ -505,6 +509,10 @@
                                                                                             </outcome>\r
                                                                                             <outcome value='success'></outcome>\r
                                                                                         </execute>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />\r
+                                                                                            <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
                                                                                             <parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\r
@@ -571,6 +579,10 @@
                                                                                                 </switch>\r
                                                                                             </block>\r
                                                                                         </for>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.hub.ipAddress' value="10.2.0.2" />\r
+                                                                                            <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.id' value='`$prop.hubRouteId`' />\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r
@@ -602,6 +614,10 @@
                                                                                             </outcome>\r
                                                                                             <outcome value='success'></outcome>\r
                                                                                         </execute>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />\r
+                                                                                            <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />\r
+                                                                                        </set>\r
                                                                                         <set>\r
                                                                                             <parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\r
                                                                                             <parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\r