X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml;h=3c4292539dc9a2f1c84d54fc1ac3c45a33caa50c;hb=a3fc5687fdd9b8d89fa36019d6e61eb2d22f8c27;hp=259691f92935578e31048485d2da62180950f582;hpb=284450cd6da9aabcb9817f22b606d6f149d3d8df;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index 259691f9..3c429253 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -1783,25 +1783,18 @@
                                                                                                                                                         </outcome>
                                                                                                                                                         <outcome value='success'>
                                                                                                                                                             <block atomic="true">
-                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
-                                                                                                                                                                    <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'`" />
+                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.the-connectivity.etht-svc-name`" />
                                                                                                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
                                                                                                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
                                                                                                                                                                     <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
                                                                                                                                                                     <parameter name="format" value="json" />
-                                                                                                                                                                    <parameter name="httpMethod" value="post" />
+                                                                                                                                                                    <parameter name="httpMethod" value="delete" />
                                                                                                                                                                     <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="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                                                                    <parameter name="version" value="`$project.version`" />
-                                                                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                                                                                    <parameter name="responsePrefix" value="ethdelete-result"/>
                                                                                                                                                                 </execute>
                                                                                                                                                             </block>
                                                                                                                                                         </outcome>
@@ -2008,7 +2001,21 @@
                                                                                                                                                                                                                                 </return>
                                                                                                                                                                                                                             </outcome>
                                                                                                                                                                                                                             <outcome value='success'>
-                                                                                                                                                                                                                                <block atomic="true"></block>
+                                                                                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                                                                                        <parameter name="format" value="json" />
+                                                                                                                                                                                                                                        <parameter name="httpMethod" value="delete" />
+                                                                                                                                                                                                                                        <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="responsePrefix" value="ethdelete-result"/>
+                                                                                                                                                                                                                                    </execute>
+                                                                                                                                                                                                                                </block>
                                                                                                                                                                                                                             </outcome>
                                                                                                                                                                                                                         </execute>
                                                                                                                                                                                                                     </outcome>
@@ -2150,7 +2157,21 @@
                                                                                                                                                                                                         </return>
                                                                                                                                                                                                     </outcome>
                                                                                                                                                                                                     <outcome value='success'>
-                                                                                                                                                                                                        <block atomic="true"></block>
+                                                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                                                                <parameter name="format" value="json" />
+                                                                                                                                                                                                                <parameter name="httpMethod" value="delete" />
+                                                                                                                                                                                                                <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="responsePrefix" value="ethdelete-result"/>
+                                                                                                                                                                                                            </execute>
+                                                                                                                                                                                                        </block>
                                                                                                                                                                                                     </outcome>
                                                                                                                                                                                                 </execute>
                                                                                                                                                                                             </outcome>
@@ -2167,26 +2188,6 @@
                                                                                                                                                             </for>
                                                                                                                                                             <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                     key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'></delete>
-                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
-                                                                                                                                                                <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.domainConn.user`" />
-                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.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="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                                                                <parameter name="version" value="`$project.version`" />
-                                                                                                                                                                <parameter name="mode" value="sync" />
-                                                                                                                                                                <parameter name="responsePrefix" value="restapi-result"/>
-                                                                                                                                                            </execute>
                                                                                                                                                         </block>
                                                                                                                                                     </outcome>
                                                                                                                                                 </switch>