X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsotn%2FGENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml;h=9a3346557e22318734b8424377e89f038fb22cb9;hb=8bc1837ee0ca323786f0de34ad9bb6d9a755770a;hp=4626b3c3c446aefe3c348dc8c4b26d5ce8947ed1;hpb=63fa3bb3d0293c5e171a98ac0c5aa775af1c3bc0;p=sdnc%2Foam.git

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