integration test issues fix for sdwan and sotn

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index 07cd718..553852d 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -94,19 +94,22 @@
                                 <set>\r
                                     <parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />\r
                                 </set>\r
-                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="service-subscription" \r
-        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \r
-        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\r
-                                    <parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' />\r
-                                </save>\r
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\r
+                                    <parameter name="source" value='`$prop.customer-id`'/>\r
+                                    <parameter name="outputPath" value="tmp.userAccountEmail"/>\r
+                                    <parameter name="target" value="@test.com"/>\r
+                                </execute>\r
+                                <set>\r
+                                    <parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />\r
+                                    <parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />\r
+                                </set>\r
                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-tenant.json'`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats'`" />\r
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                                     <parameter name="format" value="json"/>\r
-                                    <parameter name="httpMethod" value="put"/>\r
+                                    <parameter name="httpMethod" value="post"/>\r
                                     <parameter name="responsePrefix" value="tenant-result"/>\r
                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
                                     <parameter name="trustStorePassword" value="adminadmin"/>\r
@@ -114,11 +117,18 @@
                                     <parameter name="keyStorePassword" value="adminadmin"/>\r
                                     <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                 </execute>\r
+                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="service-subscription" \r
+        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \r
+        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\r
+                                    <parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />\r
+                                    <!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->\r
+                                </update>\r
                                 <set>\r
                                     <parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\r
                                 </set>\r
                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats/authorization/' + $prop.tenant-id`" />\r
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                                     <parameter name="format" value="json"/>\r
@@ -133,9 +143,24 @@
                             </block>\r
                         </outcome>\r
                         <outcome value='Other'>\r
-                            <set>\r
-                                <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\r
-                            </set>\r
+                            <block atomic="true">\r
+                                <set>\r
+                                    <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\r
+                                </set>\r
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />\r
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                    <parameter name="format" value="json"/>\r
+                                    <parameter name="httpMethod" value="put"/>\r
+                                    <parameter name="responsePrefix" value="tenant-result"/>\r
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
+                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                </execute>\r
+                            </block>\r
                         </outcome>\r
                     </switch>\r
                 </outcome>\r
@@ -165,7 +190,7 @@
             </block>\r
             <block atomic="true">\r
                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />\r
+                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`" />\r
                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />\r
                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
@@ -183,7 +208,7 @@
                     <parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\r
                 </set>\r
                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
+                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`" />\r
                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`" />\r
                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r