X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fp2p_eline%2FGENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml;h=599cd075086e7ae54baac44057e458ce0f190f42;hb=51946551fe9016b38ba03747a3376febf7124b8e;hp=78ec3179da45c38af4afe925df737ea1edcb27fe;hpb=2889b7c726947c26a03ed83bc49169c4b41e36d4;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
index 78ec3179..599cd075 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
@@ -132,27 +132,43 @@
                                                                     <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
                                                                         <outcome value='Other'>
                                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
-                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
                                                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
                                                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
                                                                                 <parameter name="format" value="json"/>
                                                                                 <parameter name="httpMethod" value="delete"/>
-                                                                                <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                <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 decoloring UNI rest api" />
-                                                                                    </return>
-                                                                                </outcome>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <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'></outcome>
                                                                                 <outcome value='success'>
-                                                                                    <block></block>
+                                                                                    <block>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >
+                                                                                            <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                            <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                            <parameter name="format" value="json" />
+                                                                                            <parameter name="httpMethod" value="post" />
+                                                                                            <!--<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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
+                                                                                            <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                            <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
+                                                                                            <parameter name="version" value="`$project.version`" />
+                                                                                            <parameter name="mode" value="sync" />
+                                                                                            <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                        </execute>
+                                                                                    </block>
                                                                                 </outcome>
                                                                             </execute>
                                                                         </outcome>