diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-31 17:06:46 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-11-02 10:42:58 -0400 |
| commit | 56eacbea90c15d772163f34a939f8f2daddf5b1f (patch) | |
| tree | ccf0d088f86ab5acab9b0877a1724f7ccfe0f2b1 | |
| parent | da85de1dff6b5d026da5b4e8610ced0d5cf8c6a8 (diff) | |
Fix vnf-topology-assign async
Updated vnf-topology-operation and vf-module-topolopy-operation
not to call assign-async directly.
Updated vnf-topology-operation-async and vf-module-topology-operation-async
to call assign-async instead of assign.
Change-Id: I16900ecb2126d2fe7fc3e1dfea351345272c275f
Issue-ID: SDNC-961
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 60b84d28f79ad82a827c70da68bf8b58ac945fd8
35 files changed, 1120 insertions, 1148 deletions
diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index 0a1dd130..6d8a1647 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <name>sdnc-oam :: SdncReports :: SdncReportsApi</name> <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReports</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index ed88c79d..50820714 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.7.5-SNAPSHOT</version> + <version>1.7.6-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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> <dependencies> diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 97d5521e..d2c19583 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReports</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: SdncReports</name> diff --git a/admportal/pom.xml b/admportal/pom.xml index b44850b0..f4dd4cb0 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>admportal</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: admportal</name> diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index cdffc345..a08371e1 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>getBackupVnfDetailService</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-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 73f5d4c7..e690354b 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <name>sdnc-oam :: vnfbackup</name> <packaging>pom</packaging> diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index 9fbf20b9..a5ace7d3 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigbackupservice</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </dependency> <dependency> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigreportsservice</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </dependency> <dependency> diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index e6efe9f6..3fa55639 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigreportsservice</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-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 16c58b3b..49dff4f4 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>data-migrator</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <packaging>jar</packaging> <name>sdnc-oam :: data-migrator</name> diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 491b1e2e..3d7f7e35 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 943a66cc..0e0ff99c 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 82aa4c99..a2072e0c 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 39108231..f8016a6b 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 14a430fd..ff83e218 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 0127b746..d8225f6e 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 20fb5a1f..0d3d9eac 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 3a24722f..8b5f3d2f 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.7.5-SNAPSHOT</version> + <version>1.7.6-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_vf-module-topology-operation-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json index b8b048ce..d9f1f20e 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json @@ -1,20 +1,20 @@ [
{
- "id": "58cdaf8e.9338",
+ "id": "a214adf2.6e9a7",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 179.8363037109375,
- "y": 167.77080249786377,
- "z": "720e27e0.e78d88",
+ "x": 148,
+ "y": 131,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "b5c33869.bb8148"
+ "acad4057.f1dc8"
]
]
},
{
- "id": "b5c33869.bb8148",
+ "id": "acad4057.f1dc8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,274 +22,274 @@ "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": 293.12200927734375,
- "y": 208.00891399383545,
- "z": "720e27e0.e78d88",
+ "x": 261.28570556640625,
+ "y": 171.23811149597168,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "34177c3d.1d3d04"
+ "31cfeaa.0698f16"
]
]
},
{
- "id": "34177c3d.1d3d04",
+ "id": "31cfeaa.0698f16",
"type": "method",
"name": "method vf-module-topology-operation-async",
"xml": "<method rpc='vf-module-topology-operation-async' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 314.7649230957031,
- "y": 266.520809173584,
- "z": "720e27e0.e78d88",
+ "x": 282.9286193847656,
+ "y": 229.75000667572021,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "98c85507.862c28"
+ "8595d903.6762c8"
]
]
},
{
- "id": "4dff986d.cfbfe8",
+ "id": "345b7934.bee34e",
"type": "comment",
"name": "vf-module-topology-operation-async",
"info": "",
"comments": "",
- "x": 642.9311599731445,
- "y": 132.85714530944824,
- "z": "720e27e0.e78d88",
+ "x": 611.094856262207,
+ "y": 96.08634281158447,
+ "z": "a1afab29.23bf58",
"wires": []
},
{
- "id": "98c85507.862c28",
+ "id": "8595d903.6762c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 637.7291793823242,
- "y": 419.98814606666565,
- "z": "720e27e0.e78d88",
+ "x": 605.8928756713867,
+ "y": 383.2173435688019,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "9c9f62a6.868f5",
- "2c41085c.8dd918",
- "ccddbe0b.ddbca"
+ "bafb388d.d3ff18",
+ "b6506244.4b8f28",
+ "da8a0537.fb39c8"
]
]
},
{
- "id": "9c9f62a6.868f5",
+ "id": "bafb388d.d3ff18",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 842.038688659668,
- "y": 627.2950584888458,
- "z": "720e27e0.e78d88",
+ "x": 810.2023849487305,
+ "y": 590.524255990982,
+ "z": "a1afab29.23bf58",
"wires": []
},
{
- "id": "2c41085c.8dd918",
+ "id": "b6506244.4b8f28",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 848.6575927734375,
- "y": 419.1517460346222,
- "z": "720e27e0.e78d88",
+ "x": 816.8212890625,
+ "y": 382.3809435367584,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "d8c68316.b7a72",
- "b525dffc.024fb"
+ "421d299d.d9d868",
+ "9ad26040.05a2c8"
]
]
},
{
- "id": "d8c68316.b7a72",
+ "id": "421d299d.d9d868",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 1062.419563293457,
- "y": 309.4375765323639,
- "z": "720e27e0.e78d88",
+ "x": 1030.5832595825195,
+ "y": 272.6667740345001,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "45cc9d2f.beb9b4"
+ "6fc1719e.706bd"
]
]
},
{
- "id": "93f4bc38.a3c71",
+ "id": "6c17aa78.ce2f54",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 1162.0505981445312,
- "y": 459.37825417518616,
- "z": "720e27e0.e78d88",
+ "x": 1130.2142944335938,
+ "y": 422.6074516773224,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "d491d98.b65f128"
+ "5f96ee10.e20a88"
]
]
},
{
- "id": "b525dffc.024fb",
+ "id": "9ad26040.05a2c8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1062.514804840088,
- "y": 551.8183891773224,
- "z": "720e27e0.e78d88",
+ "x": 1030.6785011291504,
+ "y": 515.0475866794586,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "90ef12c9.0fcde"
+ "ec88d0ff.5947e8"
]
]
},
{
- "id": "90ef12c9.0fcde",
+ "id": "ec88d0ff.5947e8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 1256.7052307128906,
- "y": 551.8184578418732,
- "z": "720e27e0.e78d88",
+ "x": 1224.8689270019531,
+ "y": 515.0476553440094,
+ "z": "a1afab29.23bf58",
"wires": []
},
{
- "id": "45cc9d2f.beb9b4",
+ "id": "6fc1719e.706bd",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-async",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1434.5623970031738,
- "y": 309.0090410709381,
- "z": "720e27e0.e78d88",
+ "x": 1402.7260932922363,
+ "y": 272.23823857307434,
+ "z": "a1afab29.23bf58",
"wires": [
[]
]
},
{
- "id": "dffe0c9b.30a7e",
+ "id": "4cf7949.73fefec",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1537.8124046325684,
- "y": 409.42566990852356,
- "z": "720e27e0.e78d88",
+ "x": 1505.9761009216309,
+ "y": 372.6548674106598,
+ "z": "a1afab29.23bf58",
"wires": [
[]
]
},
{
- "id": "d491d98.b65f128",
+ "id": "5f96ee10.e20a88",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1532.1456756591797,
- "y": 459.09238934516907,
- "z": "720e27e0.e78d88",
+ "x": 1500.3093719482422,
+ "y": 422.3215868473053,
+ "z": "a1afab29.23bf58",
"wires": [
[]
]
},
{
- "id": "516083ba.09ae5c",
+ "id": "784769e3.ccc1d",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 1166.1456909179688,
- "y": 410.0923435688019,
- "z": "720e27e0.e78d88",
+ "x": 1134.3093872070312,
+ "y": 373.3215410709381,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "dffe0c9b.30a7e"
+ "4cf7949.73fefec"
]
]
},
{
- "id": "9428c2a3.733a6",
+ "id": "a1c2a7bf.2c822",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1530.2886505126953,
- "y": 360.33031582832336,
- "z": "720e27e0.e78d88",
+ "x": 1498.4523468017578,
+ "y": 323.5595133304596,
+ "z": "a1afab29.23bf58",
"wires": [
[]
]
},
{
- "id": "a8ae8c.55933178",
+ "id": "36c8dc56.9339c4",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 1158.2886352539062,
- "y": 360.99699330329895,
- "z": "720e27e0.e78d88",
+ "x": 1126.4523315429688,
+ "y": 324.2261908054352,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "9428c2a3.733a6"
+ "a1c2a7bf.2c822"
]
]
},
{
- "id": "116260cc.9bfbcf",
+ "id": "389bcb7f.ec6dfc",
"type": "outcome",
"name": "changeassign",
"xml": "<outcome value='changeassign'>\n",
"comments": "",
"outputs": 1,
- "x": 1176.622013092041,
- "y": 506.9969837665558,
- "z": "720e27e0.e78d88",
+ "x": 1144.7857093811035,
+ "y": 470.226181268692,
+ "z": "a1afab29.23bf58",
"wires": [
[
- "58e3fa70.7e8074"
+ "d47f4ab1.be5318"
]
]
},
{
- "id": "58e3fa70.7e8074",
+ "id": "d47f4ab1.be5318",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1545.717082977295,
- "y": 506.711119890213,
- "z": "720e27e0.e78d88",
+ "x": 1513.8807792663574,
+ "y": 469.94031739234924,
+ "z": "a1afab29.23bf58",
"wires": [
[]
]
},
{
- "id": "ccddbe0b.ddbca",
+ "id": "da8a0537.fb39c8",
"type": "set",
"name": "set skip-mdsal-update to Y",
"xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
"comments": "",
- "x": 885.8481788635254,
- "y": 263.24700570106506,
- "z": "720e27e0.e78d88",
+ "x": 854.0118751525879,
+ "y": 226.4762032032013,
+ "z": "a1afab29.23bf58",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json index 7df3bc6c..94207ca5 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json @@ -1,20 +1,20 @@ [
{
- "id": "11d4dc1b.cea77c",
+ "id": "33be195b.75d4fe",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 156,
- "y": 118.70132446289062,
- "z": "d80dfa18.577678",
+ "x": 180,
+ "y": 166.70132446289062,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "63acf7dc.06021"
+ "887749a.214a238"
]
]
},
{
- "id": "63acf7dc.06021",
+ "id": "887749a.214a238",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1527 +22,1512 @@ "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": 269.28570556640625,
- "y": 158.9394359588623,
- "z": "d80dfa18.577678",
+ "x": 293.28570556640625,
+ "y": 206.9394359588623,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "4268d929.67e0a"
+ "29dcb1df.dc1b8e"
]
]
},
{
- "id": "4268d929.67e0a",
+ "id": "29dcb1df.dc1b8e",
"type": "method",
"name": "method vf-module-topology-operation",
"xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 243.42862701416016,
- "y": 198.70131874084473,
- "z": "d80dfa18.577678",
+ "x": 267.42862701416016,
+ "y": 246.70131874084473,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "403c1585.dc6254"
+ "5c539e88.795b58"
]
]
},
{
- "id": "ece321a9.a609b",
+ "id": "96b1a3b6.caafe8",
"type": "comment",
"name": "vf-module-topology-operation",
"info": "",
"comments": "",
- "x": 473.34483337402344,
- "y": 101.28766632080078,
- "z": "d80dfa18.577678",
+ "x": 497.34483337402344,
+ "y": 149.28766632080078,
+ "z": "8b0e50c0.d902",
"wires": []
},
{
- "id": "403c1585.dc6254",
+ "id": "5c539e88.795b58",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 217.5000457763672,
- "y": 532.061484336853,
- "z": "d80dfa18.577678",
+ "x": 241.5000457763672,
+ "y": 580.061484336853,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "18b03d2.eb1fbc3",
- "fe759666.be3398",
- "b0524b56.c7d9d"
+ "40f6b5c9.a683ec",
+ "28b20b0b.fec1e4",
+ "5bcfdc4b.d00a54"
]
]
},
{
- "id": "18b03d2.eb1fbc3",
+ "id": "40f6b5c9.a683ec",
"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": 503.00003814697266,
- "y": 705.5588731765747,
- "z": "d80dfa18.577678",
+ "x": 527.0000381469727,
+ "y": 753.5588731765747,
+ "z": "8b0e50c0.d902",
"wires": []
},
{
- "id": "fe759666.be3398",
+ "id": "28b20b0b.fec1e4",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 513.9046478271484,
- "y": 530.2727088928223,
- "z": "d80dfa18.577678",
+ "x": 537.9046478271484,
+ "y": 578.2727088928223,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "196a98f8.3bd137",
- "c8596657.93e1a",
- "458d7c6b.5d0d5c",
- "4b204f7e.1b8e2",
- "5096a71a.af9198",
- "398477c1.9e3bb8",
- "112e016f.f82cbf",
- "e227c212.42fea8",
- "9300e0fc.aacde8"
+ "caeb3334.585a08",
+ "24b9aded.f55092",
+ "ff253716.ed1",
+ "ecd15846.92d2a",
+ "b53dc71f.db6408",
+ "dd8d2752.a0ec3",
+ "18068d49.c7b22b",
+ "f038d95a.4f467",
+ "47a5544f.c67324"
]
]
},
{
- "id": "196a98f8.3bd137",
+ "id": "caeb3334.585a08",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 725.3809280395508,
- "y": 378.5586109161377,
- "z": "d80dfa18.577678",
+ "x": 749.3809280395508,
+ "y": 426.5586109161377,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "f88029fe.714ff"
+ "fcc6559a.f79908"
]
]
},
{
- "id": "c8596657.93e1a",
+ "id": "24b9aded.f55092",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 731.7619132995605,
- "y": 566.7492380142212,
- "z": "d80dfa18.577678",
+ "x": 755.7619132995605,
+ "y": 614.7492380142212,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "cd4b7513.f15268"
+ "4899f7bf.dcc26"
]
]
},
{
- "id": "458d7c6b.5d0d5c",
+ "id": "ff253716.ed1",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 635.4762649536133,
- "y": 1982.2728834152222,
- "z": "d80dfa18.577678",
+ "x": 659.4762649536133,
+ "y": 2030.2728834152222,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "e82e3e2c.1df298"
+ "e5f62cf2.166b38"
]
]
},
{
- "id": "e82e3e2c.1df298",
+ "id": "e5f62cf2.166b38",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 829.666690826416,
- "y": 1982.272952079773,
- "z": "d80dfa18.577678",
+ "x": 853.666690826416,
+ "y": 2030.272952079773,
+ "z": "8b0e50c0.d902",
"wires": []
},
{
- "id": "b0524b56.c7d9d",
+ "id": "5bcfdc4b.d00a54",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 641.0832824707031,
- "y": 276.0823812484741,
- "z": "d80dfa18.577678",
+ "x": 665.0832824707031,
+ "y": 324.0823812484741,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "d72b4fcb.1f4c",
+ "id": "eef0ba00.12b89",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1107.5237197875977,
- "y": 516.7966537475586,
- "z": "d80dfa18.577678",
+ "x": 1131.5237197875977,
+ "y": 564.7966537475586,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "cd4b7513.f15268",
+ "id": "4899f7bf.dcc26",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1101.856990814209,
- "y": 566.4633731842041,
- "z": "d80dfa18.577678",
+ "x": 1125.856990814209,
+ "y": 614.4633731842041,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "8bd129ae.83c078",
+ "id": "58ba8f60.b4c0a",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 735.857006072998,
- "y": 517.4633274078369,
- "z": "d80dfa18.577678",
+ "x": 759.857006072998,
+ "y": 565.4633274078369,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "d72b4fcb.1f4c"
+ "eef0ba00.12b89"
]
]
},
{
- "id": "4b204f7e.1b8e2",
+ "id": "ecd15846.92d2a",
"type": "outcome",
"name": "changeassign",
"xml": "<outcome value='changeassign'>\n",
"comments": "",
"outputs": 1,
- "x": 746.3333282470703,
- "y": 614.3679676055908,
- "z": "d80dfa18.577678",
+ "x": 770.3333282470703,
+ "y": 662.3679676055908,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "e6633d6e.ae0008"
+ "c288c362.34d07"
]
]
},
{
- "id": "e6633d6e.ae0008",
+ "id": "c288c362.34d07",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1115.4283981323242,
- "y": 614.082103729248,
- "z": "d80dfa18.577678",
+ "x": 1139.4283981323242,
+ "y": 662.082103729248,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "5096a71a.af9198",
+ "id": "b53dc71f.db6408",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 732.0000076293945,
- "y": 812.7013120651245,
- "z": "d80dfa18.577678",
+ "x": 756.0000076293945,
+ "y": 860.7013120651245,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "b0678560.7104f"
+ "18e7ef46.d6b7b1"
]
]
},
{
- "id": "162fec09.6308b4",
+ "id": "607a2fa9.0f2298",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 970.333610534668,
- "y": 820.2876752316952,
- "z": "d80dfa18.577678",
+ "x": 994.333610534668,
+ "y": 868.2876752316952,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "38f54336.43e254",
- "52b23393.43b59c",
- "8b76b414.15b5e8",
- "ef2f9b30.3b48d8",
- "6d66a790.28c178",
- "e72de08a.895418"
+ "7311d758.3c29a8",
+ "1c43fcbc.b491cb",
+ "1f820a59.6cfe26",
+ "263d1347.d54d4c",
+ "70589bb7.c48cd4",
+ "17d2ee47.67d4f2"
]
]
},
{
- "id": "52b23393.43b59c",
+ "id": "1c43fcbc.b491cb",
"type": "outcome",
"name": "CreateSDWANSiteInstance",
"xml": "<outcome value='CreateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1260.809928894043,
- "y": 728.7670440673828,
- "z": "d80dfa18.577678",
+ "x": 1284.809928894043,
+ "y": 776.7670440673828,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "1d98311f.d91eb7"
+ "d033bd2f.c327f8"
]
]
},
{
- "id": "38f54336.43e254",
+ "id": "7311d758.3c29a8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1170.7143936157227,
- "y": 904.1449384689331,
- "z": "d80dfa18.577678",
+ "x": 1194.7143936157227,
+ "y": 952.1449384689331,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "3ba8f36d.dd4584"
+ "985190ee.26958"
]
]
},
{
- "id": "b0678560.7104f",
+ "id": "18e7ef46.d6b7b1",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 918.3335266113281,
- "y": 740.2876768112183,
- "z": "d80dfa18.577678",
+ "x": 942.3335266113281,
+ "y": 788.2876768112183,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "162fec09.6308b4",
- "7ce1a992.f698d8"
+ "607a2fa9.0f2298",
+ "8882f132.8ac148"
]
]
},
{
- "id": "1d98311f.d91eb7",
+ "id": "d033bd2f.c327f8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1684.3338012695312,
- "y": 727.2878203392029,
- "z": "d80dfa18.577678",
+ "x": 1708.3338012695312,
+ "y": 775.2878203392029,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "3ba8f36d.dd4584",
+ "id": "985190ee.26958",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1324.0000457763672,
- "y": 904.2013349533081,
- "z": "d80dfa18.577678",
+ "x": 1348.0000457763672,
+ "y": 952.2013349533081,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "8b76b414.15b5e8",
+ "id": "1f820a59.6cfe26",
"type": "outcome",
"name": "CreateSDWANPortInstance",
"xml": "<outcome value='CreateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1234.6667861938477,
- "y": 862.5348291397095,
- "z": "d80dfa18.577678",
+ "x": 1258.6667861938477,
+ "y": 910.5348291397095,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "82cd1d50.2a0f4"
+ "10e74aca.5e9dcd"
]
]
},
{
- "id": "82cd1d50.2a0f4",
+ "id": "10e74aca.5e9dcd",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1707.1904830932617,
- "y": 862.0555810928345,
- "z": "d80dfa18.577678",
+ "x": 1731.1904830932617,
+ "y": 910.0555810928345,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "ef2f9b30.3b48d8",
+ "id": "263d1347.d54d4c",
"type": "outcome",
"name": "CreateSDWANDeviceInstance",
"xml": "<outcome value='CreateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1243.0311088562012,
- "y": 782.732789516449,
- "z": "d80dfa18.577678",
+ "x": 1267.0311088562012,
+ "y": 830.732789516449,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "c5caf426.d828e8"
+ "f8c54fdf.a0282"
]
]
},
{
- "id": "c5caf426.d828e8",
+ "id": "f8c54fdf.a0282",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1698.5548973083496,
- "y": 782.2536587715149,
- "z": "d80dfa18.577678",
+ "x": 1722.5548973083496,
+ "y": 830.2536587715149,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "6d66a790.28c178",
+ "id": "70589bb7.c48cd4",
"type": "outcome",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1273.0000267028809,
- "y": 681.7013640403748,
- "z": "d80dfa18.577678",
+ "x": 1297.0000267028809,
+ "y": 729.7013640403748,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "6e6d0477.4e8ddc"
+ "69cbe655.d4531"
]
]
},
{
- "id": "6e6d0477.4e8ddc",
+ "id": "69cbe655.d4531",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1681.5237998962402,
- "y": 679.2221312522888,
- "z": "d80dfa18.577678",
+ "x": 1705.5237998962402,
+ "y": 727.2221312522888,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "398477c1.9e3bb8",
+ "id": "dd8d2752.a0ec3",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 722.0000076293945,
- "y": 1008.0346250534058,
- "z": "d80dfa18.577678",
+ "x": 746.0000076293945,
+ "y": 1056.0346250534058,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "ca9d6615.d92bb"
+ "bcb67265.e288a"
]
]
},
{
- "id": "22860be6.d83544",
+ "id": "c0fe026d.5bbbb",
"type": "outcome",
"name": "ActivateSDWANSiteInstance",
"xml": "<outcome value='ActivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1252.1430587768555,
- "y": 1010.9335784912109,
- "z": "d80dfa18.577678",
+ "x": 1276.1430587768555,
+ "y": 1058.933578491211,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "bc6abbe4.e226c"
+ "5109a3a6.561364"
]
]
},
{
- "id": "ca9d6615.d92bb",
+ "id": "bcb67265.e288a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 902.6667785644531,
- "y": 1003.4543018341064,
- "z": "d80dfa18.577678",
+ "x": 926.6667785644531,
+ "y": 1051.4543018341064,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "fd34d18f.7429b"
+ "47246527.1e56ec"
]
]
},
{
- "id": "bc6abbe4.e226c",
+ "id": "5109a3a6.561364",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1664.6669464111328,
- "y": 1004.4543609619141,
- "z": "d80dfa18.577678",
+ "x": 1688.6669464111328,
+ "y": 1052.454360961914,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "fc0c8e83.b23218",
+ "id": "c60830d0.17f5a",
"type": "outcome",
"name": "ActivateSDWANDeviceInstance",
"xml": "<outcome value='ActivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1241.33349609375,
- "y": 1056.9543671607971,
- "z": "d80dfa18.577678",
+ "x": 1265.33349609375,
+ "y": 1104.9543671607971,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "322979d6.dc748e"
+ "25d9361e.9c65ba"
]
]
},
{
- "id": "322979d6.dc748e",
+ "id": "25d9361e.9c65ba",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1676.857192993164,
- "y": 1056.47513961792,
- "z": "d80dfa18.577678",
+ "x": 1700.857192993164,
+ "y": 1104.47513961792,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "7a20602e.9c67f",
+ "id": "b6aa92f9.cdc2a8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1675.3333206176758,
- "y": 1141.95432138443,
- "z": "d80dfa18.577678",
+ "x": 1699.3333206176758,
+ "y": 1189.95432138443,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "7140c1d2.7cd8a8",
+ "id": "a18c69ab.01a818",
"type": "outcome",
"name": "ActivateSDWANPortInstance",
"xml": "<outcome value='ActivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1239.8096237182617,
- "y": 1142.4335489273071,
- "z": "d80dfa18.577678",
+ "x": 1263.8096237182617,
+ "y": 1190.4335489273071,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "7a20602e.9c67f"
+ "b6aa92f9.cdc2a8"
]
]
},
{
- "id": "fd34d18f.7429b",
+ "id": "47246527.1e56ec",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 979.0000076293945,
- "y": 1070.0346250534058,
- "z": "d80dfa18.577678",
+ "x": 1003.0000076293945,
+ "y": 1118.0346250534058,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "22860be6.d83544",
- "fc0c8e83.b23218",
- "7140c1d2.7cd8a8",
- "9e7170ba.5f9eb8",
- "d7d2a998.ac94f8",
- "8e69acb9.247998"
+ "c0fe026d.5bbbb",
+ "c60830d0.17f5a",
+ "a18c69ab.01a818",
+ "4eb9f891.327f5",
+ "90d715c6.9c265",
+ "f02a5298.2eefc"
]
]
},
{
- "id": "9e7170ba.5f9eb8",
+ "id": "4eb9f891.327f5",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1171.5714874267578,
- "y": 1191.2461342811584,
- "z": "d80dfa18.577678",
+ "x": 1195.5714874267578,
+ "y": 1239.2461342811584,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "dab2914f.5e193"
+ "5d183311.69fac4"
]
]
},
{
- "id": "d7d2a998.ac94f8",
+ "id": "90d715c6.9c265",
"type": "outcome",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
"comments": "",
"outputs": 1,
- "x": 1255.0000076293945,
- "y": 966.0346250534058,
- "z": "d80dfa18.577678",
+ "x": 1279.0000076293945,
+ "y": 1014.0346250534058,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "8d564aec.b974a8"
+ "88c09726.eefab8"
]
]
},
{
- "id": "8d564aec.b974a8",
+ "id": "88c09726.eefab8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1670.523811340332,
- "y": 959.555401802063,
- "z": "d80dfa18.577678",
+ "x": 1694.523811340332,
+ "y": 1007.555401802063,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "112e016f.f82cbf",
+ "id": "18068d49.c7b22b",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 706,
- "y": 1294.0347180366516,
- "z": "d80dfa18.577678",
+ "x": 730,
+ "y": 1342.0347180366516,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "379e448b.e26ed4"
+ "681e9593.4046f4"
]
]
},
{
- "id": "e0dd4b1.4e4d8b8",
+ "id": "1c91b5af.7e24a2",
"type": "outcome",
"name": "DeactivateSDWANSiteInstance",
"xml": "<outcome value='DeactivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1244.1431198120117,
- "y": 1293.9336881637573,
- "z": "d80dfa18.577678",
+ "x": 1268.1431198120117,
+ "y": 1341.9336881637573,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "90c2ea50.fdcfe8"
+ "45ef4065.1ebd28"
]
]
},
{
- "id": "379e448b.e26ed4",
+ "id": "681e9593.4046f4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 886.6667709350586,
- "y": 1289.4543948173523,
- "z": "d80dfa18.577678",
+ "x": 910.6667709350586,
+ "y": 1337.4543948173523,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "5c04c78d.fe726"
+ "33bfb465.398c74"
]
]
},
{
- "id": "90c2ea50.fdcfe8",
+ "id": "45ef4065.1ebd28",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1661.6668853759766,
- "y": 1295.4544248580933,
- "z": "d80dfa18.577678",
+ "x": 1685.6668853759766,
+ "y": 1343.4544248580933,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "3157e474.6d76bc",
+ "id": "a2c160f0.81abc8",
"type": "outcome",
"name": "DeactivateSDWANDeviceInstance",
"xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1225.3334884643555,
- "y": 1342.954460144043,
- "z": "d80dfa18.577678",
+ "x": 1249.3334884643555,
+ "y": 1390.954460144043,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "4bcbaf21.f06a68"
+ "6d633c2a.19ba84"
]
]
},
{
- "id": "4bcbaf21.f06a68",
+ "id": "6d633c2a.19ba84",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1660.8571853637695,
- "y": 1342.4752326011658,
- "z": "d80dfa18.577678",
+ "x": 1684.8571853637695,
+ "y": 1390.4752326011658,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "628f7e0d.7bf12",
+ "id": "534faaf3.c3270c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1658.333396911621,
- "y": 1420.9544343948364,
- "z": "d80dfa18.577678",
+ "x": 1682.333396911621,
+ "y": 1468.9544343948364,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "c5a06a95.9a73c",
+ "id": "a881781.4a03f08",
"type": "outcome",
"name": "DeactivateSDWANPortInstance",
"xml": "<outcome value='DeactivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1222.809700012207,
- "y": 1421.4336619377136,
- "z": "d80dfa18.577678",
+ "x": 1246.809700012207,
+ "y": 1469.4336619377136,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "628f7e0d.7bf12"
+ "534faaf3.c3270c"
]
]
},
{
- "id": "5c04c78d.fe726",
+ "id": "33bfb465.398c74",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 963,
- "y": 1356.0347180366516,
- "z": "d80dfa18.577678",
+ "x": 987,
+ "y": 1404.0347180366516,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "e0dd4b1.4e4d8b8",
- "3157e474.6d76bc",
- "c5a06a95.9a73c",
- "e434dcb1.1a484",
- "401815f5.93c05c",
- "5f2a3253.15e99c"
+ "1c91b5af.7e24a2",
+ "a2c160f0.81abc8",
+ "a881781.4a03f08",
+ "e96ddfb5.feaf6",
+ "627fe7de.350708",
+ "824d42e5.fe91b"
]
]
},
{
- "id": "e434dcb1.1a484",
+ "id": "e96ddfb5.feaf6",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1158.571434020996,
- "y": 1471.2462244033813,
- "z": "d80dfa18.577678",
+ "x": 1182.571434020996,
+ "y": 1519.2462244033813,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "c76a7983.9d38e8"
+ "fc7b9ae9.e004f8"
]
]
},
{
- "id": "401815f5.93c05c",
+ "id": "627fe7de.350708",
"type": "outcome",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1239,
- "y": 1252.0347180366516,
- "z": "d80dfa18.577678",
+ "x": 1263,
+ "y": 1300.0347180366516,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "179d4c8.1c9f0b4"
+ "51976a8e.a60084"
]
]
},
{
- "id": "179d4c8.1c9f0b4",
+ "id": "51976a8e.a60084",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1654.5238037109375,
- "y": 1245.5554947853088,
- "z": "d80dfa18.577678",
+ "x": 1678.5238037109375,
+ "y": 1293.5554947853088,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "c76a7983.9d38e8",
+ "id": "fc7b9ae9.e004f8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1497.000114440918,
- "y": 1471.7014350891113,
- "z": "d80dfa18.577678",
+ "x": 1521.000114440918,
+ "y": 1519.7014350891113,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "dab2914f.5e193",
+ "id": "5d183311.69fac4",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1502,
- "y": 1188.701344013214,
- "z": "d80dfa18.577678",
+ "x": 1526,
+ "y": 1236.701344013214,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "61081d39.89dad4",
+ "id": "a5ddeebb.393828",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1099.9999656677246,
- "y": 467.7012996673584,
- "z": "d80dfa18.577678",
+ "x": 1123.9999656677246,
+ "y": 515.7012996673584,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "9e246b75.ae6418",
+ "id": "d10ab8db.cf3c38",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 727.9999504089355,
- "y": 468.367977142334,
- "z": "d80dfa18.577678",
+ "x": 751.9999504089355,
+ "y": 516.367977142334,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "61081d39.89dad4"
+ "a5ddeebb.393828"
]
]
},
{
- "id": "e227c212.42fea8",
+ "id": "f038d95a.4f467",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 669.0000457763672,
- "y": 1639.368046760559,
- "z": "d80dfa18.577678",
+ "x": 693.0000457763672,
+ "y": 1687.368046760559,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "681f7e70.128598"
+ "10193305.fa5d35"
]
]
},
{
- "id": "7e590f10.e3e0d",
+ "id": "b3ed8338.35bbd8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 908.3335647583008,
- "y": 1639.9544134140015,
- "z": "d80dfa18.577678",
+ "x": 932.3335647583008,
+ "y": 1687.9544134140015,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "8e23d3e5.351a68",
- "936a66dc.f198d8",
- "78e52106.f9df28",
- "a2426271.0aaaf",
- "5d0c656.809b41c",
- "afdd56ca.7b158"
+ "f639dd.e0c2962",
+ "2f28b183.0a3116",
+ "2dac1bff.bca26c",
+ "c2c7f7f5.8148e8",
+ "8661a779.b1bbc8",
+ "c19404b2.ac4d9"
]
]
},
{
- "id": "936a66dc.f198d8",
+ "id": "2f28b183.0a3116",
"type": "outcome",
"name": "DeleteSDWANSiteInstance",
"xml": "<outcome value='DeleteSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1193.8101119995117,
- "y": 1573.4338130950928,
- "z": "d80dfa18.577678",
+ "x": 1217.8101119995117,
+ "y": 1621.4338130950928,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "d567d254.07d97"
+ "272fa7f.e3f75d8"
]
]
},
{
- "id": "8e23d3e5.351a68",
+ "id": "f639dd.e0c2962",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1107.7144317626953,
- "y": 1730.8116731643677,
- "z": "d80dfa18.577678",
+ "x": 1131.7144317626953,
+ "y": 1778.8116731643677,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "26e6234e.282244"
+ "721cca52.351b1c"
]
]
},
{
- "id": "681f7e70.128598",
+ "id": "10193305.fa5d35",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 855.3335647583008,
- "y": 1566.9544115066528,
- "z": "d80dfa18.577678",
+ "x": 879.3335647583008,
+ "y": 1614.9544115066528,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "7e590f10.e3e0d"
+ "b3ed8338.35bbd8"
]
]
},
{
- "id": "d567d254.07d97",
+ "id": "272fa7f.e3f75d8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1597.333724975586,
- "y": 1568.9546580314636,
- "z": "d80dfa18.577678",
+ "x": 1621.333724975586,
+ "y": 1616.9546580314636,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "26e6234e.282244",
+ "id": "721cca52.351b1c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1261.0000839233398,
- "y": 1730.8680696487427,
- "z": "d80dfa18.577678",
+ "x": 1285.0000839233398,
+ "y": 1778.8680696487427,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "78e52106.f9df28",
+ "id": "2dac1bff.bca26c",
"type": "outcome",
"name": "DeleteSDWANPortInstance",
"xml": "<outcome value='DeleteSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1171.6668243408203,
- "y": 1689.201563835144,
- "z": "d80dfa18.577678",
+ "x": 1195.6668243408203,
+ "y": 1737.201563835144,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "9ac059d9.b2b208"
+ "d36bdd40.7f4cb"
]
]
},
{
- "id": "9ac059d9.b2b208",
+ "id": "d36bdd40.7f4cb",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1644.1905212402344,
- "y": 1688.722315788269,
- "z": "d80dfa18.577678",
+ "x": 1668.1905212402344,
+ "y": 1736.722315788269,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "a2426271.0aaaf",
+ "id": "c2c7f7f5.8148e8",
"type": "outcome",
"name": "DeleteSDWANDeviceInstance",
"xml": "<outcome value='DeleteSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1196.0312194824219,
- "y": 1612.3994517326355,
- "z": "d80dfa18.577678",
+ "x": 1220.0312194824219,
+ "y": 1660.3994517326355,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "62bed64b.ae3228"
+ "4e0eb9d5.aa847"
]
]
},
{
- "id": "62bed64b.ae3228",
+ "id": "4e0eb9d5.aa847",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1610.5550384521484,
- "y": 1607.9203562736511,
- "z": "d80dfa18.577678",
+ "x": 1634.5550384521484,
+ "y": 1655.9203562736511,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "5d0c656.809b41c",
+ "id": "8661a779.b1bbc8",
"type": "outcome",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1200.0000762939453,
- "y": 1532.3680639266968,
- "z": "d80dfa18.577678",
+ "x": 1224.0000762939453,
+ "y": 1580.3680639266968,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "903607f5.13f68"
+ "4efe6039.8a2b38"
]
]
},
{
- "id": "903607f5.13f68",
+ "id": "4efe6039.8a2b38",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1593.5238800048828,
- "y": 1532.888831615448,
- "z": "d80dfa18.577678",
+ "x": 1617.5238800048828,
+ "y": 1580.888831615448,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "7ce1a992.f698d8",
+ "id": "8882f132.8ac148",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
"comments": "",
"outputs": 1,
- "x": 1059.7500076293945,
- "y": 689.2915614545345,
- "z": "d80dfa18.577678",
+ "x": 1083.7500076293945,
+ "y": 737.2915614545345,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "e72de08a.895418",
+ "id": "17d2ee47.67d4f2",
"type": "outcome",
"name": "CreateSDWANLanPortInstance",
"xml": "<outcome value='CreateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1236.743507385254,
- "y": 823.5415625572205,
- "z": "d80dfa18.577678",
+ "x": 1260.743507385254,
+ "y": 871.5415625572205,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "31973c4d.4759e4"
+ "b44bb5fa.e9aaf8"
]
]
},
{
- "id": "31973c4d.4759e4",
+ "id": "b44bb5fa.e9aaf8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1709.267204284668,
- "y": 823.0623145103455,
- "z": "d80dfa18.577678",
+ "x": 1733.267204284668,
+ "y": 871.0623145103455,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "8e69acb9.247998",
+ "id": "f02a5298.2eefc",
"type": "outcome",
"name": "ActivateSDWANLanPortInstance",
"xml": "<outcome value='ActivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1248.743507385254,
- "y": 1100.7915625572205,
- "z": "d80dfa18.577678",
+ "x": 1272.743507385254,
+ "y": 1148.7915625572205,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "948b984b.e64328"
+ "3fa74ce7.5a3b6c"
]
]
},
{
- "id": "948b984b.e64328",
+ "id": "3fa74ce7.5a3b6c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1666.2671585083008,
- "y": 1100.3123240470886,
- "z": "d80dfa18.577678",
+ "x": 1690.2671585083008,
+ "y": 1148.3123240470886,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "5f2a3253.15e99c",
+ "id": "824d42e5.fe91b",
"type": "outcome",
"name": "DeactivateSDWANLanPortInstance",
"xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1234.743507385254,
- "y": 1387.0415625572205,
- "z": "d80dfa18.577678",
+ "x": 1258.743507385254,
+ "y": 1435.0415625572205,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "6608c35e.c94abc"
+ "c7eaff30.b937a"
]
]
},
{
- "id": "6608c35e.c94abc",
+ "id": "c7eaff30.b937a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1652.2671585083008,
- "y": 1386.5623240470886,
- "z": "d80dfa18.577678",
+ "x": 1676.2671585083008,
+ "y": 1434.5623240470886,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "afdd56ca.7b158",
+ "id": "c19404b2.ac4d9",
"type": "outcome",
"name": "DeleteSDWANLanPortInstance",
"xml": "<outcome value='DeleteSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1198.743507385254,
- "y": 1650.0415625572205,
- "z": "d80dfa18.577678",
+ "x": 1222.743507385254,
+ "y": 1698.0415625572205,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "ddf98dd7.4ad7d"
+ "611bfd14.6cb0c4"
]
]
},
{
- "id": "ddf98dd7.4ad7d",
+ "id": "611bfd14.6cb0c4",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1616.2671585083008,
- "y": 1649.5623240470886,
- "z": "d80dfa18.577678",
+ "x": 1640.2671585083008,
+ "y": 1697.5623240470886,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "9300e0fc.aacde8",
+ "id": "47a5544f.c67324",
"type": "outcome",
"name": "update",
"xml": "<outcome value='update'>\n",
"comments": "",
"outputs": 1,
- "x": 640.0000076293945,
- "y": 1778.2876539230347,
- "z": "d80dfa18.577678",
+ "x": 664.0000076293945,
+ "y": 1826.2876539230347,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "ab931d4e.ccffc8"
+ "7a09cd0b.a3ae6c"
]
]
},
{
- "id": "ab931d4e.ccffc8",
+ "id": "7a09cd0b.a3ae6c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 814.3335037231445,
- "y": 1782.874140739441,
- "z": "d80dfa18.577678",
+ "x": 838.3335037231445,
+ "y": 1830.874140739441,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "8e86ecaa.ce6c28"
+ "f9c37f80.58b198"
]
]
},
{
- "id": "8e86ecaa.ce6c28",
+ "id": "f9c37f80.58b198",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 970.3335037231445,
- "y": 1852.874140739441,
- "z": "d80dfa18.577678",
+ "x": 994.3335037231445,
+ "y": 1900.874140739441,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "4766c849.8d9ae8",
- "9cad581c.5559d8"
+ "4313d5d.b934a2c",
+ "96008004.f3fb08"
]
]
},
{
- "id": "4766c849.8d9ae8",
+ "id": "4313d5d.b934a2c",
"type": "outcome",
"name": "SdwanBandwidthChange",
"xml": "<outcome value='SdwanBandwidthChange'>",
"comments": "",
"outputs": 1,
- "x": 1208.999984741211,
- "y": 1808.2877740859985,
- "z": "d80dfa18.577678",
+ "x": 1232.999984741211,
+ "y": 1856.2877740859985,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "6a1687c.4a82bf8"
+ "4a9a8312.107f34"
]
]
},
{
- "id": "6a1687c.4a82bf8",
+ "id": "4a9a8312.107f34",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1602.5237884521484,
- "y": 1808.8085417747498,
- "z": "d80dfa18.577678",
+ "x": 1626.5237884521484,
+ "y": 1856.8085417747498,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "9cad581c.5559d8",
+ "id": "96008004.f3fb08",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1134.714340209961,
- "y": 1881.7313776016235,
- "z": "d80dfa18.577678",
+ "x": 1158.714340209961,
+ "y": 1929.7313776016235,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "5ff5278e.fa7178"
+ "da42a936.4d80e8"
]
]
},
{
- "id": "5ff5278e.fa7178",
+ "id": "da42a936.4d80e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1287.9999923706055,
- "y": 1881.7877740859985,
- "z": "d80dfa18.577678",
+ "x": 1311.9999923706055,
+ "y": 1929.7877740859985,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "b75894e5.8c11a",
+ "id": "409c63f3.0be97c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1982.8573913574219,
- "y": 318.987060546875,
- "z": "d80dfa18.577678",
+ "x": 2006.8573913574219,
+ "y": 366.987060546875,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "1e63ed5c.c7dce3",
- "f2379115.719e5",
- "c06c12dc.df2ff"
+ "cb5df7e4.b1ee5",
+ "977a2626.95574"
]
]
},
{
- "id": "1e63ed5c.c7dce3",
+ "id": "cb5df7e4.b1ee5",
"type": "set",
"name": "set skip-mdsal-update to Y",
"xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
"comments": "",
- "x": 2229.6429443359375,
- "y": 295.3411045074463,
- "z": "d80dfa18.577678",
+ "x": 2253.6429443359375,
+ "y": 343.3411045074463,
+ "z": "8b0e50c0.d902",
"wires": []
},
{
- "id": "f2379115.719e5",
+ "id": "977a2626.95574",
"type": "set",
"name": "set ack-final to 'N' (default)",
"xml": "<set>\n<parameter name='ack-final' value='N' />\n",
"comments": "",
- "x": 2230.071517944336,
- "y": 335.34118843078613,
- "z": "d80dfa18.577678",
+ "x": 2254.071517944336,
+ "y": 383.34118843078613,
+ "z": "8b0e50c0.d902",
"wires": []
},
{
- "id": "fe2f3218.57be48",
+ "id": "f8118221.e92548",
"type": "switchNode",
"name": "so-response-url empty?",
"xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
"comments": "",
"outputs": 1,
- "x": 1117.4285583496094,
- "y": 172.98703002929688,
- "z": "d80dfa18.577678",
+ "x": 1141.4285583496094,
+ "y": 220.98703002929688,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "81183e12.46702",
- "6ea99026.2d8cd8"
+ "6aa69e65.ea868",
+ "8240759e.2b7448"
]
]
},
{
- "id": "81183e12.46702",
+ "id": "6aa69e65.ea868",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1342.4285583496094,
- "y": 128.98703002929688,
- "z": "d80dfa18.577678",
+ "x": 1366.4285583496094,
+ "y": 176.98703002929688,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "7193d1b3.b667a"
+ "327527d3.7b4b18"
]
]
},
{
- "id": "6ea99026.2d8cd8",
+ "id": "8240759e.2b7448",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1332.4285583496094,
- "y": 220.98703002929688,
- "z": "d80dfa18.577678",
+ "x": 1356.4285583496094,
+ "y": 268.9870300292969,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "30e50b5.a0612f4"
+ "7a731e6.34210e"
]
]
},
{
- "id": "30e50b5.a0612f4",
+ "id": "7a731e6.34210e",
"type": "switchNode",
"name": "so-response-url = ignored URL?",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1554.4285583496094,
- "y": 221.98703002929688,
- "z": "d80dfa18.577678",
+ "x": 1578.4285583496094,
+ "y": 269.9870300292969,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "835a8fa6.6d17f",
- "2771015e.b6298e"
+ "d46d074d.48dc58",
+ "6fce7505.b4aa9c"
]
]
},
{
- "id": "835a8fa6.6d17f",
+ "id": "d46d074d.48dc58",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1794.4285583496094,
- "y": 220.98703002929688,
- "z": "d80dfa18.577678",
+ "x": 1818.4285583496094,
+ "y": 268.9870300292969,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "7193d1b3.b667a"
+ "327527d3.7b4b18"
]
]
},
{
- "id": "2771015e.b6298e",
+ "id": "6fce7505.b4aa9c",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1802.4285583496094,
- "y": 321.9870300292969,
- "z": "d80dfa18.577678",
+ "x": 1826.4285583496094,
+ "y": 369.9870300292969,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "b75894e5.8c11a"
+ "409c63f3.0be97c"
]
]
},
{
- "id": "7193d1b3.b667a",
+ "id": "327527d3.7b4b18",
"type": "call",
"name": "call vf-module-topology-operation-assign-sync",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2301.285858154297,
- "y": 127.1298828125,
- "z": "d80dfa18.577678",
+ "x": 2325.285858154297,
+ "y": 175.1298828125,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "94a63140.3f5a9",
+ "id": "486c23d4.36def4",
"type": "execute",
"name": "execute getProperties",
"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",
"comments": "",
"outputs": 1,
- "x": 1108.3376159667969,
- "y": 81.81817626953125,
- "z": "d80dfa18.577678",
+ "x": 1132.3376159667969,
+ "y": 129.81817626953125,
+ "z": "8b0e50c0.d902",
"wires": [
[]
]
},
{
- "id": "f88029fe.714ff",
+ "id": "fcc6559a.f79908",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 917.4286804199219,
- "y": 80,
- "z": "d80dfa18.577678",
+ "x": 941.4286804199219,
+ "y": 128,
+ "z": "8b0e50c0.d902",
"wires": [
[
- "94a63140.3f5a9",
- "fe2f3218.57be48"
+ "486c23d4.36def4",
+ "f8118221.e92548"
]
]
- },
- {
- "id": "c06c12dc.df2ff",
- "type": "call",
- "name": "call vf-module-topology-operation-assign-async",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 2268,
- "y": 407,
- "z": "d80dfa18.577678",
- "wires": [
- []
- ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json index 72064464..b085d8a2 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json @@ -1,20 +1,20 @@ [
{
- "id": "869164d0.22fca8",
+ "id": "a8562ad4.6a0458",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 177.77777099609375,
- "y": 127.96921110153198,
- "z": "fafe2484.405f98",
+ "x": 161,
+ "y": 103.41365623474121,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "91e5b207.619a8"
+ "8aa2e22b.2999c8"
]
]
},
{
- "id": "91e5b207.619a8",
+ "id": "8aa2e22b.2999c8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,152 +22,152 @@ "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": 292.0634765625,
- "y": 168.20732259750366,
- "z": "fafe2484.405f98",
+ "x": 275.28570556640625,
+ "y": 143.6517677307129,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "6e27b9bb.02b478"
+ "8f1fc900.bf623"
]
]
},
{
- "id": "6e27b9bb.02b478",
+ "id": "8f1fc900.bf623",
"type": "method",
"name": "method vnf-topology-operation-async",
"xml": "<method rpc='vnf-topology-operation-async' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 265.63497161865234,
- "y": 209.3977770805359,
- "z": "fafe2484.405f98",
+ "x": 248.8572006225586,
+ "y": 184.84222221374512,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "67687d15.90d894"
+ "1753c63.85e9dba"
]
]
},
{
- "id": "628a912e.96075",
+ "id": "c9cdb08.85991d",
"type": "comment",
"name": "vnf-topology-operation-async",
"info": "",
"comments": "",
- "x": 572.1226272583008,
- "y": 75.55555486679077,
- "z": "fafe2484.405f98",
+ "x": 555.344856262207,
+ "y": 51,
+ "z": "23d0140b.bcf30c",
"wires": []
},
{
- "id": "67687d15.90d894",
+ "id": "1753c63.85e9dba",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 290.3730583190918,
- "y": 357.0913519859314,
- "z": "fafe2484.405f98",
+ "x": 273.59528732299805,
+ "y": 332.5357971191406,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "98b2b32c.4efe9",
- "ea413579.6ab908",
- "22dacf93.8c6e4"
+ "6fc71f07.688f6",
+ "60b26c36.43d504",
+ "a19ac06f.2f1d7"
]
]
},
{
- "id": "98b2b32c.4efe9",
+ "id": "6fc71f07.688f6",
"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": 480.015869140625,
- "y": 421.5409588813782,
- "z": "fafe2484.405f98",
+ "x": 463.23809814453125,
+ "y": 396.9854040145874,
+ "z": "23d0140b.bcf30c",
"wires": []
},
{
- "id": "ea413579.6ab908",
+ "id": "60b26c36.43d504",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 488.63487243652344,
- "y": 358.15970182418823,
- "z": "fafe2484.405f98",
+ "x": 471.8571014404297,
+ "y": 333.60414695739746,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "a26e14a0.c75858",
- "7d83530e.ba2efc"
+ "6bd9fb5a.0be96c",
+ "2681c253.32360e"
]
]
},
{
- "id": "a26e14a0.c75858",
+ "id": "6bd9fb5a.0be96c",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 684.5872421264648,
- "y": 335.06455087661743,
- "z": "fafe2484.405f98",
+ "x": 667.8094711303711,
+ "y": 310.50899600982666,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "a1897fe3.ec245"
+ "138714bc.ad7d9b"
]
]
},
{
- "id": "7d83530e.ba2efc",
+ "id": "2681c253.32360e",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 681.9205017089844,
- "y": 379.44537115097046,
- "z": "fafe2484.405f98",
+ "x": 665.1427307128906,
+ "y": 354.8898162841797,
+ "z": "23d0140b.bcf30c",
"wires": [
[
- "4fedef3f.f888b"
+ "103914f7.2438b3"
]
]
},
{
- "id": "4fedef3f.f888b",
+ "id": "103914f7.2438b3",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 833.8252372741699,
- "y": 379.44545316696167,
- "z": "fafe2484.405f98",
+ "x": 817.0474662780762,
+ "y": 354.8898983001709,
+ "z": "23d0140b.bcf30c",
"wires": []
},
{
- "id": "22dacf93.8c6e4",
+ "id": "a19ac06f.2f1d7",
"type": "set",
"name": "set skip-mdsal-update to Y",
"xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
"comments": "",
- "x": 518.254020690918,
- "y": 297.69841051101685,
- "z": "fafe2484.405f98",
+ "x": 501.4762496948242,
+ "y": 273.1428556442261,
+ "z": "23d0140b.bcf30c",
"wires": []
},
{
- "id": "a1897fe3.ec245",
+ "id": "138714bc.ad7d9b",
"type": "call",
- "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n",
+ "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign-async",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 989.2063751220703,
- "y": 335.1120238304138,
- "z": "fafe2484.405f98",
+ "x": 972.4286041259766,
+ "y": 310.55646896362305,
+ "z": "23d0140b.bcf30c",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json index 6850e027..1336db55 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json @@ -1,20 +1,20 @@ [
{
- "id": "1bd67dd4.72089a",
+ "id": "7f4aec0b.5502f4",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 157,
- "y": 190.98507690429688,
- "z": "4a2a8d50.48649c",
+ "x": 330,
+ "y": 210.98507690429688,
+ "z": "f5eee496.37583",
"wires": [
[
- "38bd98bb.8764e"
+ "3c7ef46a.98dca4"
]
]
},
{
- "id": "38bd98bb.8764e",
+ "id": "3c7ef46a.98dca4",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1329 +22,1314 @@ "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": 240.28570556640625,
- "y": 252.22317504882812,
- "z": "4a2a8d50.48649c",
+ "x": 413.28570556640625,
+ "y": 272.2231750488281,
+ "z": "f5eee496.37583",
"wires": [
[
- "6888d6c.7572228"
+ "b47a6501.64ba38"
]
]
},
{
- "id": "6888d6c.7572228",
+ "id": "b47a6501.64ba38",
"type": "method",
"name": "method vnf-topology-operation",
"xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 232.42862701416016,
- "y": 314.985071182251,
- "z": "4a2a8d50.48649c",
+ "x": 405.42862701416016,
+ "y": 334.985071182251,
+ "z": "f5eee496.37583",
"wires": [
[
- "cdfeb3ad.4eaab8"
+ "76bed0c3.5ba96"
]
]
},
{
- "id": "8829dcf9.9bea6",
+ "id": "af2b7b93.b6f818",
"type": "comment",
"name": "vnf-topology-operation",
"info": "",
"comments": "",
- "x": 556.9162979125977,
- "y": 34,
- "z": "4a2a8d50.48649c",
+ "x": 729.9162979125977,
+ "y": 54,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "cdfeb3ad.4eaab8",
+ "id": "76bed0c3.5ba96",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 256.16676330566406,
- "y": 644.6785974502563,
- "z": "4a2a8d50.48649c",
+ "x": 429.16676330566406,
+ "y": 664.6785974502563,
+ "z": "f5eee496.37583",
"wires": [
[
- "cc1b175b.b736c",
- "a3254fe3.d47878",
- "3bc78e03.8c382a"
+ "c01d08e.c985a78",
+ "f3cdf661.920ac",
+ "33260e4d.c20b2a"
]
]
},
{
- "id": "cc1b175b.b736c",
+ "id": "c01d08e.c985a78",
"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": 548.6667175292969,
- "y": 799.8426303863525,
- "z": "4a2a8d50.48649c",
+ "x": 721.6667175292969,
+ "y": 819.8426303863525,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "a3254fe3.d47878",
+ "id": "f3cdf661.920ac",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 551.5714340209961,
- "y": 642.8898410797119,
- "z": "4a2a8d50.48649c",
+ "x": 724.5714340209961,
+ "y": 662.8898410797119,
+ "z": "f5eee496.37583",
"wires": [
[
- "a7962069.276858",
- "f49f6b1.024f098",
- "8e59e6fb.c51ca8",
- "142cb248.a61cb6",
- "751946c8.87ef38",
- "ef72ca54.96aa7",
- "f9ac2eb4.61364"
+ "6a62e528.843adc",
+ "27ec3c87.0a16a4",
+ "141ab523.6149e3",
+ "8445a42.64341d8",
+ "baec8114.d828c8",
+ "90f19b33.a1e3a",
+ "26901c7e.371ebc"
]
]
},
{
- "id": "a7962069.276858",
+ "id": "6a62e528.843adc",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 886.3809814453125,
- "y": 470.5089511871338,
- "z": "4a2a8d50.48649c",
+ "x": 1059.3809814453125,
+ "y": 490.5089511871338,
+ "z": "f5eee496.37583",
"wires": [
[
- "f7b6e38.ff165a"
+ "1151efa6.7d7988"
]
]
},
{
- "id": "f49f6b1.024f098",
+ "id": "27ec3c87.0a16a4",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 962.4287996292114,
- "y": 1239.6997060775757,
- "z": "4a2a8d50.48649c",
+ "x": 1135.4287996292114,
+ "y": 1259.6997060775757,
+ "z": "f5eee496.37583",
"wires": [
[
- "ab1f503b.af03d8"
+ "b7aab17f.d8737"
]
]
},
{
- "id": "142cb248.a61cb6",
+ "id": "8445a42.64341d8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 946.1430358886719,
- "y": 1927.8899335861206,
- "z": "4a2a8d50.48649c",
+ "x": 1119.1430358886719,
+ "y": 1947.8899335861206,
+ "z": "f5eee496.37583",
"wires": [
[
- "7e74b0a8.45fec"
+ "1a454130.e9b437"
]
]
},
{
- "id": "7e74b0a8.45fec",
+ "id": "1a454130.e9b437",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 1179.3334655761719,
- "y": 1927.8899946212769,
- "z": "4a2a8d50.48649c",
+ "x": 1352.3334655761719,
+ "y": 1947.8899946212769,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "3bc78e03.8c382a",
+ "id": "33260e4d.c20b2a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-vnf-input",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 657.4166870117188,
- "y": 395.3661289215088,
- "z": "4a2a8d50.48649c",
+ "x": 830.4166870117188,
+ "y": 415.3661289215088,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "e3d82d2a.fc82d8",
+ "id": "b1c75a1f.b736a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1768.857307434082,
- "y": 1193.4137859344482,
- "z": "4a2a8d50.48649c",
+ "x": 1941.857307434082,
+ "y": 1213.4137859344482,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "ab1f503b.af03d8",
+ "id": "b7aab17f.d8737",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1326.5239305496216,
- "y": 1244.4137868881226,
- "z": "4a2a8d50.48649c",
+ "x": 1499.5239305496216,
+ "y": 1264.4137868881226,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "8e59e6fb.c51ca8",
+ "id": "141ab523.6149e3",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 931.5238800048828,
- "y": 979.080415725708,
- "z": "4a2a8d50.48649c",
+ "x": 1104.5238800048828,
+ "y": 999.080415725708,
+ "z": "f5eee496.37583",
"wires": [
[
- "ae6067c.1b2fa98"
+ "174a6915.f20dff"
]
]
},
{
- "id": "858bb800.ca206",
+ "id": "9c2d6c28.9eabb8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1725.666877746582,
- "y": 852.9850749969482,
- "z": "4a2a8d50.48649c",
+ "x": 1898.666877746582,
+ "y": 872.9850749969482,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "751946c8.87ef38",
+ "id": "baec8114.d828c8",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 894.3333129882812,
- "y": 640.6517143249512,
- "z": "4a2a8d50.48649c",
+ "x": 1067.3333129882812,
+ "y": 660.6517143249512,
+ "z": "f5eee496.37583",
"wires": [
[
- "6df2d884.4ca038"
+ "272242b5.b176e6"
]
]
},
{
- "id": "ef72ca54.96aa7",
+ "id": "90f19b33.a1e3a",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 964.0002298355103,
- "y": 1372.0713729858398,
- "z": "4a2a8d50.48649c",
+ "x": 1137.0002298355103,
+ "y": 1392.0713729858398,
+ "z": "f5eee496.37583",
"wires": [
[
- "ae139a1c.222e28"
+ "e8ab363a.a04b1"
]
]
},
{
- "id": "f9ac2eb4.61364",
+ "id": "26901c7e.371ebc",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 957.0002288818359,
- "y": 1683.0713829994202,
- "z": "4a2a8d50.48649c",
+ "x": 1130.000228881836,
+ "y": 1703.0713829994202,
+ "z": "f5eee496.37583",
"wires": [
[
- "8c3ce117.5fae2"
+ "948c6273.9d905"
]
]
},
{
- "id": "bd1d07e9.5eedc",
+ "id": "a9e35ff1.79f4e8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1136.0000839233398,
- "y": 696.0713911056519,
- "z": "4a2a8d50.48649c",
+ "x": 1309.0000839233398,
+ "y": 716.0713911056519,
+ "z": "f5eee496.37583",
"wires": [
[
- "7013feeb.ed049",
- "20d3b5c2.f3e69a",
- "3668cbba.d4faa4",
- "269f5d4e.8f57b2",
- "816c27b8.77c4e8",
- "2047aafd.7f7996"
+ "f87379c.1e07488",
+ "c36c43cc.aeeda8",
+ "13164371.5de335",
+ "a2611719.24c7b",
+ "176f424b.dada06",
+ "39f3b84c.87449"
]
]
},
{
- "id": "20d3b5c2.f3e69a",
+ "id": "c36c43cc.aeeda8",
"type": "outcome",
"name": "ActivateSiteInstance",
"xml": "<outcome value='ActivateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1396.4763259887695,
- "y": 618.5506420135498,
- "z": "4a2a8d50.48649c",
+ "x": 1569.4763259887695,
+ "y": 638.5506420135498,
+ "z": "f5eee496.37583",
"wires": [
[
- "66f830ed.1e6de"
+ "bb367534.ef4ec8"
]
]
},
{
- "id": "7013feeb.ed049",
+ "id": "f87379c.1e07488",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1369.3811111450195,
- "y": 853.9286479949951,
- "z": "4a2a8d50.48649c",
+ "x": 1542.3811111450195,
+ "y": 873.9286479949951,
+ "z": "f5eee496.37583",
"wires": [
[
- "858bb800.ca206"
+ "9c2d6c28.9eabb8"
]
]
},
{
- "id": "6df2d884.4ca038",
+ "id": "272242b5.b176e6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1075.0000839233398,
- "y": 641.0713911056519,
- "z": "4a2a8d50.48649c",
+ "x": 1248.0000839233398,
+ "y": 661.0713911056519,
+ "z": "f5eee496.37583",
"wires": [
[
- "bd1d07e9.5eedc"
+ "a9e35ff1.79f4e8"
]
]
},
{
- "id": "66f830ed.1e6de",
+ "id": "bb367534.ef4ec8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1763.000129699707,
- "y": 621.0714244842529,
- "z": "4a2a8d50.48649c",
+ "x": 1936.000129699707,
+ "y": 641.0714244842529,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "c2449ca2.43f5b8",
+ "id": "bf370495.757518",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1194.0001983642578,
- "y": 1012.071382522583,
- "z": "4a2a8d50.48649c",
+ "x": 1367.0001983642578,
+ "y": 1032.071382522583,
+ "z": "f5eee496.37583",
"wires": [
[
- "52b80951.997c28",
- "62663e18.1595d8",
- "f75942cd.e9cdb",
- "b095d5a2.1abde",
- "5974d41f.5000ac",
- "767ffc3.b041d84"
+ "49eaa74e.8c768",
+ "673e8d63.ef464c",
+ "6f7de94e.d598f",
+ "3bbdbf03.70f7",
+ "9e5f5985.9a8c28",
+ "12389cbe.8a7ceb"
]
]
},
{
- "id": "62663e18.1595d8",
+ "id": "673e8d63.ef464c",
"type": "outcome",
"name": "DeactivateSiteInstance",
"xml": "<outcome value='DeactivateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1437.4763946533203,
- "y": 963.5506310462952,
- "z": "4a2a8d50.48649c",
+ "x": 1610.4763946533203,
+ "y": 983.5506310462952,
+ "z": "f5eee496.37583",
"wires": [
[
- "13fd7ab.e595405"
+ "76abc0e2.85bc5"
]
]
},
{
- "id": "52b80951.997c28",
+ "id": "49eaa74e.8c768",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1412.3811111450195,
- "y": 1193.9286785125732,
- "z": "4a2a8d50.48649c",
+ "x": 1585.3811111450195,
+ "y": 1213.9286785125732,
+ "z": "f5eee496.37583",
"wires": [
[
- "e3d82d2a.fc82d8"
+ "b1c75a1f.b736a"
]
]
},
{
- "id": "ae6067c.1b2fa98",
+ "id": "174a6915.f20dff",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1133.0001983642578,
- "y": 957.071382522583,
- "z": "4a2a8d50.48649c",
+ "x": 1306.0001983642578,
+ "y": 977.071382522583,
+ "z": "f5eee496.37583",
"wires": [
[
- "c2449ca2.43f5b8"
+ "bf370495.757518"
]
]
},
{
- "id": "13fd7ab.e595405",
+ "id": "76abc0e2.85bc5",
"type": "call",
"name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1807.0001983642578,
- "y": 961.0714135169983,
- "z": "4a2a8d50.48649c",
+ "x": 1980.0001983642578,
+ "y": 981.0714135169983,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "b50b7762.c568b8",
+ "id": "6945b0fa.57898",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1162.333625793457,
- "y": 1458.6576824188232,
- "z": "4a2a8d50.48649c",
+ "x": 1335.333625793457,
+ "y": 1478.6576824188232,
+ "z": "f5eee496.37583",
"wires": [
[
- "daa776c9.c4de78",
- "ea4b7172.c374",
- "f6ff4a70.3816",
- "6afcca50.5f66dc",
- "2f050ce4.d6732c",
- "254873f2.91487c"
+ "878cf713.a74bf",
+ "6f7cdd9b.38d304",
+ "6f40b7fc.70cde",
+ "40ffdf8b.d98258",
+ "6fc6cf80.2742",
+ "96eee0bd.7d8858"
]
]
},
{
- "id": "ea4b7172.c374",
+ "id": "6f7cdd9b.38d304",
"type": "outcome",
"name": "CreateSiteInstance",
"xml": "<outcome value='CreateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1417.8101167678833,
- "y": 1311.1370167732239,
- "z": "4a2a8d50.48649c",
+ "x": 1590.8101167678833,
+ "y": 1331.1370167732239,
+ "z": "f5eee496.37583",
"wires": [
[
- "84d19a5a.04aa1"
+ "b46cf4df.32707"
]
]
},
{
- "id": "daa776c9.c4de78",
+ "id": "878cf713.a74bf",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1384.714599609375,
- "y": 1532.5149021148682,
- "z": "4a2a8d50.48649c",
+ "x": 1557.714599609375,
+ "y": 1552.5149021148682,
+ "z": "f5eee496.37583",
"wires": [
[
- "c4ca7fde.46e428"
+ "2c3d033f.ef6ef4"
]
]
},
{
- "id": "ae139a1c.222e28",
+ "id": "e8ab363a.a04b1",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1146.3337144851685,
- "y": 1369.6577405929565,
- "z": "4a2a8d50.48649c",
+ "x": 1319.3337144851685,
+ "y": 1389.6577405929565,
+ "z": "f5eee496.37583",
"wires": [
[
- "b50b7762.c568b8"
+ "6945b0fa.57898"
]
]
},
{
- "id": "84d19a5a.04aa1",
+ "id": "b46cf4df.32707",
"type": "call",
"name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1794.333821296692,
- "y": 1309.657775402069,
- "z": "4a2a8d50.48649c",
+ "x": 1967.333821296692,
+ "y": 1329.657775402069,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "c4ca7fde.46e428",
+ "id": "2c3d033f.ef6ef4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1525.0001754760742,
- "y": 1533.571325302124,
- "z": "4a2a8d50.48649c",
+ "x": 1698.0001754760742,
+ "y": 1553.571325302124,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "d39a24a.5273558",
+ "id": "c7a1cbe3.987808",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 1203.000228881836,
- "y": 1735.5713829994202,
- "z": "4a2a8d50.48649c",
+ "x": 1376.000228881836,
+ "y": 1755.5713829994202,
+ "z": "f5eee496.37583",
"wires": [
[
- "15b3024f.9d2b5e",
- "3848ec5b.7575f4",
- "fbaa1326.1081a",
- "254cc1a6.5d0cc6",
- "de41704e.e02f2",
- "da1c7a96.50bc1"
+ "c62eb926.85d33",
+ "7a7ae529.cd458c",
+ "5d404aca.28015c",
+ "24ef76eb.fe68ca",
+ "d11af3be.8899c",
+ "e8482541.be4a68"
]
]
},
{
- "id": "3848ec5b.7575f4",
+ "id": "7a7ae529.cd458c",
"type": "outcome",
"name": "DeleteSiteInstance",
"xml": "<outcome value='DeleteSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1443.476448059082,
- "y": 1681.0506267547607,
- "z": "4a2a8d50.48649c",
+ "x": 1616.476448059082,
+ "y": 1701.0506267547607,
+ "z": "f5eee496.37583",
"wires": [
[
- "3da95e89.3273f2"
+ "7f9a71f7.e7a108"
]
]
},
{
- "id": "15b3024f.9d2b5e",
+ "id": "c62eb926.85d33",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1408.381233215332,
- "y": 1931.428861618042,
- "z": "4a2a8d50.48649c",
+ "x": 1581.381233215332,
+ "y": 1951.428861618042,
+ "z": "f5eee496.37583",
"wires": [
[
- "28393206.2f0986"
+ "b15da572.e87ef"
]
]
},
{
- "id": "8c3ce117.5fae2",
+ "id": "948c6273.9d905",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1142.000228881836,
- "y": 1680.5713829994202,
- "z": "4a2a8d50.48649c",
+ "x": 1315.000228881836,
+ "y": 1700.5713829994202,
+ "z": "f5eee496.37583",
"wires": [
[
- "d39a24a.5273558"
+ "c7a1cbe3.987808"
]
]
},
{
- "id": "3da95e89.3273f2",
+ "id": "7f9a71f7.e7a108",
"type": "call",
"name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1816.0002517700195,
- "y": 1678.5713787078857,
- "z": "4a2a8d50.48649c",
+ "x": 1989.0002517700195,
+ "y": 1698.5713787078857,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "28393206.2f0986",
+ "id": "b15da572.e87ef",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1548.6668090820312,
- "y": 1932.4852848052979,
- "z": "4a2a8d50.48649c",
+ "x": 1721.6668090820312,
+ "y": 1952.4852848052979,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "3668cbba.d4faa4",
+ "id": "13164371.5de335",
"type": "outcome",
"name": "ActivateSDWANDeviceInstance",
"xml": "<outcome value='ActivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1427.6667556762695,
- "y": 669.571455001831,
- "z": "4a2a8d50.48649c",
+ "x": 1600.6667556762695,
+ "y": 689.571455001831,
+ "z": "f5eee496.37583",
"wires": [
[
- "e597143.e5430e8"
+ "bb7369d2.79a9b"
]
]
},
{
- "id": "e597143.e5430e8",
+ "id": "bb7369d2.79a9b",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1867.1904373168945,
- "y": 668.092206954956,
- "z": "4a2a8d50.48649c",
+ "x": 2040.1904373168945,
+ "y": 688.092206954956,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "f75942cd.e9cdb",
+ "id": "6f7de94e.d598f",
"type": "outcome",
"name": "DeactivateSDWANDeviceInstance",
"xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1478.666633605957,
- "y": 1011.571409702301,
- "z": "4a2a8d50.48649c",
+ "x": 1651.666633605957,
+ "y": 1031.571409702301,
+ "z": "f5eee496.37583",
"wires": [
[
- "4ef6289e.5a069"
+ "5c24aa9.f8036d4"
]
]
},
{
- "id": "4ef6289e.5a069",
+ "id": "5c24aa9.f8036d4",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1935.190330505371,
- "y": 1011.0922451019287,
- "z": "4a2a8d50.48649c",
+ "x": 2108.190330505371,
+ "y": 1031.0922451019287,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "42a673d5.9dc9ec",
+ "id": "fd3d0953.02e43",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1864.666633605957,
- "y": 708.5713939666748,
- "z": "4a2a8d50.48649c",
+ "x": 2037.666633605957,
+ "y": 728.5713939666748,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "269f5d4e.8f57b2",
+ "id": "a2611719.24c7b",
"type": "outcome",
"name": "ActivateSDWANPortInstance",
"xml": "<outcome value='ActivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1421.142951965332,
- "y": 716.0506114959717,
- "z": "4a2a8d50.48649c",
+ "x": 1594.142951965332,
+ "y": 736.0506114959717,
+ "z": "f5eee496.37583",
"wires": [
[
- "42a673d5.9dc9ec"
+ "fd3d0953.02e43"
]
]
},
{
- "id": "b095d5a2.1abde",
+ "id": "3bbdbf03.70f7",
"type": "outcome",
"name": "DeactivateSDWANPortInstance",
"xml": "<outcome value='DeactivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1470.6666793823242,
- "y": 1049.904725074768,
- "z": "4a2a8d50.48649c",
+ "x": 1643.6666793823242,
+ "y": 1069.904725074768,
+ "z": "f5eee496.37583",
"wires": [
[
- "822cf96e.0d9b6"
+ "25fa8901.ea4226"
]
]
},
{
- "id": "822cf96e.0d9b6",
+ "id": "25fa8901.ea4226",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1945.190330505371,
- "y": 1066.4255270957947,
- "z": "4a2a8d50.48649c",
+ "x": 2118.190330505371,
+ "y": 1086.4255270957947,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "f6ff4a70.3816",
+ "id": "6f40b7fc.70cde",
"type": "outcome",
"name": "CreateSDWANPortInstance",
"xml": "<outcome value='CreateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1467.6670122146606,
- "y": 1399.9048511981964,
- "z": "4a2a8d50.48649c",
+ "x": 1640.6670122146606,
+ "y": 1419.9048511981964,
+ "z": "f5eee496.37583",
"wires": [
[
- "2cee7114.60daa6"
+ "cbbee8f6.313cb8"
]
]
},
{
- "id": "2cee7114.60daa6",
+ "id": "cbbee8f6.313cb8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1924.1906328201294,
- "y": 1404.425630569458,
- "z": "4a2a8d50.48649c",
+ "x": 2097.1906328201294,
+ "y": 1424.425630569458,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "fbaa1326.1081a",
+ "id": "5d404aca.28015c",
"type": "outcome",
"name": "DeleteSDWANPortInstance",
"xml": "<outcome value='DeleteSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1479.3334655761719,
- "y": 1791.9047713279724,
- "z": "4a2a8d50.48649c",
+ "x": 1652.3334655761719,
+ "y": 1811.9047713279724,
+ "z": "f5eee496.37583",
"wires": [
[
- "3a81ef6f.a21e28"
+ "15dc39bf.cd04de"
]
]
},
{
- "id": "3a81ef6f.a21e28",
+ "id": "15dc39bf.cd04de",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1905.8571853637695,
- "y": 1791.4256267547607,
- "z": "4a2a8d50.48649c",
+ "x": 2078.8571853637695,
+ "y": 1811.4256267547607,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "254cc1a6.5d0cc6",
+ "id": "24ef76eb.fe68ca",
"type": "outcome",
"name": "DeleteSDWANDeviceInstance",
"xml": "<outcome value='DeleteSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1488.0316162109375,
- "y": 1732.102677822113,
- "z": "4a2a8d50.48649c",
+ "x": 1661.0316162109375,
+ "y": 1752.102677822113,
+ "z": "f5eee496.37583",
"wires": [
[
- "233ef390.f379c4"
+ "ebf4bbea.e5ce9"
]
]
},
{
- "id": "233ef390.f379c4",
+ "id": "ebf4bbea.e5ce9",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1920.5552215576172,
- "y": 1731.6233911514282,
- "z": "4a2a8d50.48649c",
+ "x": 2093.555221557617,
+ "y": 1751.6233911514282,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "6afcca50.5f66dc",
+ "id": "40ffdf8b.d98258",
"type": "outcome",
"name": "CreateSDWANDeviceInstance",
"xml": "<outcome value='CreateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1483.031361579895,
- "y": 1356.1028146743774,
- "z": "4a2a8d50.48649c",
+ "x": 1656.031361579895,
+ "y": 1376.1028146743774,
+ "z": "f5eee496.37583",
"wires": [
[
- "316c4260.73720e"
+ "618700fa.fa57e"
]
]
},
{
- "id": "316c4260.73720e",
+ "id": "618700fa.fa57e",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1939.555027961731,
- "y": 1354.623628616333,
- "z": "4a2a8d50.48649c",
+ "x": 2112.555027961731,
+ "y": 1374.623628616333,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "816c27b8.77c4e8",
+ "id": "176f424b.dada06",
"type": "outcome",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1425.2961502075195,
- "y": 765.1484661102295,
- "z": "4a2a8d50.48649c",
+ "x": 1598.2961502075195,
+ "y": 785.1484661102295,
+ "z": "f5eee496.37583",
"wires": [
[
- "8435974d.4fc658"
+ "4be7a0af.f34808"
]
]
},
{
- "id": "2047aafd.7f7996",
+ "id": "39f3b84c.87449",
"type": "outcome",
"name": "ActivateSDWANSiteInstance",
"xml": "<outcome value='ActivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1429.2961502075195,
- "y": 807.8149089813232,
- "z": "4a2a8d50.48649c",
+ "x": 1602.2961502075195,
+ "y": 827.8149089813232,
+ "z": "f5eee496.37583",
"wires": [
[
- "8435974d.4fc658"
+ "4be7a0af.f34808"
]
]
},
{
- "id": "8435974d.4fc658",
+ "id": "4be7a0af.f34808",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1700.296142578125,
- "y": 785.8149607181549,
- "z": "4a2a8d50.48649c",
+ "x": 1873.296142578125,
+ "y": 805.8149607181549,
+ "z": "f5eee496.37583",
"wires": [
[
- "e4988e8c.796a8"
+ "f5fc6a61.fbff"
]
]
},
{
- "id": "e4988e8c.796a8",
+ "id": "f5fc6a61.fbff",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2078.2959899902344,
- "y": 783.148619890213,
- "z": "4a2a8d50.48649c",
+ "x": 2251.2959899902344,
+ "y": 803.148619890213,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "f6f20244.8d9308",
+ "id": "8713d091.3458c8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2131.3332138061523,
- "y": 1121.9380941390991,
- "z": "4a2a8d50.48649c",
+ "x": 2304.3332138061523,
+ "y": 1141.9380941390991,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "dde515a2.eea8c",
+ "id": "61c74aac.7351c4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1734.3333053588867,
- "y": 1123.6044387817383,
- "z": "4a2a8d50.48649c",
+ "x": 1907.3333053588867,
+ "y": 1143.6044387817383,
+ "z": "f5eee496.37583",
"wires": [
[
- "f6f20244.8d9308"
+ "8713d091.3458c8"
]
]
},
{
- "id": "767ffc3.b041d84",
+ "id": "12389cbe.8a7ceb",
"type": "outcome",
"name": "DeactivateSDWANSiteInstance",
"xml": "<outcome value='DeactivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1476.3332901000977,
- "y": 1145.6044034957886,
- "z": "4a2a8d50.48649c",
+ "x": 1649.3332901000977,
+ "y": 1165.6044034957886,
+ "z": "f5eee496.37583",
"wires": [
[
- "dde515a2.eea8c"
+ "61c74aac.7351c4"
]
]
},
{
- "id": "5974d41f.5000ac",
+ "id": "9e5f5985.9a8c28",
"type": "outcome",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1470.3332595825195,
- "y": 1102.9379558563232,
- "z": "4a2a8d50.48649c",
+ "x": 1643.3332595825195,
+ "y": 1122.9379558563232,
+ "z": "f5eee496.37583",
"wires": [
[
- "dde515a2.eea8c"
+ "61c74aac.7351c4"
]
]
},
{
- "id": "2f050ce4.d6732c",
+ "id": "6fc6cf80.2742",
"type": "outcome",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1463.851692199707,
- "y": 1454.592924118042,
- "z": "4a2a8d50.48649c",
+ "x": 1636.851692199707,
+ "y": 1474.592924118042,
+ "z": "f5eee496.37583",
"wires": [
[
- "740e2dc7.31c594"
+ "6a26d308.85095c"
]
]
},
{
- "id": "254873f2.91487c",
+ "id": "96eee0bd.7d8858",
"type": "outcome",
"name": "CreateSDWANSiteInstance",
"xml": "<outcome value='CreateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1455.8516693115234,
- "y": 1496.2593126296997,
- "z": "4a2a8d50.48649c",
+ "x": 1628.8516693115234,
+ "y": 1516.2593126296997,
+ "z": "f5eee496.37583",
"wires": [
[
- "740e2dc7.31c594"
+ "6a26d308.85095c"
]
]
},
{
- "id": "740e2dc7.31c594",
+ "id": "6a26d308.85095c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1713.8516845703125,
- "y": 1474.2593479156494,
- "z": "4a2a8d50.48649c",
+ "x": 1886.8516845703125,
+ "y": 1494.2593479156494,
+ "z": "f5eee496.37583",
"wires": [
[
- "34a062a6.1dcf1e"
+ "b45845a5.efe788"
]
]
},
{
- "id": "34a062a6.1dcf1e",
+ "id": "b45845a5.efe788",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2091.851531982422,
- "y": 1471.5930070877075,
- "z": "4a2a8d50.48649c",
+ "x": 2264.851531982422,
+ "y": 1491.5930070877075,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "de41704e.e02f2",
+ "id": "d11af3be.8899c",
"type": "outcome",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1470.333381652832,
- "y": 1838.9380779266357,
- "z": "4a2a8d50.48649c",
+ "x": 1643.333381652832,
+ "y": 1858.9380779266357,
+ "z": "f5eee496.37583",
"wires": [
[
- "129831e9.f87ede"
+ "f4a10691.8e0f9"
]
]
},
{
- "id": "da1c7a96.50bc1",
+ "id": "e8482541.be4a68",
"type": "outcome",
"name": "DeleteSDWANSiteInstance",
"xml": "<outcome value='DeleteSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1470.333381652832,
- "y": 1879.604642868042,
- "z": "4a2a8d50.48649c",
+ "x": 1643.333381652832,
+ "y": 1899.604642868042,
+ "z": "f5eee496.37583",
"wires": [
[
- "129831e9.f87ede"
+ "f4a10691.8e0f9"
]
]
},
{
- "id": "129831e9.f87ede",
+ "id": "f4a10691.8e0f9",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1720.3333740234375,
- "y": 1858.6045017242432,
- "z": "4a2a8d50.48649c",
+ "x": 1893.3333740234375,
+ "y": 1878.6045017242432,
+ "z": "f5eee496.37583",
"wires": [
[
- "229550df.5e154"
+ "ae8b0dcf.01d3b"
]
]
},
{
- "id": "229550df.5e154",
+ "id": "ae8b0dcf.01d3b",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2098.333221435547,
- "y": 1855.9381608963013,
- "z": "4a2a8d50.48649c",
+ "x": 2271.333221435547,
+ "y": 1875.9381608963013,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "48008d0.96b8a74",
+ "id": "90dfa10c.d03aa",
"type": "set",
"name": "set skip-mdsal-update to Y",
"xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
"comments": "",
- "x": 2247.0318908691406,
- "y": 361.4920959472656,
- "z": "4a2a8d50.48649c",
+ "x": 2420.0318908691406,
+ "y": 381.4920959472656,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "92f6b1eb.ca851",
+ "id": "18cf87e0.6196e8",
"type": "set",
"name": "set ack-final to 'N'",
"xml": "<set>\n<parameter name='ack-final' value='N' />\n",
"comments": "",
- "x": 2218.841583251953,
- "y": 425.8401184082031,
- "z": "4a2a8d50.48649c",
+ "x": 2391.841583251953,
+ "y": 445.8401184082031,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "2763f43e.b7f64c",
+ "id": "11b35a07.5a2e3e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2010.3811340332031,
- "y": 364.4126281738281,
- "z": "4a2a8d50.48649c",
+ "x": 2183.381134033203,
+ "y": 384.4126281738281,
+ "z": "f5eee496.37583",
"wires": [
[
- "48008d0.96b8a74",
- "92f6b1eb.ca851",
- "e91c2cf.91f4f5"
+ "90dfa10c.d03aa",
+ "18cf87e0.6196e8"
]
]
},
{
- "id": "99df438b.bf111",
+ "id": "2b315e75.81704a",
"type": "comment",
"name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
"info": "",
"comments": "",
- "x": 2431.158966064453,
- "y": 466.8094787597656,
- "z": "4a2a8d50.48649c",
+ "x": 2604.158966064453,
+ "y": 486.8094787597656,
+ "z": "f5eee496.37583",
"wires": []
},
{
- "id": "9860bb12.14903",
+ "id": "14ca87f8.41176",
"type": "switchNode",
"name": "so-response-url empty?",
"xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
"comments": "",
"outputs": 1,
- "x": 1116.2857971191406,
- "y": 211.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1289.2857971191406,
+ "y": 231.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "2a95a553.f75302",
- "1a29396b.d78657"
+ "26f3c83e.94f3d",
+ "8cb49b5.ced0668"
]
]
},
{
- "id": "2a95a553.f75302",
+ "id": "26f3c83e.94f3d",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1341.2857971191406,
- "y": 167.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1514.2857971191406,
+ "y": 187.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "9599639c.6064a"
+ "98eada69.09cbf8"
]
]
},
{
- "id": "1a29396b.d78657",
+ "id": "8cb49b5.ced0668",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1331.2857971191406,
- "y": 259.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1504.2857971191406,
+ "y": 279.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "7685fc6a.1e8e84"
+ "7f12b283.43e464"
]
]
},
{
- "id": "7685fc6a.1e8e84",
+ "id": "7f12b283.43e464",
"type": "switchNode",
"name": "so-response-url = ignored URL?",
"xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1553.2857971191406,
- "y": 260.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1726.2857971191406,
+ "y": 280.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "dcc6c506.1c2e3",
- "f03182d7.544448"
+ "d9307a61.e9cdb8",
+ "3106a2ed.a08146"
]
]
},
{
- "id": "9599639c.6064a",
+ "id": "98eada69.09cbf8",
"type": "call",
"name": "call vnf-topology-operation-assign-sync",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2017.2857971191406,
- "y": 168.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 2190.2857971191406,
+ "y": 188.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "dcc6c506.1c2e3",
+ "id": "d9307a61.e9cdb8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1793.2857971191406,
- "y": 259.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1966.2857971191406,
+ "y": 279.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "9599639c.6064a"
+ "98eada69.09cbf8"
]
]
},
{
- "id": "f03182d7.544448",
+ "id": "3106a2ed.a08146",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1801.2857971191406,
- "y": 360.28570556640625,
- "z": "4a2a8d50.48649c",
+ "x": 1974.2857971191406,
+ "y": 380.28570556640625,
+ "z": "f5eee496.37583",
"wires": [
[
- "2763f43e.b7f64c"
+ "11b35a07.5a2e3e"
]
]
},
{
- "id": "90549b1f.450ae",
+ "id": "87242f67.49446",
"type": "execute",
"name": "execute getProperties",
"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",
"comments": "",
"outputs": 1,
- "x": 1129.6622619628906,
- "y": 101.54547119140625,
- "z": "4a2a8d50.48649c",
+ "x": 1302.6622619628906,
+ "y": 121.54547119140625,
+ "z": "f5eee496.37583",
"wires": [
[]
]
},
{
- "id": "f7b6e38.ff165a",
+ "id": "1151efa6.7d7988",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 938.7533264160156,
- "y": 99.727294921875,
- "z": "4a2a8d50.48649c",
+ "x": 1111.7533264160156,
+ "y": 119.727294921875,
+ "z": "f5eee496.37583",
"wires": [
[
- "9860bb12.14903",
- "90549b1f.450ae"
+ "14ca87f8.41176",
+ "87242f67.49446"
]
]
- },
- {
- "id": "e91c2cf.91f4f5",
- "type": "call",
- "name": "call vnf-topology-operation-assign-async",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 2282,
- "y": 510,
- "z": "4a2a8d50.48649c",
- "wires": [
- []
- ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions index b56795f8..cd5b8203 100755 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -183,6 +183,8 @@ GENERIC-RESOURCE-API vf-module-topology-operation-activate ${project.version} sy GENERIC-RESOURCE-API vf-module-topology-operation-assign-no-preload ${project.version} sync GENERIC-RESOURCE-API vf-module-topology-operation-assign-preload ${project.version} sync GENERIC-RESOURCE-API vf-module-topology-operation-assign ${project.version} sync +GENERIC-RESOURCE-API vf-module-topology-operation-assign-async ${project.version} sync +GENERIC-RESOURCE-API vf-module-topology-operation-assign-sync ${project.version} sync GENERIC-RESOURCE-API vf-module-topology-operation-changeassign ${project.version} sync GENERIC-RESOURCE-API vf-module-topology-operation-deactivate ${project.version} sync GENERIC-RESOURCE-API vf-module-topology-operation-unassign ${project.version} sync @@ -196,6 +198,8 @@ GENERIC-RESOURCE-API vnf-get-resource-request ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-async ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-activate ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-assign ${project.version} sync +GENERIC-RESOURCE-API vnf-topology-operation-assign-async ${project.version} sync +GENERIC-RESOURCE-API vnf-topology-operation-assign-sync ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-changeassign ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-deactivate ${project.version} sync GENERIC-RESOURCE-API vnf-topology-operation-unassign ${project.version} sync diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml index 4c89d83b..e0527fbf 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml @@ -8,7 +8,7 @@ </set>
<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
<outcome value='assign'>
- <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>
</outcome>
<outcome value='Other'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml index dc7dc371..9258d3b5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml @@ -28,7 +28,6 @@ <set>
<parameter name='ack-final' value='N' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>
</block>
</outcome>
</switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml index 69175f2f..64183ebd 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml @@ -8,7 +8,7 @@ </set>
<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
<outcome value='assign'>
- <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' ></call>
</outcome>
<outcome value='Other'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml index d1cc40d7..c796dd88 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml @@ -28,7 +28,6 @@ <set>
<parameter name='ack-final' value='N' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' ></call>
</block>
</outcome>
</switch>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 38267fcf..8c9e4582 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 76159bd6..f90aef63 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 6be93b7c..7bb7c604 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 1ea10972..b27c5094 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 c3193d5c..da4c1316 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 b5669b09..851c2174 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.7.5-SNAPSHOT</version> + <version>1.7.6-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 839d0847..6fa2c915 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.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> @@ -10,7 +10,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.7.5-SNAPSHOT</version> + <version>1.7.6-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam</name> diff --git a/version.properties b/version.properties index a2c3ec5a..61a95fd5 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=7 -feature_revision=5 +feature_revision=6 base_version=${release_name}.${sprint_number}.${feature_revision} |