Fix SDWAN peer wise integration testing issues

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sdwan / GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index b730b32..3e8b537 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-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='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -29,6 +29,21 @@
                     </block>\r
                 </outcome>\r
             </switch>\r
+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\r
+                <outcome value='SDWAN-vpn'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+                <outcome value='SDWAN-site'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <set>\r
                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\r
             </set>\r
@@ -58,17 +73,17 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />\r
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="generic-vnf"   \r
-               key="generic-vnf.vnf-id = $prop.vnf-id" >\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                  resource="generic-vnf"\r
+                  key="generic-vnf.vnf-id = $prop.vnf-id" >\r
                 <parameter name="orchestration-status" value="create" />\r
                 <parameter name="vnf-type" value="some vnf-type" />\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
-      force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id\r
+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\r
+                  force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r