Fix SDWAN peer wise integration testing issues

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
index d253871..d1578ec 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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}'>\r
     <method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -85,8 +85,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
-                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\r
-                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
             </set>\r
             <set>\r
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
@@ -98,13 +98,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/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[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
@@ -113,8 +113,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'\r
+                  key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
                 <parameter name="lan-port-config-id" value="`$prop.vf-id`" />\r
                 <parameter name="device-id" value='`$prop.lan.deviceName`' />\r
                 <parameter name="port-switch" value='`$prop.lan.portSwitch`' />\r
@@ -128,9 +128,9 @@
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\r
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
-      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
-      force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'\r
+                  key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'\r
+                  force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="lan-port-config" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />\r
@@ -143,5 +143,4 @@
             </return>\r
         </block>\r
     </method>\r
-</service-logic>\r
-\r
+</service-logic>
\ No newline at end of file