From b2cd0a93d044558cbf2c95353a6194e50cb6a74e Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Mon, 19 Nov 2018 17:56:22 +0530
Subject: ccvpn integration sdnc issue fix

Fixed couple of issues
1. SDWAN connectivity request was failing due
   to empty request body in tenant authorization
   put request.
2. Get token issue fixed for sotn DG's
3. SDWAN Allotted resource relationship with parent
   service instance ID is missing, added it.

Change-Id: Ib6451c93e6a6b7886cd5614d064270ff9182030b
Issue-ID: SDNC-527
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 1b16252e07e358568342480d4604f50f226860b5
---
 ...sotn-attachment-topology-operation-activate.xml | 79 ++++++++++++++--------
 ...tn-attachment-topology-operation-deactivate.xml | 76 ++++++++++++++-------
 2 files changed, 102 insertions(+), 53 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/sotn')

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'>
-- 
cgit 1.2.3-korg