Fix SDWAN peer wise integration testing issues

SDWAN lan-port-config create,activate DGs are
fixed with valid request-action and updated
service-data with response-id returned from
SDWAN controller

Change-Id: Ib4067d4de257c64f81b4e70584bcf26c87bbaa04
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: 08d1ca8e484cab832ce1f54cc36539888d77b08a

1 files changed, 25 insertions, 10 deletions

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 b730b324..3e8b537b 100644
--- 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

-    xmlns='http://www.onap.org/sdnc/svclogic'

-    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}'>

+        xmlns='http://www.onap.org/sdnc/svclogic'

+        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}'>

     <method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>

         <block atomic="true">

             <switch test='`$service-data.vnfs.vnf_length`'>

@@ -29,6 +29,21 @@
                     </block>

                 </outcome>

             </switch>

+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>

+                <outcome value='SDWAN-vpn'>

+                    <block atomic="true"></block>

+                </outcome>

+                <outcome value='SDWAN-site'>

+                    <block atomic="true"></block>

+                </outcome>

+                <outcome value='Other'>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />

+                    </return>

+                </outcome>

+            </switch>

             <set>

                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />

             </set>

@@ -58,17 +73,17 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />

                 <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/'` " />

             </set>

-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

-	resource="generic-vnf"   

-		key="generic-vnf.vnf-id = $prop.vnf-id" >

+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"

+                  resource="generic-vnf"

+                  key="generic-vnf.vnf-id = $prop.vnf-id" >

                 <parameter name="orchestration-status" value="create" />

                 <parameter name="vnf-type" value="some vnf-type" />

             </save>

-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 

-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id 

-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 

-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 

-      force="true" pfx="tmp.AnAI-data">

+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'

+                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id

+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id

+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'

+                  force="true" pfx="tmp.AnAI-data">

                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />

                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />

                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />