RFC-8040 migration

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sdwan / GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
index 40b1896..db716ce 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
@@ -129,7 +129,7 @@
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
-                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">\r
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                 <outcome value='true'>\r
                                     <set>\r
                                         <parameter name='tmp.siteVidx' value='`$idx`' />\r
@@ -346,11 +346,9 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />\r
-                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />\r
                                                 <parameter name='prop.wan.IpMode' value="static" />\r
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\r
                                                 <parameter name='prop.route.nextHopType' value="ip-address" />\r
-                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
                                             </set>\r
                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />\r
@@ -383,7 +381,7 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="" />\r
+                                                <parameter name='prop.wan.ipAddress' value="" />\r
                                                 <parameter name='prop.wan.prefixLength' value="" />\r
                                                 <parameter name='prop.wan.providerIpAddress' value="" />\r
                                                 <parameter name='prop.wan.IpMode' value="DHCP" />\r
@@ -442,23 +440,23 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
             </set>\r
             <set>\r
-                <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                <parameter name='vf-module-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
- + '/service-data/vnfs/vnf/'\r
+ + '/service-data/vnfs/vnf='\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
- + '/vnf-data/vf-modules/vf-module/'\r
+ + '/vnf-data/vf-modules/vf-module='\r
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
- + '/vf-module-data/vf-module-topology/'`"/>\r
+ + '/vf-module-data/vf-module-topology?content=config'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
- + '/service-data/vnfs/vnf/'\r
+ + '/service-data/vnfs/vnf='\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
- + '/vnf-data/vnf-topology/'`"/>\r
+ + '/vnf-data/vnf-topology?content=config'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ value="`'rests/data/GENERIC-RESOURCE-API:services/service='\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
- + '/service-data/service-topology/'`"/>\r
+ + '/service-data/service-topology?content=config'`"/>\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\r