summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPérez Caparrós David, INI-INO-ECO-HCT <David.PerezCaparros@swisscom.com>2019-06-09 17:04:41 +0200
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-06-09 23:16:16 +0200
commitafdeaf416ebe7e4715e2662018d766473b74bf2b (patch)
tree9595dd30b1e0a073d917bfd6124e071310a7b598
parentccd5410e744e9a75b3e3747bae418f506b502e00 (diff)
Add logic to delete resource also from AAI1.5.4
Delete resources (AccessConnectivity, InternetProfile) from AAI in delete operation Issue-ID: SDNC-791 Signed-off-by: Pérez Caparrós David <David.PerezCaparros@swisscom.com> Change-Id: I4a3eb7880e3736656acf30342ac98aa84cd62afb Former-commit-id: 907ae4554256a7f01fe3b2ecd869dcd4dff6a01f
Diffstat
-rw-r--r--SdncReports/SdncReportsApi/pom.xml4
-rw-r--r--SdncReports/SdncReportsDao/pom.xml4
-rw-r--r--SdncReports/pom.xml2
-rw-r--r--admportal/pom.xml2
-rw-r--r--configbackuprestore/getBackupVnfDetailService/pom.xml4
-rw-r--r--configbackuprestore/pom.xml2
-rw-r--r--configbackuprestore/vnfconfigbackupservice/pom.xml8
-rw-r--r--configbackuprestore/vnfconfigreportsservice/pom.xml4
-rw-r--r--data-migrator/pom.xml4
-rw-r--r--installation/admportal/pom.xml2
-rw-r--r--installation/ansible-server/pom.xml2
-rw-r--r--installation/dmaap-listener/pom.xml2
-rw-r--r--installation/pom.xml2
-rw-r--r--installation/sdnc/pom.xml2
-rw-r--r--installation/ueb-listener/pom.xml2
-rw-r--r--platform-logic/datachange/pom.xml2
-rw-r--r--platform-logic/generic-resource-api/pom.xml2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json1494
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json714
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml279
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml124
-rw-r--r--platform-logic/installer/pom.xml2
-rw-r--r--platform-logic/lcm/pom.xml2
-rw-r--r--platform-logic/pom.xml2
-rw-r--r--platform-logic/restapi-templates/pom.xml2
-rw-r--r--platform-logic/restconfapi-yang/pom.xml2
-rw-r--r--platform-logic/setup/pom.xml2
-rw-r--r--platform-logic/vnfapi/pom.xml2
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties2
30 files changed, 1701 insertions, 978 deletions
diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index 9363761e..81dd2e90 100644
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -4,12 +4,12 @@
<packaging>jar</packaging>
<artifactId>SdncReportsApi</artifactId>
<groupId>org.onap.sdnc.oam</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index ad422320..d863690b 100644
--- a/SdncReports/SdncReportsDao/pom.xml
+++ b/SdncReports/SdncReportsDao/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReportsDao</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index a03e5c80..491e449a 100644
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: SdncReports</name>
diff --git a/admportal/pom.xml b/admportal/pom.xml
index e3c86a65..9ccb8037 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>admportal</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: admportal</name>
diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index 1f484b85..ce8b2660 100644
--- a/configbackuprestore/getBackupVnfDetailService/pom.xml
+++ b/configbackuprestore/getBackupVnfDetailService/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index eeb01716..9db1972d 100644
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup</name>
<packaging>pom</packaging>
diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index 11bea660..dc216f9a 100644
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigbackupservice</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
<url>http://maven.apache.org</url>
@@ -20,13 +20,13 @@
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index 745d1f1d..779af750 100644
--- a/configbackuprestore/vnfconfigreportsservice/pom.xml
+++ b/configbackuprestore/vnfconfigreportsservice/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml
index e720fe3f..cff4a0ba 100644
--- a/data-migrator/pom.xml
+++ b/data-migrator/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>sdnc-oam</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>data-migrator</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sdnc-oam :: data-migrator</name>
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 355e0fbd..aa0d7a04 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates admportal Docker container</description>
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 360a89de..5c38a1a6 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates ansible-server Docker container</description>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 36e81d4f..5c2bfedb 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-dmaap-listener</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates dmaap-listener Docker container</description>
diff --git a/installation/pom.xml b/installation/pom.xml
index 5259d1b5..f305beff 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation</name>
<description>Installs SDN-C on local file system</description>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index f1bfd939..3a92ce7d 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates SDN Controller Docker container</description>
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 65eefac5..828df7c8 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ueb-listener</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates ueb-listener Docker container</description>
diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index 742ac471..4c93caab 100644
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-datachange</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index c3d290ab..aa65e998 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-generic-resource-api</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
index 444e2dc6..ef738ca4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
@@ -1,567 +1,929 @@
-[
- {
- "id": "3e7ef4ac.b2e17c",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 704.53125,
- "y": 248.03125,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "cbfbc44.cd69838"
- ]
- ]
- },
- {
- "id": "cbfbc44.cd69838",
- "type": "service-logic",
- "name": "GENERIC-RESOURCE-API ${project.version}",
- "module": "GENERIC-RESOURCE-API",
- "version": "${project.version}",
- "comments": "",
- "xml": "<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}'>",
- "outputs": 1,
- "x": 1092.5311317443848,
- "y": 248.03125476837158,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "8072076.84dccf8"
- ]
- ]
- },
- {
- "id": "8072076.84dccf8",
- "type": "method",
- "name": "method:bbs-access-connectivity-network-topology-operation-delete-huawei",
- "xml": "<method rpc='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1055.5311317443848,
- "y": 367.0312547683716,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "9a3cc53d.6e79d8"
- ]
- ]
- },
- {
- "id": "9a3cc53d.6e79d8",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1453.5312385559082,
- "y": 366.0312547683716,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "d6360288.4527f",
- "29565532.cf8cca",
- "79257394.2307bc",
- "bfbc37d6.3aa9c8",
- "5837e3f.e88671c",
- "ccc27501.c46688",
- "afc719e1.eb7f48"
- ]
- ]
- },
- {
- "id": "d6360288.4527f",
- "type": "execute",
- "name": "excute:readProperties",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1895.531536102295,
- "y": 220.14233589172363,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- },
- {
- "id": "ccc27501.c46688",
- "type": "for",
- "name": "for:network-input-paramters",
- "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1899.5315589904785,
- "y": 442.0311813354492,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "430a13df.a78e9c"
- ]
- ]
- },
- {
- "id": "5837e3f.e88671c",
- "type": "execute",
- "name": "execute:querryTokenID",
- "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n <parameter name=\"format\" value=\"json\"/>\n <parameter name=\"httpMethod\" value=\"put\"/>\n <parameter name=\"responsePrefix\" value=\"token-result\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1890.5315589904785,
- "y": 352.03125762939453,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "632411.2d700bf",
- "df6b78a.61b9688"
- ]
- ]
- },
- {
- "id": "df6b78a.61b9688",
- "type": "outcome",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2189.698184967041,
- "y": 348.28125762939453,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "c7e8c95e.bd9528"
- ]
- ]
- },
- {
- "id": "632411.2d700bf",
- "type": "outcome",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2185.698184967041,
- "y": 242.2812271118164,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "da5c448.537c3b8"
- ]
- ]
- },
- {
- "id": "53a754bd.11dc7c",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n",
- "comments": "",
- "x": 2732.8119888305664,
- "y": 290.64491176605225,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "54233be2.f30004",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 2556.531566619873,
- "y": 291.031213760376,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "53a754bd.11dc7c"
- ]
- ]
- },
- {
- "id": "c7e8c95e.bd9528",
- "type": "switchNode",
- "name": "switch:token ",
- "xml": "<switch test='`$token-result.accessSession`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2388.531566619873,
- "y": 349.031213760376,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "54233be2.f30004",
- "2525724.318638e"
- ]
- ]
- },
- {
- "id": "2525724.318638e",
- "type": "outcome",
- "name": "Other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2557.531566619873,
- "y": 348.031213760376,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "b5f78ce0.e4e8f"
- ]
- ]
- },
- {
- "id": "b5f78ce0.e4e8f",
- "type": "set",
- "name": "set:token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
- "comments": "",
- "x": 2732.0315589904785,
- "y": 347.28125762939453,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "e0b6a2ae.458e8",
- "type": "record",
- "name": "log file",
- "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Get token rest api\" />\n <parameter name=\"field3\" value=\"`$token-result.accessSession`\" />\n ",
- "comments": "",
- "outputs": 1,
- "x": 2943.5315589904785,
- "y": 345.0311965942383,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- },
- {
- "id": "bfbc37d6.3aa9c8",
- "type": "set",
- "name": "set:variables",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n",
- "comments": "",
- "x": 1861.531536102295,
- "y": 140.0314121246338,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "afc719e1.eb7f48",
- "type": "execute",
- "name": "execute:deleteAccessConnectivityService",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`\" />\n <parameter name=\"httpMethod\" value=\"get\"/>\n <parameter name=\"contentType\" value=\"application/x-www-form-urlencoded\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>\n <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1951.5318222045898,
- "y": 622.0313603878021,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "c6939dae.0ae37",
- "7116ae31.13271"
- ]
- ]
- },
- {
- "id": "c6939dae.0ae37",
- "type": "outcome",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2256.531837463379,
- "y": 562.0313415527344,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "c09b1f3e.53091"
- ]
- ]
- },
- {
- "id": "7116ae31.13271",
- "type": "outcome",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2256.531810760498,
- "y": 621.0313413143158,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "1c65ae1f.8b01d2"
- ]
- ]
- },
- {
- "id": "b5b74804.ae8938",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 2742.5319213867188,
- "y": 518.031275510788,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "19c841bb.b9c39e"
- ]
- ]
- },
- {
- "id": "19c841bb.b9c39e",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"$network-input-parameters.param[$idx].name +' value is null, please check it.'\" />\n",
- "comments": "",
- "x": 2927.4408683776855,
- "y": 517.9403285980225,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "430a13df.a78e9c",
- "type": "switchNode",
- "name": "switch:serviceID",
- "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'serviceID'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2174.5315856933594,
- "y": 441.0312690734863,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "804331b5.825a1"
- ]
- ]
- },
- {
- "id": "804331b5.825a1",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2347.531470298767,
- "y": 440.0312671661377,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "1d00164b.c74e1a"
- ]
- ]
- },
- {
- "id": "b8311cf7.388d1",
- "type": "set",
- "name": "set:serviceID",
- "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />\n",
- "comments": "",
- "x": 2918.531436920166,
- "y": 439.6312789916992,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "1d00164b.c74e1a",
- "type": "switchNode",
- "name": "switch:serviceID value",
- "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2528.679630279541,
- "y": 439.80895233154297,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "acaa6a13.89b9f8",
- "b5b74804.ae8938"
- ]
- ]
- },
- {
- "id": "acaa6a13.89b9f8",
- "type": "outcome",
- "name": "Other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2736.679630279541,
- "y": 440.80895233154297,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "b8311cf7.388d1"
- ]
- ]
- },
- {
- "id": "29565532.cf8cca",
- "type": "call",
- "name": "call:validate-bbs-network-input-parameters",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1973.031162261963,
- "y": 59.03126335144043,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- },
- {
- "id": "1c65ae1f.8b01d2",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 2433.031608581543,
- "y": 622.0315194129944,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "cced1fd6.04da4"
- ]
- ]
- },
- {
- "id": "cced1fd6.04da4",
- "type": "switchNode",
- "name": "switch:service-result",
- "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2651.0314865112305,
- "y": 621.0313668251038,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "4dce053b.3feafc",
- "cf917e9d.94b86"
- ]
- ]
- },
- {
- "id": "4dce053b.3feafc",
- "type": "outcome",
- "name": "Other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2885.0315322875977,
- "y": 622.0313267707825,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "7c2264f5.7e8cec"
- ]
- ]
- },
- {
- "id": "cf917e9d.94b86",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 2887.0315322875977,
- "y": 708.0313267707825,
- "z": "9458f851.9a2498",
- "wires": [
- [
- "523726af.0e2f78"
- ]
- ]
- },
- {
- "id": "7f7a43fa.cb783c",
- "type": "record",
- "name": "log error",
- "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService falied!\" />\n <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n ",
- "comments": "",
- "outputs": 1,
- "x": 3325.03169631958,
- "y": 609.031343460083,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- },
- {
- "id": "79257394.2307bc",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
- "comments": "",
- "x": 1853.0313758850098,
- "y": 760.0312690734863,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "7c2264f5.7e8cec",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />\n\n",
- "comments": "",
- "x": 3085.03120803833,
- "y": 622.0312614440918,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "523726af.0e2f78",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 3071.0312271118164,
- "y": 707.3039350509644,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- },
- {
- "id": "da5c448.537c3b8",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n",
- "comments": "",
- "x": 2378.196044921875,
- "y": 243.15057373046875,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "c09b1f3e.53091",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call deleteAccessConnectivityService\" />\n",
- "comments": "",
- "x": 2426.803955078125,
- "y": 560.3948364257812,
- "z": "9458f851.9a2498",
- "wires": []
- },
- {
- "id": "3a60417f.fe190e",
- "type": "record",
- "name": "log file",
- "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n ",
- "comments": "",
- "outputs": 1,
- "x": 3290.031753540039,
- "y": 705.0314111709595,
- "z": "9458f851.9a2498",
- "wires": [
- []
- ]
- }
+[
+ {
+ "id": "1fe4d356.7d1a4d",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 114.00390625,
+ "y": 228.9999885559082,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "33702a3.e0f9fd6"
+ ]
+ ]
+ },
+ {
+ "id": "33702a3.e0f9fd6",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<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}'>",
+ "outputs": 1,
+ "x": 502.00378799438477,
+ "y": 228.99999332427979,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "b821ff4a.2c1fa"
+ ]
+ ]
+ },
+ {
+ "id": "b821ff4a.2c1fa",
+ "type": "method",
+ "name": "method:bbs-access-connectivity-network-topology-operation-delete-huawei",
+ "xml": "<method rpc='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 465.00378799438477,
+ "y": 347.9999933242798,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "8a087462.b39fd8"
+ ]
+ ]
+ },
+ {
+ "id": "8a087462.b39fd8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 863.0038948059082,
+ "y": 346.9999933242798,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "b571ef0e.fb883",
+ "e6661884.b85a18",
+ "8d5fd62a.ea1838",
+ "edca7b4c.628428",
+ "a1566932.4a14e8",
+ "8cd22f67.ca85",
+ "7ea1fa62.bd7864",
+ "74da4578.69488c",
+ "b3adae43.1a849"
+ ]
+ ]
+ },
+ {
+ "id": "b571ef0e.fb883",
+ "type": "execute",
+ "name": "excute:readProperties",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1305.004192352295,
+ "y": 201.11107444763184,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "8cd22f67.ca85",
+ "type": "for",
+ "name": "for:network-input-paramters",
+ "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1309.0042152404785,
+ "y": 422.9999198913574,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "fb4eabbb.3b7248"
+ ]
+ ]
+ },
+ {
+ "id": "a1566932.4a14e8",
+ "type": "execute",
+ "name": "execute:querryTokenID",
+ "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n <parameter name=\"format\" value=\"json\"/>\n <parameter name=\"httpMethod\" value=\"put\"/>\n <parameter name=\"responsePrefix\" value=\"token-result\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1300.0042152404785,
+ "y": 332.99999618530273,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "b85b7ef3.4a5bd",
+ "608c2c9a.b06c14"
+ ]
+ ]
+ },
+ {
+ "id": "608c2c9a.b06c14",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1599.170841217041,
+ "y": 329.24999618530273,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "8526ecf2.42dcd"
+ ]
+ ]
+ },
+ {
+ "id": "b85b7ef3.4a5bd",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1595.170841217041,
+ "y": 223.2499656677246,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "a6f5bdc0.ca847"
+ ]
+ ]
+ },
+ {
+ "id": "7756fd5f.8c2fe4",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n",
+ "comments": "",
+ "x": 2142.2846450805664,
+ "y": 271.61365032196045,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "8a946e8b.a881",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1966.004222869873,
+ "y": 271.9999523162842,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "7756fd5f.8c2fe4"
+ ]
+ ]
+ },
+ {
+ "id": "8526ecf2.42dcd",
+ "type": "switchNode",
+ "name": "switch:token ",
+ "xml": "<switch test='`$token-result.accessSession`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1798.004222869873,
+ "y": 329.9999523162842,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "8a946e8b.a881",
+ "f2c4f3fa.fa28"
+ ]
+ ]
+ },
+ {
+ "id": "f2c4f3fa.fa28",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1967.004222869873,
+ "y": 328.9999523162842,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "34e2fc86.cccd84"
+ ]
+ ]
+ },
+ {
+ "id": "34e2fc86.cccd84",
+ "type": "set",
+ "name": "set:token-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
+ "comments": "",
+ "x": 2141.5042152404785,
+ "y": 328.24999618530273,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "7f008572.ced19c",
+ "type": "record",
+ "name": "log file",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Get token rest api\" />\n <parameter name=\"field3\" value=\"`$token-result.accessSession`\" />\n ",
+ "comments": "",
+ "outputs": 1,
+ "x": 2353.0042152404785,
+ "y": 325.9999351501465,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "edca7b4c.628428",
+ "type": "set",
+ "name": "set:variables",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n",
+ "comments": "",
+ "x": 1271.004192352295,
+ "y": 121.00015068054199,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "b3adae43.1a849",
+ "type": "execute",
+ "name": "execute:deleteAccessConnectivityService",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`\" />\n <parameter name=\"httpMethod\" value=\"get\"/>\n <parameter name=\"contentType\" value=\"application/x-www-form-urlencoded\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>\n <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1361.0044784545898,
+ "y": 603.0000989437103,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "b988b5d0.2516f8",
+ "4fcb328c.8c8d3c"
+ ]
+ ]
+ },
+ {
+ "id": "b988b5d0.2516f8",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1666.004493713379,
+ "y": 543.0000801086426,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "8fd08b44.80a718"
+ ]
+ ]
+ },
+ {
+ "id": "4fcb328c.8c8d3c",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1666.004467010498,
+ "y": 602.000079870224,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "732b9fd0.970c6"
+ ]
+ ]
+ },
+ {
+ "id": "d604a440.b8abb8",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2152.0045776367188,
+ "y": 499.00001406669617,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "f0d17cd2.4c7c1"
+ ]
+ ]
+ },
+ {
+ "id": "f0d17cd2.4c7c1",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"$network-input-parameters.param[$idx].name +' value is null, please check it.'\" />\n",
+ "comments": "",
+ "x": 2336.9135246276855,
+ "y": 498.90906715393066,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "fb4eabbb.3b7248",
+ "type": "switchNode",
+ "name": "switch:serviceID",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'serviceID'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1584.0042419433594,
+ "y": 422.00000762939453,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "36367cd4.1a04e4"
+ ]
+ ]
+ },
+ {
+ "id": "36367cd4.1a04e4",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1757.004126548767,
+ "y": 421.0000057220459,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "d961fc6c.9fcb7"
+ ]
+ ]
+ },
+ {
+ "id": "d96b619c.da3a9",
+ "type": "set",
+ "name": "set:serviceID",
+ "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />\n",
+ "comments": "",
+ "x": 2328.004093170166,
+ "y": 420.6000175476074,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "d961fc6c.9fcb7",
+ "type": "switchNode",
+ "name": "switch:serviceID value",
+ "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1938.152286529541,
+ "y": 420.7776908874512,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "7d48d6fb.074d98",
+ "d604a440.b8abb8"
+ ]
+ ]
+ },
+ {
+ "id": "7d48d6fb.074d98",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2146.152286529541,
+ "y": 421.7776908874512,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "d96b619c.da3a9"
+ ]
+ ]
+ },
+ {
+ "id": "e6661884.b85a18",
+ "type": "call",
+ "name": "call:validate-bbs-network-input-parameters",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1382.503818511963,
+ "y": 40.00000190734863,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "732b9fd0.970c6",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1842.504264831543,
+ "y": 603.0002579689026,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "44aeb9a4.8239d8"
+ ]
+ ]
+ },
+ {
+ "id": "44aeb9a4.8239d8",
+ "type": "switchNode",
+ "name": "switch:service-result",
+ "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2060.5041427612305,
+ "y": 602.000105381012,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "546b6ac8.884354",
+ "dd81919a.ab138"
+ ]
+ ]
+ },
+ {
+ "id": "546b6ac8.884354",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2294.5041885375977,
+ "y": 603.0000653266907,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "cde0380a.e69b48"
+ ]
+ ]
+ },
+ {
+ "id": "dd81919a.ab138",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2296.5041885375977,
+ "y": 689.0000653266907,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "8b2d1b97.9a7e98"
+ ]
+ ]
+ },
+ {
+ "id": "45e5b798.d82a48",
+ "type": "record",
+ "name": "log error",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService falied!\" />\n <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n ",
+ "comments": "",
+ "outputs": 1,
+ "x": 2734.50435256958,
+ "y": 590.0000820159912,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "8d5fd62a.ea1838",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+ "comments": "",
+ "x": 1274.504035949707,
+ "y": 1017.9999990463257,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "cde0380a.e69b48",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />\n\n",
+ "comments": "",
+ "x": 2494.50386428833,
+ "y": 603,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "8b2d1b97.9a7e98",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2480.5038833618164,
+ "y": 688.2726736068726,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "a6f5bdc0.ca847",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n",
+ "comments": "",
+ "x": 1787.668701171875,
+ "y": 224.11931228637695,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "8fd08b44.80a718",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call deleteAccessConnectivityService\" />\n",
+ "comments": "",
+ "x": 1836.276611328125,
+ "y": 541.3635749816895,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "40e5b8d4.405008",
+ "type": "record",
+ "name": "log file",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n ",
+ "comments": "",
+ "outputs": 1,
+ "x": 2699.504409790039,
+ "y": 686.0001497268677,
+ "z": "4da1e057.93c81",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "74da4578.69488c",
+ "type": "update",
+ "name": "deleteResourceAAI",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.accessConnectivityVNFId\">",
+ "comments": "",
+ "outputs": 1,
+ "x": 1290.7539596557617,
+ "y": 958.0039052963257,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "9ad48718.a48378",
+ "f19e3616.a65168"
+ ]
+ ]
+ },
+ {
+ "id": "a5690d23.086bf",
+ "type": "comment",
+ "name": "delete resource from AAI",
+ "info": "",
+ "comments": "",
+ "x": 1304.7539138793945,
+ "y": 919.0039348602295,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "b0cc7a09.a1b0b8",
+ "type": "for",
+ "name": "for relationship-list",
+ "xml": "<for silentFailure='true' index='ridx' start='0' end=\"`$aai.service-instance.relationship-list.relationship_length`\" >\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1908.5041046142578,
+ "y": 809.0040121078491,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "7627454.6354fbc"
+ ]
+ ]
+ },
+ {
+ "id": "ff73aabd.67b448",
+ "type": "comment",
+ "name": "get generic-vnf of type AccessConnectivity",
+ "info": "",
+ "comments": "",
+ "x": 1976.5040130615234,
+ "y": 762.0039348602295,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "7ea1fa62.bd7864",
+ "type": "update",
+ "name": "get AAI service-instance",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-instance\" \n\t\tkey=\"customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\"\n pfx='aai.service-instance' local-only='false' >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1307.5038986206055,
+ "y": 702.0040426254272,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "fe7995d6.38c3f8",
+ "4a7386f6.0cd718"
+ ]
+ ]
+ },
+ {
+ "id": "6bc3fbd4.b813f4",
+ "type": "comment",
+ "name": "fetch relationship-list",
+ "info": "",
+ "comments": "",
+ "x": 1292.5039138793945,
+ "y": 665.0038900375366,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "fe7995d6.38c3f8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1559.5041313171387,
+ "y": 672.0039348602295,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "2a31b9ca.55ee86"
+ ]
+ ]
+ },
+ {
+ "id": "2a31b9ca.55ee86",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+ "comments": "",
+ "x": 1750.5039138793945,
+ "y": 672.0039205551147,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "4a7386f6.0cd718",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1555.7540092468262,
+ "y": 808.7538890838623,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "64a4be69.1880c"
+ ]
+ ]
+ },
+ {
+ "id": "64a4be69.1880c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1720.753978729248,
+ "y": 808.7539043426514,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "b0cc7a09.a1b0b8"
+ ]
+ ]
+ },
+ {
+ "id": "7627454.6354fbc",
+ "type": "for",
+ "name": "for relationship data",
+ "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 2113.754104614258,
+ "y": 808.7539510726929,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "e52ae02e.90c33"
+ ]
+ ]
+ },
+ {
+ "id": "430a4a42.5658e4",
+ "type": "switchNode",
+ "name": "switch vnf-id",
+ "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2379.7539291381836,
+ "y": 811.7539072036743,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "2eef72d5.dfee4e"
+ ]
+ ]
+ },
+ {
+ "id": "2eef72d5.dfee4e",
+ "type": "other",
+ "name": "generic-vnf.vnf-id",
+ "xml": "<outcome value='generic-vnf.vnf-id'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2570.75399017334,
+ "y": 810.7539215087891,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "47eecdf9.b49b94"
+ ]
+ ]
+ },
+ {
+ "id": "47eecdf9.b49b94",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 2757.7538986206055,
+ "y": 810.7539072036743,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "ac1daadf.209048"
+ ]
+ ]
+ },
+ {
+ "id": "ac1daadf.209048",
+ "type": "update",
+ "name": "get AAI generic-vnf",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n pfx='aai.generic-vnf' local-only='false' >",
+ "comments": "",
+ "outputs": 1,
+ "x": 2962.2539596557617,
+ "y": 811.7538919448853,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "a6ab0510.fb39d8"
+ ]
+ ]
+ },
+ {
+ "id": "d31b01f7.54c3",
+ "type": "switchNode",
+ "name": "switch vnf-type",
+ "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3435.75479888916,
+ "y": 885.7539205551147,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "1d80aac5.eefc05"
+ ]
+ ]
+ },
+ {
+ "id": "1d80aac5.eefc05",
+ "type": "other",
+ "name": "AccessConnectivity",
+ "xml": "<outcome value='AccessConnectivity'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3629.754554748535,
+ "y": 879.7539501190186,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "e7551653.b65f38"
+ ]
+ ]
+ },
+ {
+ "id": "e7551653.b65f38",
+ "type": "set",
+ "name": "set AccessConnectivity vnf-id",
+ "xml": "<set>\n<parameter name='prop.bbs.accessConnectivityVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
+ "comments": "",
+ "x": 3873.754066467285,
+ "y": 877.7538747787476,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "f19e3616.a65168",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1508.75390625,
+ "y": 923.00390625,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "1c66ecef.3c69d3"
+ ]
+ ]
+ },
+ {
+ "id": "9ad48718.a48378",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1516.75390625,
+ "y": 983.00390625,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "1c66ecef.3c69d3"
+ ]
+ ]
+ },
+ {
+ "id": "1c66ecef.3c69d3",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+ "comments": "",
+ "x": 1724.75390625,
+ "y": 958.00390625,
+ "z": "4da1e057.93c81",
+ "wires": []
+ },
+ {
+ "id": "e52ae02e.90c33",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 2266.00390625,
+ "y": 845.25390625,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "430a4a42.5658e4"
+ ]
+ ]
+ },
+ {
+ "id": "cbd10002.aaaa7",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 3252.7539443969727,
+ "y": 886.2539205551147,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "d31b01f7.54c3"
+ ]
+ ]
+ },
+ {
+ "id": "a6ab0510.fb39d8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 3155.75390625,
+ "y": 810.00390625,
+ "z": "4da1e057.93c81",
+ "wires": [
+ [
+ "cbd10002.aaaa7"
+ ]
+ ]
+ }
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
index 61ce5ca9..c5d0622a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
@@ -1,229 +1,487 @@
-[
- {
- "id": "714a0239.f58d34",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 899,
- "y": 435,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "34d45d5a.766c6a"
- ]
- ]
- },
- {
- "id": "34d45d5a.766c6a",
- "type": "service-logic",
- "name": "GENERIC-RESOURCE-API ${project.version}",
- "module": "GENERIC-RESOURCE-API",
- "version": "${project.version}",
- "comments": "",
- "xml": "<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}'>",
- "outputs": 1,
- "x": 1206.9996490478516,
- "y": 435.0000219345093,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "c113efec.233458"
- ]
- ]
- },
- {
- "id": "c113efec.233458",
- "type": "method",
- "name": "method:bbs-internet-profile-network-topology-operation-delete-huawei",
- "xml": "<method rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1204.9996337890625,
- "y": 631.0000982284546,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "60fe006b.0de45"
- ]
- ]
- },
- {
- "id": "60fe006b.0de45",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1611.9998626708984,
- "y": 632.0000619888306,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "aac40cc8.0649f",
- "4ecef0e8.b1d6b8",
- "ac3e26be.750fd"
- ]
- ]
- },
- {
- "id": "aac40cc8.0649f",
- "type": "execute",
- "name": "execute:DeleteInternetProfileInstance",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2000.6509246826172,
- "y": 635.9608850479126,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "eebf5d0c.1b2fd8",
- "ffc4504a.e72108"
- ]
- ]
- },
- {
- "id": "ffc4504a.e72108",
- "type": "outcome",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2301.9839057922363,
- "y": 635.9608850479126,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "622738c2.3df3e"
- ]
- ]
- },
- {
- "id": "eebf5d0c.1b2fd8",
- "type": "outcome",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2310.983818054199,
- "y": 710.9608869552612,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "cbf86fcd.ce3b38"
- ]
- ]
- },
- {
- "id": "cbf86fcd.ce3b38",
- "type": "switchNode",
- "name": "switch:service-result",
- "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 2545.9999389648438,
- "y": 710.0001821517944,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "701b16da.9a2e28",
- "6f5fe7b5.9c0d48"
- ]
- ]
- },
- {
- "id": "622738c2.3df3e",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call DeleteInternetProfileInstance\" />\n",
- "comments": "",
- "x": 2810.9175186157227,
- "y": 636.2504329681396,
- "z": "6516a9f0.ec0d58",
- "wires": []
- },
- {
- "id": "701b16da.9a2e28",
- "type": "outcome",
- "name": "Other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2772.0002784729004,
- "y": 711.0002756118774,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "6ff25d76.5ec334"
- ]
- ]
- },
- {
- "id": "6f5fe7b5.9c0d48",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 2781.999984741211,
- "y": 797.0001420974731,
- "z": "6516a9f0.ec0d58",
- "wires": [
- [
- "c34bbdbf.da607"
- ]
- ]
- },
- {
- "id": "6ff25d76.5ec334",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
- "comments": "",
- "x": 2958.4999465942383,
- "y": 711.0001125335693,
- "z": "6516a9f0.ec0d58",
- "wires": []
- },
- {
- "id": "c34bbdbf.da607",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 2940.1666145324707,
- "y": 798.0001173019409,
- "z": "6516a9f0.ec0d58",
- "wires": [
- []
- ]
- },
- {
- "id": "4ecef0e8.b1d6b8",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
- "comments": "",
- "x": 1920.4999160766602,
- "y": 720.0001831054688,
- "z": "6516a9f0.ec0d58",
- "wires": []
- },
- {
- "id": "ac3e26be.750fd",
- "type": "call",
- "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 2112.66690826416,
- "y": 552.0000553131104,
- "z": "6516a9f0.ec0d58",
- "wires": [
- []
- ]
- }
+[
+ {
+ "id": "8393dc4.b00f62",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 100.00977325439453,
+ "y": 67.509765625,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "a8de9e47.ef835"
+ ]
+ ]
+ },
+ {
+ "id": "a8de9e47.ef835",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<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}'>",
+ "outputs": 1,
+ "x": 408.0094223022461,
+ "y": 67.50978755950928,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "412ac3c4.59356c"
+ ]
+ ]
+ },
+ {
+ "id": "412ac3c4.59356c",
+ "type": "method",
+ "name": "method:bbs-internet-profile-network-topology-operation-delete-huawei",
+ "xml": "<method rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 406.00940704345703,
+ "y": 263.5098638534546,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "d96b6a61.651aa8"
+ ]
+ ]
+ },
+ {
+ "id": "d96b6a61.651aa8",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 813.009635925293,
+ "y": 264.50982761383057,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "ed43d6ea.1722d8",
+ "dc1e34e.cfd17c8",
+ "4bbf7971.41bc68",
+ "643f2b24.3a23e4",
+ "17c5a97a.f12a27"
+ ]
+ ]
+ },
+ {
+ "id": "ed43d6ea.1722d8",
+ "type": "execute",
+ "name": "execute:DeleteInternetProfileInstance",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n <parameter name=\"contentType\" value=\"application/json\"/>\n <parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"service-result\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1201.6606979370117,
+ "y": 268.4706506729126,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "1ac2698.caf4797",
+ "a7098526.9b3d78"
+ ]
+ ]
+ },
+ {
+ "id": "a7098526.9b3d78",
+ "type": "outcome",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1502.9936790466309,
+ "y": 268.4706506729126,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "9700e544.024e48"
+ ]
+ ]
+ },
+ {
+ "id": "1ac2698.caf4797",
+ "type": "outcome",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1511.9935913085938,
+ "y": 343.47065258026123,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "37607f24.53bf"
+ ]
+ ]
+ },
+ {
+ "id": "37607f24.53bf",
+ "type": "switchNode",
+ "name": "switch:service-result",
+ "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1747.0097122192383,
+ "y": 342.50994777679443,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "563023ed.4ba30c",
+ "b0e164e3.f2a418"
+ ]
+ ]
+ },
+ {
+ "id": "9700e544.024e48",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call DeleteInternetProfileInstance\" />\n",
+ "comments": "",
+ "x": 2011.9272918701172,
+ "y": 268.76019859313965,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "563023ed.4ba30c",
+ "type": "outcome",
+ "name": "Other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1973.010051727295,
+ "y": 343.51004123687744,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "55172168.37133"
+ ]
+ ]
+ },
+ {
+ "id": "b0e164e3.f2a418",
+ "type": "outcome",
+ "name": "NULL",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1983.0097579956055,
+ "y": 429.50990772247314,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "fe385e37.9e9a5"
+ ]
+ ]
+ },
+ {
+ "id": "55172168.37133",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
+ "comments": "",
+ "x": 2159.509719848633,
+ "y": 343.50987815856934,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "fe385e37.9e9a5",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2141.1763877868652,
+ "y": 430.5098829269409,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "dc1e34e.cfd17c8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+ "comments": "",
+ "x": 1140.398536682129,
+ "y": 781.3988790512085,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "4bbf7971.41bc68",
+ "type": "call",
+ "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1313.6766815185547,
+ "y": 184.50982093811035,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "65346647.308a38",
+ "type": "comment",
+ "name": "fetch relationship-list",
+ "info": "",
+ "comments": "",
+ "x": 1150.1802520751953,
+ "y": 389.7358646392822,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "643f2b24.3a23e4",
+ "type": "for",
+ "name": "for relationship data",
+ "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1153.6527824401855,
+ "y": 443.4859027862549,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "99905752.097928"
+ ]
+ ]
+ },
+ {
+ "id": "fb8a9592.251f98",
+ "type": "switchNode",
+ "name": "switch vnf-id",
+ "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1501.8748245239258,
+ "y": 443.15258836746216,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "92d4d21b.2f71c"
+ ]
+ ]
+ },
+ {
+ "id": "92d4d21b.2f71c",
+ "type": "other",
+ "name": "generic-vnf.vnf-id",
+ "xml": "<outcome value='generic-vnf.vnf-id'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1675.0970458984375,
+ "y": 443.2636499404907,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "8caf9fcc.5729f"
+ ]
+ ]
+ },
+ {
+ "id": "8caf9fcc.5729f",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1854.3192672729492,
+ "y": 511.0414514541626,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "b3868d5c.48189"
+ ]
+ ]
+ },
+ {
+ "id": "b3868d5c.48189",
+ "type": "update",
+ "name": "get AAI generic-vnf",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n pfx='aai.generic-vnf' local-only='false' >",
+ "comments": "",
+ "outputs": 1,
+ "x": 2065.485954284668,
+ "y": 512.0414886474609,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "df1dd418.bafea8"
+ ]
+ ]
+ },
+ {
+ "id": "df29b5c0.224818",
+ "type": "switchNode",
+ "name": "switch vnf-type",
+ "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2636.7645721435547,
+ "y": 518.2636861801147,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "859c71d2.e161e"
+ ]
+ ]
+ },
+ {
+ "id": "859c71d2.e161e",
+ "type": "other",
+ "name": "InternetProfile",
+ "xml": "<outcome value='InternetProfile'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2830.7643280029297,
+ "y": 512.2637157440186,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "2d3afaef.f0ec06"
+ ]
+ ]
+ },
+ {
+ "id": "2d3afaef.f0ec06",
+ "type": "set",
+ "name": "set InternetProfile vnf-id",
+ "xml": "<set>\n<parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
+ "comments": "",
+ "x": 3074.7638397216797,
+ "y": 510.26364040374756,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "485cf5c2.abf84c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1334.2080688476562,
+ "y": 614.4025859832764,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "a29bb2f2.980ac"
+ ]
+ ]
+ },
+ {
+ "id": "93da79ed.e4ae48",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1342.2080688476562,
+ "y": 674.4025859832764,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "a29bb2f2.980ac"
+ ]
+ ]
+ },
+ {
+ "id": "a29bb2f2.980ac",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+ "comments": "",
+ "x": 1550.2080688476562,
+ "y": 649.4025859832764,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ },
+ {
+ "id": "99905752.097928",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1337.0136337280273,
+ "y": 443.31922149658203,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "fb8a9592.251f98"
+ ]
+ ]
+ },
+ {
+ "id": "75dc5fdd.d172c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 2453.763717651367,
+ "y": 518.7636861801147,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "df29b5c0.224818"
+ ]
+ ]
+ },
+ {
+ "id": "df1dd418.bafea8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2251.208080291748,
+ "y": 511.4025754928589,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "75dc5fdd.d172c"
+ ]
+ ]
+ },
+ {
+ "id": "17c5a97a.f12a27",
+ "type": "update",
+ "name": "deleteResourceAAI",
+ "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId\">",
+ "comments": "",
+ "outputs": 1,
+ "x": 1144.170997619629,
+ "y": 614.4487934112549,
+ "z": "633a4b5b.599dd4",
+ "wires": [
+ [
+ "485cf5c2.abf84c",
+ "93da79ed.e4ae48"
+ ]
+ ]
+ },
+ {
+ "id": "63b45757.74e858",
+ "type": "comment",
+ "name": "delete AAI resource",
+ "info": "",
+ "comments": "",
+ "x": 1141.948844909668,
+ "y": 561.115478515625,
+ "z": "633a4b5b.599dd4",
+ "wires": []
+ }
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index ef6ba0ba..75d15b51 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
@@ -1,110 +1,171 @@
-<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='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>
- <block atomic="true">
- <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' ></call>
- <set>
- <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
- <parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />
- </set>
- <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>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
- <parameter name="responsePrefix" value="token-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 failed to call queryTokenID" />
- </return>
- </outcome>
- <outcome value='success'>
- <switch test='`$token-result.accessSession`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
- </return>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
- </set>
- </outcome>
- </switch>
- </outcome>
- </execute>
- <for index='idx' start='0' end='`$network-input-parameters.param_length`' >
- <switch test="`$network-input-parameters.param[$idx].name == 'serviceID'`">
- <outcome value='true'>
- <switch test='`$network-input-parameters.param[$idx].value`'>
- <outcome value='Other'>
- <set>
- <parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="$network-input-parameters.param[$idx].name +' value is null, please check it.'" />
- </return>
- </outcome>
- </switch>
- </outcome>
- </switch>
- </for>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`" />
- <parameter name="httpMethod" value="get"/>
- <parameter name="contentType" value="application/x-www-form-urlencoded"/>
- <parameter name="responsePrefix" value="service-result"/>
- <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>
- <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 failed to call deleteAccessConnectivityService" />
- </return>
- </outcome>
- <outcome value='success'>
- <block atomic="true">
- <switch test="`$service-result.errors.error[0].error-message`">
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
- </return>
- </outcome>
- <outcome value=''>
- <block></block>
- </outcome>
- </switch>
- </block>
- </outcome>
- </execute>
- <return status='success'>
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<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='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' ></call>
+ <set>
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
+ <parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />
+ </set>
+ <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>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="token-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 failed to call queryTokenID" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <switch test='`$token-result.accessSession`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ <for index='idx' start='0' end='`$network-input-parameters.param_length`' >
+ <switch test="`$network-input-parameters.param[$idx].name == 'serviceID'`">
+ <outcome value='true'>
+ <switch test='`$network-input-parameters.param[$idx].value`'>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="$network-input-parameters.param[$idx].name +' value is null, please check it.'" />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
+ </for>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`" />
+ <parameter name="httpMethod" value="get"/>
+ <parameter name="contentType" value="application/x-www-form-urlencoded"/>
+ <parameter name="responsePrefix" value="service-result"/>
+ <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>
+ <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 failed to call deleteAccessConnectivityService" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true">
+ <switch test="`$service-result.errors.error[0].error-message`">
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
+ </return>
+ </outcome>
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-instance"
+ key="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 = $network-topology-operation-input.service-information.service-instance-id"
+ pfx='aai.service-instance' local-only='false' >
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value='' />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block atomic='true'>
+ <for silentFailure='true' index='ridx' start='0' end="`$aai.service-instance.relationship-list.relationship_length`" >
+ <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >
+ <block atomic='true'>
+ <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>
+ <outcome value='generic-vnf.vnf-id'>
+ <block atomic='true'>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value"
+ pfx='aai.generic-vnf' local-only='false' >
+ <outcome value='success'>
+ <block atomic='true'>
+ <switch test='`$aai.generic-vnf.vnf-type`'>
+ <outcome value='AccessConnectivity'>
+ <set>
+ <parameter name='prop.bbs.accessConnectivityVNFId' value='`$aai.generic-vnf.vnf-id`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </for>
+ </block>
+ </outcome>
+ </get-resource>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $prop.bbs.accessConnectivityVNFId">
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value='' />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value='' />
+ </return>
+ </outcome>
+ </delete>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
index 15f845fb..ea6dde91 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
@@ -1,42 +1,84 @@
-<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='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>
- <block atomic="true">
- <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' ></call>
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
- <parameter name="contentType" value="application/json"/>
- <parameter name="httpMethod" value="post"/>
- <parameter name="responsePrefix" value="service-result"/>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />
- </return>
- </outcome>
- <outcome value='success'>
- <switch test="`$service-result.errors.error[0].error-message`">
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
- </return>
- </outcome>
- <outcome value=''>
- <block></block>
- </outcome>
- </switch>
- </outcome>
- </execute>
- <return status='success'>
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
+<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='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' ></call>
+ <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
+ <parameter name="contentType" value="application/json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="service-result"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <switch test="`$service-result.errors.error[0].error-message`">
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
+ </return>
+ </outcome>
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >
+ <block atomic='true'>
+ <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>
+ <outcome value='generic-vnf.vnf-id'>
+ <block atomic='true'>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value"
+ pfx='aai.generic-vnf' local-only='false' >
+ <outcome value='success'>
+ <block atomic='true'>
+ <switch test='`$aai.generic-vnf.vnf-type`'>
+ <outcome value='InternetProfile'>
+ <set>
+ <parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId">
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value='' />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value='' />
+ </return>
+ </outcome>
+ </delete>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
</service-logic> \ No newline at end of file
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index dde877a9..577715ee 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index 867e9f86..e4343600 100644
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-lcm</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 63b2b58d..d5e14da1 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic</name>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index e2117b94..074cb04c 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index 98f7c661..d992ea60 100644
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restconfapi-yang</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index d71e4faa..93da3bee 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index decb4818..b6e37a9f 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-vnfapi</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index 786bcd42..26953fb8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>sdnc-oam</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam</name>
diff --git a/version.properties b/version.properties
index e8fe7d6c..5972b042 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
release_name=1
sprint_number=5
-feature_revision=3
+feature_revision=4
base_version=${release_name}.${sprint_number}.${feature_revision}