diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2022-05-06 17:30:56 -0400 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2022-05-06 17:34:19 -0400 |
| commit | a3fc5687fdd9b8d89fa36019d6e61eb2d22f8c27 (patch) | |
| tree | 40396c7cdd88bb706fc94c1822e1d4011ff3aac6 /platform-logic/generic-resource-api/src/main/xml | |
| parent | 284450cd6da9aabcb9817f22b606d6f149d3d8df (diff) | |
Temporarily removing the 'unsubscribe' operation from CLL deletion call flow.
Issue-ID: SDNC-1694
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I3f093db17df05e5227a9e52f93f64fa9bcbd9a7c
Former-commit-id: 9682f3bdcdfdcfb31f0279cdf0485a535101dae7
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml | 67 |
1 files changed, 34 insertions, 33 deletions
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> |