From c14f920415db0de169e0826e0d746cf80757b1f4 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 2 Mar 2022 16:32:14 -0500
Subject: Sending "subscribe" command to a restconf server to receive event
 notifications. Implementing a callback DG to be called by CCSDK upon
 receiving event notifications. Also calling VES to send bandwidth
 information.

Issue-ID: SDNC-1669
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I058c405a14d78e264761367dd4b46d6e9a600182

Former-commit-id: 13b89ec32d7d0074117b3f136800bc93f67bf0f8
---
 ...logy-operation-cll-F1-Activate-w-Protection.xml | 58 +++++++++++++
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml | 98 ++++++++++++++++------
 ...ology-operation-cll-callbackdg-notification.xml | 62 ++++++++++++++
 ...E-API_cll-vnf-topology-operation-cll-delete.xml | 43 +++++++++-
 4 files changed, 236 insertions(+), 25 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
index 97b72469..4f20a3fd 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
@@ -799,6 +799,64 @@
                                                                                 <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
                                                                                 <parameter name='operational-status' value='Activated' />
                                                                             </update>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="post"/>
+                                                                                <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"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-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="deviceIp" value="192.168.198.6" />-->
+                                                                                <!--<parameter name="devicePort" value="18181" />-->
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <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>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <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="get" />
+                                                                                <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="notification-get-result"/>
+                                                                            </execute>
                                                                         </block>
                                                                     </outcome>
                                                                 </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index 662c46a9..142ea566 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -549,34 +549,25 @@
                                                                         </get-resource>
                                                                         <switch test="`$tmp.aai.uni.type`">
                                                                             <outcome value='leaf'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='root'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='root-secondary'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='Other'>
                                                                                 <block></block>
@@ -770,6 +761,7 @@
                                                             <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
                                                             <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
                                                             <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                            <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                             <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
                                                             <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
                                                             <!--<parameter name='index-number' value='0' />-->
@@ -801,6 +793,64 @@
                                                                         <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
                                                                         <parameter name='operational-status' value='Activated' />
                                                                     </update>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="post"/>
+                                                                        <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"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-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="deviceIp" value="192.168.198.6" />-->
+                                                                        <!--<parameter name="devicePort" value="18181" />-->
+                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                        <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>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                        <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="get" />
+                                                                        <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="notification-get-result"/>
+                                                                    </execute>
                                                                 </block>
                                                             </outcome>
                                                         </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
new file mode 100644
index 00000000..c71b7aa3
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
@@ -0,0 +1,62 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>
+        <block atomic="true">
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="CallBack DG For SSE CONNECTION is called"/>
+                <!--<parameter name="field2" value="`$rcvdNotif`"/>-->
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->
+                <parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />
+                <parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />
+                <parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />
+                <parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />
+            </set>
+            <!--<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"-->
+            <!-- key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->
+            <!--	AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->
+            <!--	  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->
+            <!--	  AND service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
+                  key="service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">
+                <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
+            </save>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="eventId-uuid"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="eventName-uuid"/>
+            </execute>
+            <set>
+                <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
+                <parameter name='eventNameUuid' value='`$eventName-uuid`' />
+                <parameter name='cclId' value='`$rcvd-service-instance-id`' />
+                <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
+                <parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`" />
+                <parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />
+                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />-->
+                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />-->
+                <parameter name="format" value="json"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name="responsePrefix" value="ves-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"/>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
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 1fee37b1..259691f9 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
@@ -1782,7 +1782,28 @@
                                                                                                                                                             </return>
                                                                                                                                                         </outcome>
                                                                                                                                                         <outcome value='success'>
-                                                                                                                                                            <block atomic="true"></block>
+                                                                                                                                                            <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'`" />
+                                                                                                                                                                    <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>
                                                                                                                                                     </execute>
                                                                                                                                                 </block>
@@ -2146,6 +2167,26 @@
                                                                                                                                                             </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>
-- 
cgit 1.2.3-korg