Merge "ccvpn integration sdnc issue fix"

Former-commit-id: 541c261114b11ae58c04375c2da965aa2d2ac580

5 files changed, 115 insertions, 53 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 4ce82b1c..2b20f06e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -265,6 +265,16 @@ value="`$connection-attachment-ar-identifiers.`" />
                     </return>

                 </outcome>

             </save>

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

+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND

+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND

+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id" 

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

+                <parameter name="relationship-list.relationship[0].related-to" value="allotted-resource" />

+                <parameter name="relationship-list.relationship[0].related-link" value="`'/business/customers/customer/' + $connection-attachment-topology-operation-input.service-information.global-customer-id + '/service-subscriptions/service-subscription/' + $connection-attachment-topology-operation-input.service-information.subscription-service-type + '/service-instances/service-instance/' + $connection-attachment-topology-operation-input.service-information.service-instance-id + '/allotted-resources/allotted-resource/' + $tmp.ar.allotted-resource-id`" />

+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="allotted-resource.id" />

+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ar.allotted-resource-id`" />

+            </save>

             <return status='success'>

                 <parameter name="ack-final-indicator" value="Y" />

                 <parameter name="error-code" value="200" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
index 98d8bc9e..7fffebd5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
@@ -33,6 +33,7 @@
                 </outcome>

             </get-resource>

             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />

                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index ffd5ee73..db4a18c4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -128,6 +128,7 @@
                                     <parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />

                                 </set>

                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

@@ -148,6 +149,7 @@
                                     <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />

                                 </set>

                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index ef9278b9..3e4a32f2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -447,37 +447,62 @@
                                             </set>

                                         </outcome>

                                         <outcome value='failure'>

-                                            <return status='failure'>

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

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

-                                                <parameter name="error-message" value="Error executing get token rest api" />

-                                            </return>

+                                            <block></block>

                                         </outcome>

                                     </execute>

-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />

-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />

-                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

-                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

-                                        <parameter name="format" value="json"/>

-                                        <parameter name="httpMethod" value="patch"/>

-                                        <parameter name="responsePrefix" value="vpn-result"/>

-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

-                                        <parameter name="trustStorePassword" value="adminadmin"/>

-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

-                                        <parameter name="keyStorePassword" value="adminadmin"/>

-                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                                        <outcome value='failure'>

-                                            <return status='failure'>

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

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

-                                                <parameter name="error-message" value="Error executing Create vpn rest api" />

-                                            </return>

+                                    <switch test="`$prop.sdncRestApi.token_id`">

+                                        <outcome value=''>

+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />

+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />

+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

+                                                <parameter name="format" value="json"/>

+                                                <parameter name="httpMethod" value="patch"/>

+                                                <parameter name="responsePrefix" value="vpn-result"/>

+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

+                                                <parameter name="trustStorePassword" value="adminadmin"/>

+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

+                                                <parameter name="keyStorePassword" value="adminadmin"/>

+                                                <outcome value='failure'>

+                                                    <return status='failure'>

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

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

+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />

+                                                    </return>

+                                                </outcome>

+                                                <outcome value='success'>

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

+                                                </outcome>

+                                            </execute>

                                         </outcome>

-                                        <outcome value='success'>

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

+                                        <outcome value='Other'>

+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />

+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />

+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

+                                                <parameter name="format" value="json"/>

+                                                <parameter name="httpMethod" value="patch"/>

+                                                <parameter name="responsePrefix" value="vpn-result"/>

+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

+                                                <parameter name="trustStorePassword" value="adminadmin"/>

+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

+                                                <parameter name="keyStorePassword" value="adminadmin"/>

+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

+                                                <outcome value='failure'>

+                                                    <return status='failure'>

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

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

+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />

+                                                    </return>

+                                                </outcome>

+                                                <outcome value='success'>

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

+                                                </outcome>

+                                            </execute>

                                         </outcome>

-                                    </execute>

+                                    </switch>

                                     <set>

                                         <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />

                                     </set>

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 4626b3c3..9a334655 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -291,36 +291,60 @@
                                                             </set>

                                                         </outcome>

                                                         <outcome value='failure'>

-                                                            <return status='failure'>

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

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

-                                                                <parameter name="error-message" value="Error executing get token rest api" />

-                                                            </return>

+                                                            <block></block>

                                                         </outcome>

                                                     </execute>

-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />

-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

-                                                        <parameter name="format" value="json"/>

-                                                        <parameter name="httpMethod" value="delete"/>

-                                                        <parameter name="responsePrefix" value="vpn-result"/>

-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

-                                                        <parameter name="trustStorePassword" value="adminadmin"/>

-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

-                                                        <parameter name="keyStorePassword" value="adminadmin"/>

-                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                                                        <outcome value='failure'>

-                                                            <return status='failure'>

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

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

-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />

-                                                            </return>

+                                                    <switch test="`$prop.sdncRestApi.token_id`">

+                                                        <outcome value=''>

+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />

+                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

+                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

+                                                                <parameter name="format" value="json"/>

+                                                                <parameter name="httpMethod" value="delete"/>

+                                                                <parameter name="responsePrefix" value="vpn-result"/>

+                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

+                                                                <parameter name="trustStorePassword" value="adminadmin"/>

+                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

+                                                                <parameter name="keyStorePassword" value="adminadmin"/>

+                                                                <outcome value='failure'>

+                                                                    <return status='failure'>

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

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

+                                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />

+                                                                    </return>

+                                                                </outcome>

+                                                                <outcome value='success'>

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

+                                                                </outcome>

+                                                            </execute>

                                                         </outcome>

-                                                        <outcome value='success'>

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

+                                                        <outcome value='Other'>

+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />

+                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

+                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

+                                                                <parameter name="format" value="json"/>

+                                                                <parameter name="httpMethod" value="delete"/>

+                                                                <parameter name="responsePrefix" value="vpn-result"/>

+                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

+                                                                <parameter name="trustStorePassword" value="adminadmin"/>

+                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

+                                                                <parameter name="keyStorePassword" value="adminadmin"/>

+                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

+                                                                <outcome value='failure'>

+                                                                    <return status='failure'>

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

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

+                                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />

+                                                                    </return>

+                                                                </outcome>

+                                                                <outcome value='success'>

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

+                                                                </outcome>

+                                                            </execute>

                                                         </outcome>

-                                                    </execute>

+                                                    </switch>

                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 

       key='vpn-binding.vpn-id = $tmp.vpn-name' >

                                                         <outcome value='failure'>