diff options
| author |   shashikanth.vh <shashikanth.vh@huawei.com> | 2018-09-07 14:38:22 +0530 |
|---|---|---|
| committer | shashikanth.vh <shashikanth.vh@huawei.com> | 2018-09-07 17:24:17 +0530 |
| commit | 55b429cfc73802e3e52fa2f3864ecc4cdd552728 (patch) | |
| tree | 5eee99f5b0b7e039ea0250d5549ca25aae74fd04 /platform-logic | |
| parent | db323d0fa39eabc03faf8c803876da5f87079e58 (diff) | |
integration test issues fix for sdwan and sotn
Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682
Diffstat (limited to 'platform-logic')
63 files changed, 11669 insertions, 9723 deletions
diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml new file mode 100644 index 00000000..9a296b5c --- /dev/null +++ b/platform-logic/datachange/pom.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-datachange</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> + <description>Contains platform-level service logic for the data change</description> + + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/svclogic/graphs/datachange</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json index da0567b7..426b8562 100644 --- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json +++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json @@ -1,379 +1,378 @@ -[
- {
- "id": "865891e7.3a6c6",
- "type": "other",
- "name": "update",
- "xml": "<outcome value='Update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 673.4443511962891,
- "y": 212.66669368743896,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "3eefa587.6bd50a"
- ]
- ]
- },
- {
- "id": "4e8bb18c.6ca95",
- "type": "other",
- "name": "delete",
- "xml": "<outcome value='delete'>\n",
- "comments": "",
- "outputs": 1,
- "x": 701.6665267944336,
- "y": 484.33349609375,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "523ab02e.031c1"
- ]
- ]
- },
- {
- "id": "523ab02e.031c1",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 857.1112060546875,
- "y": 484.33351707458496,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "977d339.f9669d",
- "type": "comment",
- "name": "TODO: Delete topology from AAI",
- "info": "",
- "comments": "",
- "x": 781.7777862548828,
- "y": 447.0001811981201,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "9b67a1c0.1e23e",
- "type": "switchNode",
- "name": "switch aai-event-trigger",
- "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 457.9999771118164,
- "y": 351.2222261428833,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "865891e7.3a6c6",
- "4e8bb18c.6ca95"
- ]
- ]
- },
- {
- "id": "3eefa587.6bd50a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 841.7781524658203,
- "y": 211.11124515533447,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "8498ca44.850928",
- "31425256.e48c3e",
- "fd4c6f6.9751e9"
- ]
- ]
- },
- {
- "id": "8498ca44.850928",
- "type": "execute",
- "name": "execute RestApiCallNode Get token",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1119.4376068115234,
- "y": 167.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "c3c1ad15.85994",
- "cd6736f3.94ff18"
- ]
- ]
- },
- {
- "id": "c3c1ad15.85994",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1354.4376068115234,
- "y": 145.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "e15c61b4.92509"
- ]
- ]
- },
- {
- "id": "cd6736f3.94ff18",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1346.6876068115234,
- "y": 198.6733832359314,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "40518e2c.2c734"
- ]
- ]
- },
- {
- "id": "e15c61b4.92509",
- "type": "set",
- "name": "set token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
- "comments": "",
- "x": 1508.4376068115234,
- "y": 146.03049993515015,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "31425256.e48c3e",
- "type": "execute",
- "name": "execute RestApiCallNode Get Topology",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
- "comments": "",
- "outputs": 1,
- "x": 1122.7710418701172,
- "y": 260.73423767089844,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "ac09d1db.665eb",
- "4c50157f.5bc03c"
- ]
- ]
- },
- {
- "id": "ac09d1db.665eb",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1381.3263664245605,
- "y": 238.73421955108643,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7a8d5805.fa1088"
- ]
- ]
- },
- {
- "id": "7a8d5805.fa1088",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "comments": "",
- "outputs": 1,
- "x": 1556.8818969726562,
- "y": 236.40094184875488,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "7717d78.ee45028",
- "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=\"Error executing Create vpn rest api\" />\n",
- "comments": "",
- "x": 1565.1041717529297,
- "y": 310.62305545806885,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "4c50157f.5bc03c",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1386.770851135254,
- "y": 309.84528493881226,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7717d78.ee45028"
- ]
- ]
- },
- {
- "id": "fe88648c.ffce68",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 78.4443130493164,
- "y": 91,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "7387008c.4a9fe"
- ]
- ]
- },
- {
- "id": "7387008c.4a9fe",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "version": "${project.version}",
- "comments": "",
- "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 236.55543899536133,
- "y": 132.4444613456726,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "f56e7701.2fd2c8"
- ]
- ]
- },
- {
- "id": "f56e7701.2fd2c8",
- "type": "method",
- "name": "method esr-thirdparty-sdnc-discovery",
- "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 333,
- "y": 243.22224235534668,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "4c6047b0.71e118"
- ]
- ]
- },
- {
- "id": "4c6047b0.71e118",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 241.22222900390625,
- "y": 352.11122035980225,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "9b67a1c0.1e23e"
- ]
- ]
- },
- {
- "id": "fd4c6f6.9751e9",
- "type": "for",
- "name": "for each Network",
- "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1054.9258041381836,
- "y": 388.22217655181885,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "22efb538.f3605a"
- ]
- ]
- },
- {
- "id": "22efb538.f3605a",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1244.925765991211,
- "y": 395.9999694824219,
- "z": "fce0b4d3.a9be08",
- "wires": [
- [
- "995bcad0.798cf8",
- "31478e5.e5c4072"
- ]
- ]
- },
- {
- "id": "995bcad0.798cf8",
- "type": "call",
- "name": "call update-network-to-aai",
- "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1498.2591876983643,
- "y": 459.3333396911621,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "31478e5.e5c4072",
- "type": "set",
- "name": "set network",
- "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
- "comments": "",
- "x": 1450.4813079833984,
- "y": 377.111083984375,
- "z": "fce0b4d3.a9be08",
- "wires": []
- },
- {
- "id": "40518e2c.2c734",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1508.2590026855469,
- "y": 193.7777624130249,
- "z": "fce0b4d3.a9be08",
- "wires": [
- []
- ]
- },
- {
- "id": "793cc07c.4e65e",
- "type": "comment",
- "name": "Do Nothing",
- "info": "",
- "comments": "",
- "x": 1643.814576466878,
- "y": 192.666638162401,
- "z": "fce0b4d3.a9be08",
- "wires": []
- }
-]
\ No newline at end of file +[ + { + "id": "e714f114.a841a", + "type": "other", + "name": "update", + "xml": "<outcome value='Update'>\n", + "comments": "", + "outputs": 1, + "x": 674.5000419616699, + "y": 205.66669845581055, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "412d4a4c.5ea2f4" + ] + ] + }, + { + "id": "47ba392d.437028", + "type": "other", + "name": "delete", + "xml": "<outcome value='delete'>\n", + "comments": "", + "outputs": 1, + "x": 702.7222175598145, + "y": 477.3335008621216, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "e84e5704.965b68" + ] + ] + }, + { + "id": "e84e5704.965b68", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 858.1668968200684, + "y": 477.33352184295654, + "z": "f60ccc0b.2e9e5", + "wires": [ + [] + ] + }, + { + "id": "5e6b6675.fc5a18", + "type": "comment", + "name": "TODO: Delete topology from AAI", + "info": "", + "comments": "", + "x": 782.8334770202637, + "y": 440.0001859664917, + "z": "f60ccc0b.2e9e5", + "wires": [] + }, + { + "id": "bf8e19f1.7f5908", + "type": "switchNode", + "name": "switch aai-event-trigger", + "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n", + "comments": "", + "outputs": 1, + "x": 459.05566787719727, + "y": 344.2222309112549, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "e714f114.a841a", + "47ba392d.437028" + ] + ] + }, + { + "id": "412d4a4c.5ea2f4", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 842.8338432312012, + "y": 204.11124992370605, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "52b0fb73.694034", + "b992a9e2.abb498" + ] + ] + }, + { + "id": "bf4a7e8b.e2772", + "type": "execute", + "name": "execute RestApiCallNode Get token", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", + "comments": "", + "outputs": 1, + "x": 1120.4932975769043, + "y": 160.03050470352173, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "cbcc146a.b18a48", + "934e7ef4.942bd" + ] + ] + }, + { + "id": "cbcc146a.b18a48", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1355.4932975769043, + "y": 138.03050470352173, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "9ebe20af.228e5" + ] + ] + }, + { + "id": "934e7ef4.942bd", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1347.7432975769043, + "y": 191.67338800430298, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "fe461c21.f9128" + ] + ] + }, + { + "id": "9ebe20af.228e5", + "type": "set", + "name": "set token-id", + "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", + "comments": "", + "x": 1509.4932975769043, + "y": 139.03050470352173, + "z": "f60ccc0b.2e9e5", + "wires": [] + }, + { + "id": "52b0fb73.694034", + "type": "execute", + "name": "execute RestApiCallNode Get Topology", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 1123.8267250061035, + "y": 253.73424243927002, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "bf8dd5a2.3ec108", + "4e2f04da.b5496c" + ] + ] + }, + { + "id": "bf8dd5a2.3ec108", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1382.3820571899414, + "y": 231.734224319458, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "9692e7a9.a7ad78" + ] + ] + }, + { + "id": "9692e7a9.a7ad78", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "comments": "", + "outputs": 1, + "x": 1557.937587738037, + "y": 229.40094661712646, + "z": "f60ccc0b.2e9e5", + "wires": [ + [] + ] + }, + { + "id": "1548c97d.137267", + "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=\"Error executing Create vpn rest api\" />\n", + "comments": "", + "x": 1566.1598625183105, + "y": 303.62306022644043, + "z": "f60ccc0b.2e9e5", + "wires": [] + }, + { + "id": "4e2f04da.b5496c", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1387.8265419006348, + "y": 302.84528970718384, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "1548c97d.137267" + ] + ] + }, + { + "id": "773b4a80.972f64", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 99.50000381469727, + "y": 84.00000476837158, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "6b3bf10f.0a471" + ] + ] + }, + { + "id": "6b3bf10f.0a471", + "type": "service-logic", + "name": "DataChange ${project.version}", + "module": "DataChange", + "version": "${project.version}", + "comments": "", + "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>", + "outputs": 1, + "x": 237.6111297607422, + "y": 125.44446611404419, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "34347376.ce668c" + ] + ] + }, + { + "id": "34347376.ce668c", + "type": "method", + "name": "method esr-thirdparty-sdnc-discovery", + "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n", + "comments": "", + "outputs": 1, + "x": 334.05569076538086, + "y": 236.22224712371826, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "1ded1b72.af18c5" + ] + ] + }, + { + "id": "1ded1b72.af18c5", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 242.2779197692871, + "y": 345.1112251281738, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "bf8e19f1.7f5908" + ] + ] + }, + { + "id": "b992a9e2.abb498", + "type": "for", + "name": "for each Network", + "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n", + "comments": "", + "outputs": 1, + "x": 1055.9814949035645, + "y": 381.22218132019043, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "d00ff672.d0b048" + ] + ] + }, + { + "id": "d00ff672.d0b048", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1245.9814567565918, + "y": 388.99997425079346, + "z": "f60ccc0b.2e9e5", + "wires": [ + [ + "ba2cdcd.67eab2", + "b9e492ff.96a56" + ] + ] + }, + { + "id": "ba2cdcd.67eab2", + "type": "call", + "name": "call update-network-to-aai", + "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 1499.3148784637451, + "y": 452.3333444595337, + "z": "f60ccc0b.2e9e5", + "wires": [ + [] + ] + }, + { + "id": "b9e492ff.96a56", + "type": "set", + "name": "set network", + "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n", + "comments": "", + "x": 1451.5369987487793, + "y": 370.1110887527466, + "z": "f60ccc0b.2e9e5", + "wires": [] + }, + { + "id": "fe461c21.f9128", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1509.3146934509277, + "y": 186.77776718139648, + "z": "f60ccc0b.2e9e5", + "wires": [ + [] + ] + }, + { + "id": "12e3cffc.36ff4", + "type": "comment", + "name": "Do Nothing", + "info": "", + "comments": "", + "x": 1644.8702672322588, + "y": 185.66664293077258, + "z": "f60ccc0b.2e9e5", + "wires": [] + } +] diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json index 5c40ac4c..94cd2655 100644 --- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json +++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc.json @@ -1,320 +1,364 @@ -[
- {
- "id": "d0fde8b6.3aa408",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 114.00390625,
- "y": 42.00390625,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "4796011e.231d3"
- ]
- ]
- },
- {
- "id": "4796011e.231d3",
- "type": "service-logic",
- "name": "DataChange ${project.version}",
- "module": "DataChange",
- "version": "${project.version}",
- "comments": "",
- "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
- "outputs": 1,
- "x": 300.1150550842285,
- "y": 146.44837760925293,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "83e631da.db4b1"
- ]
- ]
- },
- {
- "id": "83e631da.db4b1",
- "type": "method",
- "name": "method esr-thirdparty-sdnc",
- "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 297.5596046447754,
- "y": 310.2261629104614,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "2d86f41b.00eefc"
- ]
- ]
- },
- {
- "id": "2d86f41b.00eefc",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 252.7818717956543,
- "y": 445.1152181625366,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "1ccf3882.d71c77",
- "41fd63bc.2e97bc",
- "ba86cde8.fb9f3",
- "b799af7a.5b9c9"
- ]
- ]
- },
- {
- "id": "ba86cde8.fb9f3",
- "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=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
- "comments": "",
- "outputs": 1,
- "x": 542.00390625,
- "y": 516.00390625,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "1ccf3882.d71c77",
- "type": "call",
- "name": "call validate-esr-thirdparty-sdnc-input",
- "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 655.7815399169922,
- "y": 379.0037097930908,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "41fd63bc.2e97bc",
- "type": "for",
- "name": "for 0..key-data_length",
- "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 590.4480133056641,
- "y": 461.19469451904297,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "b1d2d6de.13b948"
- ]
- ]
- },
- {
- "id": "b1d2d6de.13b948",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 762.3374786376953,
- "y": 460.4169397354126,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "1ad86336.4ad5cd",
- "fa2d7e75.6219e",
- "5d462805.1bcf28",
- "44977471.592c0c"
- ]
- ]
- },
- {
- "id": "1ad86336.4ad5cd",
- "type": "switchNode",
- "name": "switch service-url",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 974.5591812133789,
- "y": 370.5280923843384,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "49195641.421748"
- ]
- ]
- },
- {
- "id": "49195641.421748",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1138.5593032836914,
- "y": 369.5593252182007,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "68e2f0ac.a4549"
- ]
- ]
- },
- {
- "id": "68e2f0ac.a4549",
- "type": "set",
- "name": "set service-url",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1292.5593948364258,
- "y": 369.1593189239502,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "fa2d7e75.6219e",
- "type": "switchNode",
- "name": "switch user-name",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 971.8489265441895,
- "y": 439.7751522064209,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "4a967272.ac408c"
- ]
- ]
- },
- {
- "id": "4a967272.ac408c",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1140.8489151000977,
- "y": 437.8063955307007,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "a97aae71.052dc"
- ]
- ]
- },
- {
- "id": "a97aae71.052dc",
- "type": "set",
- "name": "set user",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1276.8490676879883,
- "y": 437.40638637542725,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "5d462805.1bcf28",
- "type": "switchNode",
- "name": "switch password",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 969.6267585754395,
- "y": 505.33070182800293,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "aa2c8a18.06def8"
- ]
- ]
- },
- {
- "id": "aa2c8a18.06def8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1141.6267166137695,
- "y": 505.36194705963135,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "ae62fe3a.d8789"
- ]
- ]
- },
- {
- "id": "ae62fe3a.d8789",
- "type": "set",
- "name": "set password",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1296.6269607543945,
- "y": 503.9619264602661,
- "z": "57a3a26d.f7d23c",
- "wires": []
- },
- {
- "id": "b799af7a.5b9c9",
- "type": "call",
- "name": "call esr-thirdparty-sdnc-discovery",
- "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 613.4416656494141,
- "y": 587.5529069900513,
- "z": "57a3a26d.f7d23c",
- "wires": [
- []
- ]
- },
- {
- "id": "44977471.592c0c",
- "type": "switchNode",
- "name": "switch esr-system-info-id",
- "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 991.4480667114258,
- "y": 559.3370685577393,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "e1fdba16.c57aa8"
- ]
- ]
- },
- {
- "id": "e1fdba16.c57aa8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1166.4480438232422,
- "y": 557.3682584762573,
- "z": "57a3a26d.f7d23c",
- "wires": [
- [
- "3f219327.b83efc"
- ]
- ]
- },
- {
- "id": "3f219327.b83efc",
- "type": "set",
- "name": "set esr-system-info-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n",
- "comments": "",
- "x": 1332.448013305664,
- "y": 558.968282699585,
- "z": "57a3a26d.f7d23c",
- "wires": []
- }
-]
\ No newline at end of file +[ + { + "id": "3645100d.93b1e", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 131, + "y": 57, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "a67dda3b.aa6388" + ] + ] + }, + { + "id": "a67dda3b.aa6388", + "type": "service-logic", + "name": "DataChange ${project.version}", + "module": "DataChange", + "version": "${project.version}", + "comments": "", + "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>", + "outputs": 1, + "x": 317.1111488342285, + "y": 161.44447135925293, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "fc54766d.ffb9e8" + ] + ] + }, + { + "id": "fc54766d.ffb9e8", + "type": "method", + "name": "method esr-thirdparty-sdnc", + "xml": "<method rpc='esr-thirdparty-sdnc' mode='sync'>\n", + "comments": "", + "outputs": 1, + "x": 314.5556983947754, + "y": 325.2222566604614, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "e6c2b0ea.17014" + ] + ] + }, + { + "id": "e6c2b0ea.17014", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 269.7779655456543, + "y": 460.1113119125366, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "9897db0a.e34dc8", + "9787862d.18f5b8", + "195661d4.a9c59e", + "8e1fe65e.d69f18" + ] + ] + }, + { + "id": "195661d4.a9c59e", + "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=\"data-change-notification\"/>\n<parameter name=\"field3\" value=\"Config\"/>\n<parameter name=\"field4\" value=\"`service-url`\"/>\n<parameter name=\"field5\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>", + "comments": "", + "outputs": 1, + "x": 559, + "y": 531, + "z": "f5f8cf31.a0ec1", + "wires": [ + [] + ] + }, + { + "id": "9897db0a.e34dc8", + "type": "call", + "name": "call validate-esr-thirdparty-sdnc-input", + "xml": "<call module='DataChange' rpc='validate-esr-thirdparty-sdnc-input' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 672.7776336669922, + "y": 393.9998035430908, + "z": "f5f8cf31.a0ec1", + "wires": [ + [] + ] + }, + { + "id": "9787862d.18f5b8", + "type": "for", + "name": "for 0..key-data_length", + "xml": "<for index='idx' start='0' end='`$data-change-notification-input.key-data_length`' >\n", + "comments": "", + "outputs": 1, + "x": 607.4441070556641, + "y": 476.19078826904297, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "64de51c2.171a2" + ] + ] + }, + { + "id": "64de51c2.171a2", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 779.3335723876953, + "y": 475.4130334854126, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "6c37c93a.5a9338", + "f8e49db.93b206", + "b38e3659.a3e968", + "abe36d34.993f2", + "ab9e3d95.0ab8" + ] + ] + }, + { + "id": "6c37c93a.5a9338", + "type": "switchNode", + "name": "switch service-url", + "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'service-url'`\">\n", + "comments": "", + "outputs": 1, + "x": 991.5552749633789, + "y": 385.5241861343384, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "ef74e18a.347bb" + ] + ] + }, + { + "id": "ef74e18a.347bb", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1155.5553970336914, + "y": 384.5554189682007, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "ce02826f.96607" + ] + ] + }, + { + "id": "ce02826f.96607", + "type": "set", + "name": "set service-url", + "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", + "comments": "", + "x": 1309.5554885864258, + "y": 384.1554126739502, + "z": "f5f8cf31.a0ec1", + "wires": [] + }, + { + "id": "f8e49db.93b206", + "type": "switchNode", + "name": "switch user-name", + "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'user-name'`\">\n", + "comments": "", + "outputs": 1, + "x": 988.8450202941895, + "y": 454.7712459564209, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "b1f04d56.2de33" + ] + ] + }, + { + "id": "b1f04d56.2de33", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1157.8450088500977, + "y": 452.8024892807007, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "393fe106.5ce84e" + ] + ] + }, + { + "id": "393fe106.5ce84e", + "type": "set", + "name": "set user", + "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", + "comments": "", + "x": 1293.8451614379883, + "y": 452.40248012542725, + "z": "f5f8cf31.a0ec1", + "wires": [] + }, + { + "id": "b38e3659.a3e968", + "type": "switchNode", + "name": "switch password", + "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'password'`\">\n", + "comments": "", + "outputs": 1, + "x": 986.6228523254395, + "y": 520.3267955780029, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "31f8b0b.92d9a5" + ] + ] + }, + { + "id": "31f8b0b.92d9a5", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1158.6228103637695, + "y": 520.3580408096313, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "4275b621.ba48f8" + ] + ] + }, + { + "id": "4275b621.ba48f8", + "type": "set", + "name": "set password", + "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", + "comments": "", + "x": 1313.6230545043945, + "y": 518.9580202102661, + "z": "f5f8cf31.a0ec1", + "wires": [] + }, + { + "id": "8e1fe65e.d69f18", + "type": "call", + "name": "call esr-thirdparty-sdnc-discovery", + "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 630.4377593994141, + "y": 602.5490007400513, + "z": "f5f8cf31.a0ec1", + "wires": [ + [] + ] + }, + { + "id": "abe36d34.993f2", + "type": "switchNode", + "name": "switch esr-system-info-id", + "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`\">\n", + "comments": "", + "outputs": 1, + "x": 1008.4441528320312, + "y": 574.3331909179688, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "c47d5b3c.ec2b98" + ] + ] + }, + { + "id": "c47d5b3c.ec2b98", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1183.4441375732422, + "y": 572.3643522262573, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "b46d33d6.3f8df" + ] + ] + }, + { + "id": "b46d33d6.3f8df", + "type": "set", + "name": "set esr-system-info-id", + "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", + "comments": "", + "x": 1349.444107055664, + "y": 573.964376449585, + "z": "f5f8cf31.a0ec1", + "wires": [] + }, + { + "id": "ab9e3d95.0ab8", + "type": "switchNode", + "name": "switch thirdparty-sdnc-id", + "xml": "<switch test=\"`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`\">\n", + "comments": "", + "outputs": 1, + "x": 1003, + "y": 619, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "6a0992e2.98429c" + ] + ] + }, + { + "id": "6a0992e2.98429c", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1177.999984741211, + "y": 617.0311613082886, + "z": "f5f8cf31.a0ec1", + "wires": [ + [ + "75b4346a.e3888c" + ] + ] + }, + { + "id": "75b4346a.e3888c", + "type": "set", + "name": "set thirdparty-sdnc-id", + "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />\n", + "comments": "", + "x": 1343.9999542236328, + "y": 618.6311855316162, + "z": "f5f8cf31.a0ec1", + "wires": [] + } +] diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json index c1cf62db..f82168b9 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json @@ -1,20 +1,20 @@ [ { - "id": "20435d2f.b707b2", + "id": "4d48ad52.66bce4", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 129.01040649414062, - "y": 61.010414123535156, - "z": "3e15e6f8.d8900a", + "x": 116, + "y": 72, + "z": "972d7ac.f66db88", "wires": [ [ - "83ca6f8e.538a2" + "66f854f4.bc80cc" ] ] }, { - "id": "83ca6f8e.538a2", + "id": "66f854f4.bc80cc", "type": "service-logic", "name": "DataChange ${project.version}", "module": "DataChange", @@ -22,216 +22,279 @@ "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='DataChange' version='${project.version}'>", "outputs": 1, - "x": 218.01043701171875, - "y": 151.8993263244629, - "z": "3e15e6f8.d8900a", + "x": 205.00003051757812, + "y": 162.88891220092773, + "z": "972d7ac.f66db88", "wires": [ [ - "5fa2f1f3.bb35e" + "7eee0fcc.e1d78" ] ] }, { - "id": "5fa2f1f3.bb35e", + "id": "7eee0fcc.e1d78", "type": "method", "name": "method update-network-to-aai", "xml": "<method rpc='update-network-to-aai' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 254.1216583251953, - "y": 222.23265075683594, - "z": "3e15e6f8.d8900a", + "x": 241.1112518310547, + "y": 233.22223663330078, + "z": "972d7ac.f66db88", "wires": [ [ - "44238134.7d97f" + "dd17da81.f85678" ] ] }, { - "id": "44238134.7d97f", + "id": "dd17da81.f85678", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 479.3438415527344, - "y": 221.78833770751953, - "z": "3e15e6f8.d8900a", + "x": 466.33343505859375, + "y": 232.77792358398438, + "z": "972d7ac.f66db88", "wires": [ [ - "84458cb3.2004e", - "282c5771.31f2f8", - "c27c36c9.fe0038" + "c70a984d.cc2a48", + "5cf53006.e1ea9", + "a9f8a08c.a159f" ] ] }, { - "id": "282c5771.31f2f8", + "id": "5cf53006.e1ea9", "type": "update", "name": "save network-resource", "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource' \n key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n\n", "comments": "", "outputs": 1, - "x": 709.3436584472656, - "y": 127.01042938232422, - "z": "3e15e6f8.d8900a", + "x": 696.333251953125, + "y": 138.00001525878906, + "z": "972d7ac.f66db88", "wires": [ [] ] }, { - "id": "8db597cb.e2ef58", + "id": "bc0b4672.53b908", "type": "update", "name": "save pnf", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='network-resource.network-id = $tmp.network-id\n AND pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 899.1215515136719, - "y": 179.12151336669922, - "z": "3e15e6f8.d8900a", + "x": 879.111141204834, + "y": 191.111102104187, + "z": "972d7ac.f66db88", "wires": [ [] ] }, { - "id": "c27c36c9.fe0038", + "id": "a9f8a08c.a159f", "type": "for", "name": "for each node", "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n", "comments": "", "outputs": 1, - "x": 685.8992614746094, - "y": 171.3437271118164, - "z": "3e15e6f8.d8900a", + "x": 679.8888549804688, + "y": 208.33331298828125, + "z": "972d7ac.f66db88", "wires": [ [ - "8db597cb.e2ef58", - "6b246a86.7d22b4", - "79357b97.6a6604", - "629488d9.a436f8", - "89ed3af1.c4f958" + "bc0b4672.53b908", + "6b3704fc.0bd35c", + "24e04af5.ddea66", + "9b1ff78d.8b3c08", + "8e9342c1.220f" ] ] }, { - "id": "6b246a86.7d22b4", + "id": "6b3704fc.0bd35c", "type": "set", "name": "set network", "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n", "comments": "", - "x": 906.1214904785156, - "y": 145.23262786865234, - "z": "3e15e6f8.d8900a", + "x": 893.111083984375, + "y": 156.2222137451172, + "z": "972d7ac.f66db88", "wires": [] }, { - "id": "79357b97.6a6604", + "id": "9b1ff78d.8b3c08", "type": "save", "name": "save pnf relationship to network-resource in AAI", "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />", "comments": "", "outputs": 1, - "x": 1017.7884216308594, - "y": 212.45490264892578, - "z": "3e15e6f8.d8900a", + "x": 1004.7779541015625, + "y": 223.44447803497314, + "z": "972d7ac.f66db88", "wires": [ [] ] }, { - "id": "89ed3af1.c4f958", + "id": "8e9342c1.220f", "type": "for", "name": "for each termination point", "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n", "comments": "", "outputs": 1, - "x": 950.4548645019531, - "y": 328.12149810791016, - "z": "3e15e6f8.d8900a", + "x": 937.4444580078125, + "y": 339.111083984375, + "z": "972d7ac.f66db88", "wires": [ [ - "6bc546b5.f87e18", - "8d1a709c.fbdf6", - "ad4de444.eb7858", - "bd80da47.090a88" + "7c32bd23.da1e04", + "38ff90b0.67e0b", + "36dd756f.9a425a" ] ] }, { - "id": "6bc546b5.f87e18", + "id": "7c32bd23.da1e04", "type": "set", "name": "set termination point", "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n", "comments": "", - "x": 1217.1217346191406, - "y": 289.01045989990234, - "z": "3e15e6f8.d8900a", + "x": 1204.111328125, + "y": 300.0000457763672, + "z": "972d7ac.f66db88", "wires": [] }, { - "id": "bd80da47.090a88", + "id": "36dd756f.9a425a", "type": "update", "name": "save p-interface", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='network-resource.network-id = $tmp.network-id\n AND pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n", "comments": "", "outputs": 1, - "x": 1200.8254699707031, - "y": 357.5660171508789, - "z": "3e15e6f8.d8900a", + "x": 1187.8151397705078, + "y": 473.5555934906006, + "z": "972d7ac.f66db88", "wires": [ - [] + [ + "310a666a.23204a", + "52308d76.244944" + ] ] }, { - "id": "8d1a709c.fbdf6", + "id": "9b33d7c5.abef78", "type": "save", "name": "save pnf relationship to p-interface in AAI", "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />", "comments": "", "outputs": 1, - "x": 1278.7142639160156, - "y": 395.34375762939453, - "z": "3e15e6f8.d8900a", + "x": 1263.7038879394531, + "y": 562.333345413208, + "z": "972d7ac.f66db88", "wires": [ [] ] }, { - "id": "ad4de444.eb7858", + "id": "38ff90b0.67e0b", "type": "set", "name": "set unique-ltpId", "xml": "<set>\n<parameter name='unique-ltpId' value=\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\" />\n", "comments": "", - "x": 1201.0106506347656, - "y": 323.1215286254883, - "z": "3e15e6f8.d8900a", + "x": 1188.000244140625, + "y": 334.1111145019531, + "z": "972d7ac.f66db88", "wires": [] }, { - "id": "84458cb3.2004e", + "id": "c70a984d.cc2a48", "type": "execute", "name": "execute", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ", "comments": "", "outputs": 1, - "x": 659.0039367675781, - "y": 88.00390625, - "z": "3e15e6f8.d8900a", + "x": 645.9935302734375, + "y": 98.99349212646484, + "z": "972d7ac.f66db88", "wires": [ [] ] }, { - "id": "629488d9.a436f8", + "id": "24e04af5.ddea66", "type": "save", "name": "save pnf relation with esr-thirdparty-sdnc", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n", + "comments": "", + "outputs": 1, + "x": 986, + "y": 259.9934997558594, + "z": "972d7ac.f66db88", + "wires": [ + [] + ] + }, + { + "id": "310a666a.23204a", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1359.4998397827148, + "y": 460.7460689544678, + "z": "972d7ac.f66db88", + "wires": [ + [ + "fcc0153a.edfd18" + ] + ] + }, + { + "id": "52308d76.244944", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1353.1784286499023, + "y": 512.9603805541992, + "z": "972d7ac.f66db88", + "wires": [ + [ + "1c6a1f1f.8e0f61" + ] + ] + }, + { + "id": "fcc0153a.edfd18", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1510, + "y": 460, + "z": "972d7ac.f66db88", + "wires": [ + [] + ] + }, + { + "id": "1c6a1f1f.8e0f61", + "type": "update", + "name": "save p-interface", + "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n", "comments": "", "outputs": 1, - "x": 999.0104064941406, - "y": 249.00391387939453, - "z": "3e15e6f8.d8900a", + "x": 1530, + "y": 510, + "z": "972d7ac.f66db88", "wires": [ [] ] diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml index ba2ea398..3f2dc892 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml @@ -7,25 +7,6 @@ <outcome value='Update'>
<block atomic="true">
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
- <parameter name="responsePrefix" value="token-result"/>
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <outcome value='success'>
- <set>
- <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
- </set>
- </outcome>
- <outcome value='failure'>
- <block></block>
- </outcome>
- </execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -64,4 +45,4 @@ </switch>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml index 33d91a7c..edce7fbb 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml @@ -30,6 +30,13 @@ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`">
<outcome value='true'>
<set>
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`">
+ <outcome value='true'>
+ <set>
<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />
</set>
</outcome>
@@ -47,4 +54,4 @@ <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' ></call>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml index f3f089a9..666d337a 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml @@ -21,8 +21,7 @@ <parameter name='node.' value='`$network.node[$pidx].`' />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
- key='network-resource.network-id = $tmp.network-id
- AND pnf.pnf-name = $node.node-id' >
+ key='pnf.pnf-name = $node.node-id' >
<parameter name='pnf-name' value='`$node.node-id`' />
<parameter name='pnf-id' value='`$node.node-id`' />
<parameter name='operational-status' value='`$node.te.oper-status`' />
@@ -40,7 +39,7 @@ key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="pnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
</save>
@@ -52,8 +51,7 @@ <parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />
</set>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='network-resource.network-id = $tmp.network-id
- AND pnf.pnf-name = $node.node-id
+ key='pnf.pnf-name = $node.node-id
AND p-interface.interface-name = $unique-ltpId' >
<parameter name='interface-name' value='`$unique-ltpId`' />
<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
@@ -61,13 +59,21 @@ <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
<parameter name='operational-status' value='`$tp.te.oper-status`' />
<parameter name='in-maint' value="true" />
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId`" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $node.node-id
+ AND p-interface.interface-name = $unique-ltpId' >
+ <parameter name='interface-name' value='`$unique-ltpId`' />
+ <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+ <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+ <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+ <parameter name='operational-status' value='`$tp.te.oper-status`' />
+ <parameter name='in-maint' value="true" />
+ </update>
+ </outcome>
</save>
</for>
</for>
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json index 684b6b02..4d15309c 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json @@ -1,20 +1,20 @@ [ { - "id": "8656b138.5dcef", + "id": "4eb3c760.0f4e78", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 87.00390625, - "y": 63.999998569488525, - "z": "4842829a.c92f5c", + "x": 91, + "y": 47, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "434423eb.200dcc" + "6dada1.f2c9326" ] ] }, { - "id": "434423eb.200dcc", + "id": "6dada1.f2c9326", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,2027 +22,2246 @@ "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": 278.0039119720459, - "y": 134.00001668930054, - "z": "4842829a.c92f5c", + "x": 282.0000057220459, + "y": 117.00001811981201, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e6e0d8a8.8bfcf8" + "280e7b0d.e2eef4" ] ] }, { - "id": "e6e0d8a8.8bfcf8", + "id": "280e7b0d.e2eef4", "type": "method", "name": "sdwan-attachment-topology-operation-activate", "xml": "<method rpc='sdwan-attachment-topology-operation-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 266.00403022766113, - "y": 221.99999952316284, - "z": "4842829a.c92f5c", + "x": 270.00012397766113, + "y": 205.00000095367432, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "5cdb946c.3b710c" + "3b8ff9db.6736b6" ] ] }, { - "id": "5cdb946c.3b710c", + "id": "3b8ff9db.6736b6", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 168.00404357910156, - "y": 908.0002876520157, - "z": "4842829a.c92f5c", - "wires": [ - [ - "4b9de3d9.03091c", - "4127df46.08ca1", - "aae6c90e.119798", - "72064d52.212b94", - "21e8ba33.483c86", - "7d9870f2.8c169", - "f1c987fe.e262e8", - "4c06f720.016118", - "1379096d.d52197", - "4fc8c244.1177ac", - "d4d40535.00b288", - "daadac76.292c6", - "c4a41078.ea3c4", - "43fe29d3.28d4b8", - "38c9c0d2.63a2d", - "9192f41d.1c9e78", - "19eae0e7.50657f", - "585348e6.e28c68", - "4041fa5f.8f6984", - "db5d0d5.71c66f", - "537ad820.346958", - "5723dd.5302dc24", - "390c3a59.81dbe6" - ] - ] - }, - { - "id": "4b9de3d9.03091c", + "x": 172.00013732910156, + "y": 891.0002890825272, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "91ee02fa.b186a", + "ba42cb5a.846d08", + "b40f6fde.18743", + "8171db6d.f63858", + "e6936fb4.46122", + "a02dc728.884b28", + "210482d7.10d8ee", + "b09356ce.de3e78", + "b70e72ac.ac27d", + "720d11d0.f67bc", + "671de4e7.c5daec", + "22826455.9296ec", + "f959c075.1e7e6", + "69260ab2.333c94", + "1ebdd52f.25cc2b", + "5f71dd6c.97cd84", + "69e18ab9.627484", + "bcfeb911.f55008", + "19a39c5d.bf96f4", + "c4f38bc0.54d238", + "6a97289d.80a568", + "f3ac87c7.5588f8", + "c88d609e.257e3", + "86fafd91.f4f2f", + "df3f5d3a.29e2c", + "55f46b97.799ce4" + ] + ] + }, + { + "id": "91ee02fa.b186a", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 678.9974689483643, - "y": 175.99348640441895, - "z": "4842829a.c92f5c", + "x": 682.9935626983643, + "y": 158.99348783493042, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "246c798e.5e7076", + "id": "fc6cccab.f6373", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 707.9577808380127, - "y": 140.0252823829651, - "z": "4842829a.c92f5c", + "x": 711.9538745880127, + "y": 123.02528381347656, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "4127df46.08ca1", + "id": "ba42cb5a.846d08", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 632.997407913208, - "y": 268.9934916496277, - "z": "4842829a.c92f5c", + "x": 636.993501663208, + "y": 251.99349308013916, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "72064d52.212b94", + "id": "8171db6d.f63858", "type": "execute", "name": "execute Properties", "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": 639.259298324585, - "y": 356.66022062301636, - "z": "4842829a.c92f5c", + "x": 643.255392074585, + "y": 339.66022205352783, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "aae6c90e.119798", + "id": "b40f6fde.18743", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 686.259355545044, - "y": 444.6602244377136, - "z": "4842829a.c92f5c", + "x": 690.255449295044, + "y": 427.6602258682251, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "ca8f4f1a.61b38", + "id": "8f7c2f3a.39068", "type": "comment", "name": "GET connection-attachment-allotted-resource from mdsal", "info": "", "comments": "", - "x": 740.8123168945312, - "y": 513.5386500358582, - "z": "4842829a.c92f5c", + "x": 744.8084106445312, + "y": 496.53865146636963, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "9f182507.e3c608", + "id": "6a9edb15.0372c4", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 686.9974384307861, - "y": 235.99350118637085, - "z": "4842829a.c92f5c", + "x": 690.9935321807861, + "y": 218.99350261688232, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "2aa7816a.d5fa1e", + "id": "5d0ffaf8.eea164", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 704.9974040985107, - "y": 321.88238191604614, - "z": "4842829a.c92f5c", + "x": 708.9934978485107, + "y": 304.8823833465576, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "7187d295.0c7a1c", + "id": "4c6a252e.949a4c", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 730.9974231719971, - "y": 408.88234090805054, - "z": "4842829a.c92f5c", + "x": 734.9935169219971, + "y": 391.882342338562, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "b2104ab0.d42038", + "id": "1df58ece.22a6f1", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1194.6707286834717, - "y": 526.9999775886536, - "z": "4842829a.c92f5c", + "x": 1198.6668224334717, + "y": 509.99997901916504, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "736e1064.726c" + "beb58fcf.0e694" ] ] }, { - "id": "736e1064.726c", + "id": "beb58fcf.0e694", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1338.6708068847656, - "y": 484.49989557266235, - "z": "4842829a.c92f5c", + "x": 1342.6669006347656, + "y": 467.4998970031738, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "a5f06ff2.e93e4" + "b372be99.b158c" ] ] }, { - "id": "a5f06ff2.e93e4", + "id": "b372be99.b158c", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1507.5282306671143, - "y": 482.1190667152405, - "z": "4842829a.c92f5c", + "x": 1511.5243244171143, + "y": 465.11906814575195, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "69d17a58.9c2324", - "1cf05230.c0296e" + "553cf33f.abe66c", + "efe7a59a.897c58" ] ] }, { - "id": "69d17a58.9c2324", + "id": "553cf33f.abe66c", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1662.8613662719727, - "y": 454.1189818382263, - "z": "4842829a.c92f5c", + "x": 1666.8574600219727, + "y": 437.1189832687378, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "a2e5f5bf.161fe8" + "bb79446e.fd2a98" ] ] }, { - "id": "a2e5f5bf.161fe8", + "id": "bb79446e.fd2a98", "type": "block", "name": "block: atomic", "xml": "<block atomic='true'>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1821.3851699829102, - "y": 452.0238289833069, - "z": "4842829a.c92f5c", + "x": 1825.3812637329102, + "y": 435.02383041381836, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "2e9b819d.3363ee", - "edfeb643.5889d8", - "76036750.d4da68" + "c3367ce.c8b6f8", + "6e235bab.f44c74", + "fca0cf3f.e6c1c" ] ] }, { - "id": "8107bf70.6729c", + "id": "cad70d2f.866d6", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n \n", "comments": "", - "x": 1761.5231018066406, - "y": 559.0660634040833, - "z": "4842829a.c92f5c", + "x": 1765.5191955566406, + "y": 542.0660648345947, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "a6741673.5edd48", + "id": "60f581d.8121d8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1186.5225315093994, - "y": 562.0660624504089, - "z": "4842829a.c92f5c", + "x": 1190.5186252593994, + "y": 545.0660638809204, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "9ba85af5.f74448" + "4541101a.4fcaa" ] ] }, { - "id": "9ba85af5.f74448", + "id": "4541101a.4fcaa", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1366.522481918335, - "y": 562.7326130867004, - "z": "4842829a.c92f5c", + "x": 1370.518575668335, + "y": 545.7326145172119, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "8107bf70.6729c" + "cad70d2f.866d6" ] ] }, { - "id": "1cf05230.c0296e", + "id": "efe7a59a.897c58", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1654.1893692016602, - "y": 513.3993563652039, - "z": "4842829a.c92f5c", + "x": 1658.1854629516602, + "y": 496.39935779571533, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "8107bf70.6729c" + "cad70d2f.866d6" ] ] }, { - "id": "2e9b819d.3363ee", + "id": "c3367ce.c8b6f8", "type": "set", "name": "set connection-attachment-ar from get", "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n", "comments": "", - "x": 2068.4486236572266, - "y": 425.0000810623169, - "z": "4842829a.c92f5c", + "x": 2072.4447174072266, + "y": 408.00008249282837, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "edfeb643.5889d8", + "id": "6e235bab.f44c74", "type": "set", "name": "set oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments": "", - "x": 2017.4488925933838, - "y": 527.4286171197891, - "z": "4842829a.c92f5c", + "x": 2021.4449863433838, + "y": 510.4286185503006, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "76036750.d4da68", + "id": "fca0cf3f.e6c1c", "type": "switchNode", "name": "switch order-status", "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 2019.448709487915, - "y": 467.0000420808792, - "z": "4842829a.c92f5c", + "x": 2023.444803237915, + "y": 450.0000435113907, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e87ff105.14d1b", - "d97dfa9c.e30428" + "3fdfd73c.bfa0f8", + "a02243dc.27d9" ] ] }, { - "id": "d97dfa9c.e30428", + "id": "a02243dc.27d9", "type": "outcome", "name": "outcome Created", "xml": "<outcome value='Created'>\n", "comments": "", "outputs": 1, - "x": 2247.0490589141846, - "y": 458.0000993013382, - "z": "4842829a.c92f5c", + "x": 2251.0451526641846, + "y": 441.00010073184967, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "987bc713.b486f8" + "efd48355.63c2" ] ] }, { - "id": "e87ff105.14d1b", + "id": "3fdfd73c.bfa0f8", "type": "outcome", "name": "outcome Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2241.762954711914, - "y": 497.42865657806396, - "z": "4842829a.c92f5c", + "x": 2245.759048461914, + "y": 480.42865800857544, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "b58f7e1e.c3478" + "e7841384.7d2f" ] ] }, { - "id": "987bc713.b486f8", + "id": "efd48355.63c2", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2406.519187927246, - "y": 458.37570428848267, - "z": "4842829a.c92f5c", + "x": 2410.515281677246, + "y": 441.37570571899414, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "b58f7e1e.c3478", + "id": "e7841384.7d2f", "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\" \n value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n", "comments": "", - "x": 2417.670768737793, - "y": 496.0000557899475, - "z": "4842829a.c92f5c", + "x": 2421.666862487793, + "y": 479.000057220459, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "e130ad96.c9e09", + "id": "28e25554.5dcffa", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 911.3069496154785, - "y": 633.4936280250549, - "z": "4842829a.c92f5c", + "x": 915.3030433654785, + "y": 616.4936294555664, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "21e8ba33.483c86", + "id": "e6936fb4.46122", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 605.3130493164062, - "y": 634.4999985694885, - "z": "4842829a.c92f5c", + "x": 609.3091430664062, + "y": 617.5, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e130ad96.c9e09" + "28e25554.5dcffa" ] ] }, { - "id": "336e8236.5ec30e", + "id": "912e86c8.6df528", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 783.00439453125, - "y": 705.5317368507385, - "z": "4842829a.c92f5c", + "x": 787.00048828125, + "y": 688.53173828125, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "2b31d5c5.87577a", + "id": "bb953da4.20a6", "type": "comment", "name": "GET connection-attachment-ar to store AR data from mdsal", "info": "", "comments": "", - "x": 2130.4766845703125, - "y": 385.50393533706665, - "z": "4842829a.c92f5c", + "x": 2134.4727783203125, + "y": 368.5039367675781, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "7d9870f2.8c169", + "id": "a02dc728.884b28", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 668.9727172851562, - "y": 735.000120639801, - "z": "4842829a.c92f5c", + "x": 672.9688110351562, + "y": 718.0001220703125, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "b757ef37.0ce2d", + "id": "237a4084.caa97", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1028.972885131836, - "y": 792.0000901222229, - "z": "4842829a.c92f5c", + "x": 1032.968978881836, + "y": 775.0000915527344, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "8876c1bb.25741" + "cb935d16.398af" ] ] }, { - "id": "f706c388.1aebc", + "id": "b92e648c.4237d8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1020.8246879577637, - "y": 827.0661749839783, - "z": "4842829a.c92f5c", + "x": 1024.8207817077637, + "y": 810.0661764144897, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "cb9cbf16.bef44" + "3472a1b6.dd0c3e" ] ] }, { - "id": "cb9cbf16.bef44", + "id": "3472a1b6.dd0c3e", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n \n", "comments": "", - "x": 1166.9734687805176, - "y": 826.3335862159729, - "z": "4842829a.c92f5c", + "x": 1170.9695625305176, + "y": 809.3335876464844, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "8876c1bb.25741", + "id": "cb935d16.398af", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1159.9729804992676, - "y": 792.0001511573792, - "z": "4842829a.c92f5c", + "x": 1163.9690742492676, + "y": 775.0001525878906, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "2c9b5f28.48e9e", + "id": "a9379012.e6c67", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 842.7351894378662, - "y": 1824.9538197517395, - "z": "4842829a.c92f5c", + "x": 846.7313137054443, + "y": 2135.9540371894836, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "6b8dfb7d.64cd94" + "be6d4648.608728" ] ] }, { - "id": "6b8dfb7d.64cd94", + "id": "be6d4648.608728", "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=\"AAI failed\" />\n", "comments": "", - "x": 1009.2590103149414, - "y": 1851.5728268623352, - "z": "4842829a.c92f5c", + "x": 1013.2551345825195, + "y": 2162.5730443000793, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "ed67a862.2bd1f8", + "id": "c2820f2f.b28f6", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 844.8304176330566, - "y": 1872.7156624794006, - "z": "4842829a.c92f5c", + "x": 848.8265419006348, + "y": 2183.715879917145, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "6b8dfb7d.64cd94" + "be6d4648.608728" ] ] }, { - "id": "97cf9734.788978", + "id": "4982ee04.1cd2f", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 616.7828330993652, - "y": 1813.3029828071594, - "z": "4842829a.c92f5c", + "x": 620.7789573669434, + "y": 2124.3032002449036, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "38c9c0d2.63a2d", + "id": "1ebdd52f.25cc2b", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 631.5505294799805, - "y": 1734.8284640312195, - "z": "4842829a.c92f5c", + "x": 635.5466537475586, + "y": 2045.8286814689636, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "9192f41d.1c9e78", + "id": "5f71dd6c.97cd84", "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": 591.963701248169, - "y": 1920.4442524909973, - "z": "4842829a.c92f5c", + "x": 595.9598255157471, + "y": 2231.4444699287415, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "43fe29d3.28d4b8", + "id": "69260ab2.333c94", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 684.2826118469238, - "y": 1659.469316959381, - "z": "4842829a.c92f5c", + "x": 688.278736114502, + "y": 1970.4695343971252, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "d5f8f1b8.84781", - "d21a6279.bc9d6", - "9617473f.000048" + "61914fb2.5848f", + "913cab50.d379e8", + "247de1a.a91111e" ] ] }, { - "id": "d5f8f1b8.84781", + "id": "61914fb2.5848f", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 938.9240341186523, - "y": 1703.8007111549377, - "z": "4842829a.c92f5c", + "x": 942.9201583862305, + "y": 2014.8009285926819, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "ce2b1814.f0bc28" + "63853616.80d768" ] ] }, { - "id": "d21a6279.bc9d6", + "id": "913cab50.d379e8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 940.9240570068359, - "y": 1662.3006752952933, - "z": "4842829a.c92f5c", + "x": 944.9201812744141, + "y": 1973.3008927330375, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "ce2b1814.f0bc28" + "63853616.80d768" ] ] }, { - "id": "9617473f.000048", + "id": "247de1a.a91111e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 944.6741409301758, - "y": 1613.6578278541565, - "z": "4842829a.c92f5c", + "x": 948.6702651977539, + "y": 1924.6580452919006, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "c002bab4.10b818" + "e8b97cec.a52d7" ] ] }, { - "id": "ce2b1814.f0bc28", + "id": "63853616.80d768", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1099.674160003662, - "y": 1682.0507416725159, - "z": "4842829a.c92f5c", + "x": 1103.6702842712402, + "y": 1993.05095911026, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "c002bab4.10b818", + "id": "e8b97cec.a52d7", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1072.3300857543945, - "y": 1615.8499960899353, - "z": "4842829a.c92f5c", + "x": 1076.3262100219727, + "y": 1926.8502135276794, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "4fc8c244.1177ac", + "id": "720d11d0.f67bc", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n", "comments": "", - "x": 586.4962272644043, - "y": 1493.8502180576324, - "z": "4842829a.c92f5c", + "x": 590.4923515319824, + "y": 1804.8504354953766, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "daadac76.292c6", + "id": "22826455.9296ec", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 603.7820701599121, - "y": 1566.4698157310486, - "z": "4842829a.c92f5c", + "x": 607.7781944274902, + "y": 1877.4700331687927, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "c4a41078.ea3c4", + "id": "f959c075.1e7e6", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 653.7691497802734, - "y": 1603.4208960533142, - "z": "4842829a.c92f5c", + "x": 657.7652740478516, + "y": 1914.4211134910583, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "d4d40535.00b288", + "id": "671de4e7.c5daec", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 600.3377685546875, - "y": 1533.0248684883118, - "z": "4842829a.c92f5c", + "x": 604.3338928222656, + "y": 1844.025085926056, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "45fc3466.cbd9ac", + "id": "33b4dd9d.575162", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 711.6712646484375, - "y": 1455.0248260498047, - "z": "4842829a.c92f5c", + "x": 715.6673889160156, + "y": 1766.0250434875488, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "4c6b5051.361fc", + "id": "ad8abb41.f27f98", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 655.2510566711426, - "y": 1421.4381222724915, - "z": "4842829a.c92f5c", + "x": 659.2471809387207, + "y": 1732.4383397102356, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "390c3a59.81dbe6", + "id": "c88d609e.257e3", "type": "update", "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n", + "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Active\" />\n", "comments": "", "outputs": 1, - "x": 643.2271118164062, - "y": 1850.7551255226135, - "z": "4842829a.c92f5c", + "x": 647.2232360839844, + "y": 2161.7553429603577, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "2c9b5f28.48e9e", - "ed67a862.2bd1f8" + "a9379012.e6c67", + "c2820f2f.b28f6" ] ] }, { - "id": "f1c987fe.e262e8", + "id": "210482d7.10d8ee", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 815.0078735351562, - "y": 545.0039048194885, - "z": "4842829a.c92f5c", + "x": 819.0039672851562, + "y": 528.00390625, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "b2104ab0.d42038", - "a6741673.5edd48" + "1df58ece.22a6f1", + "60f581d.8121d8" ] ] }, { - "id": "4c06f720.016118", + "id": "b09356ce.de3e78", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 738.0079956054688, - "y": 808.0040879249573, - "z": "4842829a.c92f5c", + "x": 742.0040893554688, + "y": 791.0040893554688, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "b757ef37.0ce2d", - "f706c388.1aebc" + "237a4084.caa97", + "b92e648c.4237d8" ] ] }, { - "id": "1379096d.d52197", + "id": "b70e72ac.ac27d", "type": "execute", "name": "get parent-service-data url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 638.0079040527344, - "y": 771.0039210319519, - "z": "4842829a.c92f5c", + "x": 642.0039978027344, + "y": 754.0039224624634, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "5177b2ec.7304dc", + "id": "32321857.9b87a8", "type": "set", "name": "set prop.ar.provided-allotted-resource-id", "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n", "comments": "", - "x": 1496.0003814697266, - "y": 860.1218543052673, - "z": "4842829a.c92f5c", + "x": 1499.9964752197266, + "y": 843.1218557357788, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "a4de5ab0.2e8518", + "id": "b156e259.c2b83", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2002.0009765625, - "y": 954.4551377296448, - "z": "4842829a.c92f5c", + "x": 2005.9970703125, + "y": 937.4551391601562, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "b07d3158.ec06e" + "7bcfda30.e9f8d4" ] ] }, { - "id": "e77eab64.b80238", + "id": "9ffe3ec9.11aa8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2005.852352142334, - "y": 916.5212178230286, - "z": "4842829a.c92f5c", + "x": 2009.848445892334, + "y": 899.52121925354, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "67d985d1.99c82c" + "66958c0e.e9ae64" ] ] }, { - "id": "a9f31ecc.485fc", + "id": "edc31606.488c38", "type": "for", "name": "for arvidx.. mdsal-sd.service-data.vnfs.vnf_length[]", "xml": "<for index='arvidx' start='0' end='`$mdsal-sd.service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1898.0015487670898, - "y": 1682.1222678422928, - "z": "4842829a.c92f5c", + "x": 1901.9976425170898, + "y": 1665.1222692728043, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "3f28b2ff.c5261e" + "4a985c04.ef4f84" ] ] }, { - "id": "3f28b2ff.c5261e", + "id": "4a985c04.ef4f84", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1657.6680450439453, - "y": 1754.1224604845047, - "z": "4842829a.c92f5c", + "x": 1661.6641387939453, + "y": 1737.1224619150162, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "7390d84f.4b2318" + "f49161ce.7951e" ] ] }, { - "id": "7390d84f.4b2318", + "id": "f49161ce.7951e", "type": "switchNode", "name": "switch ActivateSiteInstance", "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n\n \n \n\n", "comments": "", "outputs": 1, - "x": 1870.5332794189453, - "y": 1755.3203288316727, - "z": "4842829a.c92f5c", + "x": 1874.5293731689453, + "y": 1738.3203302621841, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "f67dfe78.781af" + "ba99c3de.16d52" ] ] }, { - "id": "f67dfe78.781af", + "id": "ba99c3de.16d52", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2075.53263092041, - "y": 1758.3203250169754, - "z": "4842829a.c92f5c", + "x": 2079.52872467041, + "y": 1741.3203264474869, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "24aa0f5e.31356" + "81072e73.36a9b" ] ] }, { - "id": "e2678b6.a3e2078", + "id": "fe54ca75.073228", "type": "set", "name": "set tmp.sitevidx ", "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n", "comments": "", - "x": 2419.532802581787, - "y": 1738.3206726312637, - "z": "4842829a.c92f5c", + "x": 2423.528896331787, + "y": 1721.3206740617752, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "9f2a331c.6de8", + "id": "fca98070.131e", "type": "set", "name": "set prop.ar-parent-service-instance-id", "xml": "<set>\n<parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' /> \n", "comments": "", - "x": 1647.0009765625, - "y": 1101.1221171617508, - "z": "4842829a.c92f5c", + "x": 1650.9970703125, + "y": 1084.1221185922623, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "d2ac9580.cea3a8", + "id": "3615b198.912bde", "type": "for", "name": "for loop aridx - Get role from allotted resource", "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 1674.0004901885986, - "y": 1058.621705532074, - "z": "4842829a.c92f5c", + "x": 1677.9965839385986, + "y": 1041.6217069625854, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "ab4a3566.1d4448" + "ff4ce46e.aa5008" ] ] }, { - "id": "9e31b20.ec7145", + "id": "17a801cc.ffa25e", "type": "switchNode", "name": "switch Role", "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'role'`\">\n", "comments": "", "outputs": 1, - "x": 2105.0007343292236, - "y": 1024.6218276023865, - "z": "4842829a.c92f5c", + "x": 2108.9968280792236, + "y": 1007.621829032898, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "8e1f2970.68a218" + "4be35b76.6b2a54" ] ] }, { - "id": "8e1f2970.68a218", + "id": "4be35b76.6b2a54", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2245.0009784698486, - "y": 1022.621949672699, - "z": "4842829a.c92f5c", + "x": 2248.9970722198486, + "y": 1005.6219511032104, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "ef163b1b.5ea0c8" + "7e234298.9ccc3c" ] ] }, { - "id": "ef163b1b.5ea0c8", + "id": "7e234298.9ccc3c", "type": "set", "name": "set prop.role", "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n", "comments": "", - "x": 2389.0017108917236, - "y": 1022.221803188324, - "z": "4842829a.c92f5c", + "x": 2392.9978046417236, + "y": 1005.2218046188354, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "8f7eca2d.7a5ac8", + "id": "c26e60ea.9b07b", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1953.0007934570312, - "y": 1201.1219245195389, - "z": "4842829a.c92f5c", + "x": 1956.9968872070312, + "y": 1184.1219259500504, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "2acc8e1c.c1a132" + "dcf01c19.ab4ec" ] ] }, { - "id": "224b80f9.f7e8e", + "id": "21194342.fd75ac", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1950.8531227111816, - "y": 1162.1880522966385, - "z": "4842829a.c92f5c", + "x": 1954.8492164611816, + "y": 1145.18805372715, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "d6b1d2aa.02b42" + "26a61e2a.3b4ee2" ] ] }, { - "id": "67d985d1.99c82c", + "id": "66958c0e.e9ae64", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2132.000476837158, - "y": 913.6216511726379, - "z": "4842829a.c92f5c", + "x": 2135.996570587158, + "y": 896.6216526031494, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "b07d3158.ec06e", + "id": "7bcfda30.e9f8d4", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1297.500431060791, - "y": 1093.621780872345, - "z": "4842829a.c92f5c", + "x": 1301.496524810791, + "y": 1076.6217823028564, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "d2ac9580.cea3a8", - "9f2a331c.6de8", - "13a1cc8b.f27593", - "8c1064b8.0837a8" + "3615b198.912bde", + "fca98070.131e", + "d8ea80f8.53dca", + "f11b05ac.5891b8" ] ] }, { - "id": "d6b1d2aa.02b42", + "id": "26a61e2a.3b4ee2", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2080.5013160705566, - "y": 1155.622012257576, - "z": "4842829a.c92f5c", + "x": 2084.4974098205566, + "y": 1138.6220136880875, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "2acc8e1c.c1a132", + "id": "dcf01c19.ab4ec", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1679.5010528564453, - "y": 1280.6221534013748, - "z": "4842829a.c92f5c", + "x": 1683.4971466064453, + "y": 1263.6221548318863, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "2eef69ed.8c4646" + "6973f8af.870f38" ] ] }, { - "id": "322f0f47.8e765", + "id": "452db2df.70966c", "type": "for", "name": "for loop siteidx - Get site ID from servicedata", "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2498.5025024414062, - "y": 1788.6224652528763, - "z": "4842829a.c92f5c", + "x": 2502.4985961914062, + "y": 1771.6224666833878, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "f041a5c4.8e5ff8" + "5784939.f29e76c" ] ] }, { - "id": "3ce210b6.91582", + "id": "200a6173.10b10e", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n\n", "comments": "", "outputs": 1, - "x": 1969.505865097046, - "y": 1902.6239272356033, - "z": "4842829a.c92f5c", + "x": 1973.501958847046, + "y": 1885.6239286661148, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "57ac6f64.1286d" + "91222197.1f508" ] ] }, { - "id": "57ac6f64.1286d", + "id": "91222197.1f508", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2124.5062351226807, - "y": 1904.624293923378, - "z": "4842829a.c92f5c", + "x": 2128.5023288726807, + "y": 1887.6242953538895, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "b1ee9c99.2aacf" + "ea7d1279.422d1" ] ] }, { - "id": "cbb60b59.d98d48", + "id": "62f62c1c.d1f314", "type": "set", "name": "Add sites to list and update length", "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 2102.0048294067383, - "y": 2037.122889637947, - "z": "4842829a.c92f5c", + "x": 2106.0009231567383, + "y": 2020.1228910684586, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "5723dd.5302dc24", + "id": "f3ac87c7.5588f8", "type": "execute", "name": "execute RestApiCallNode create vpn topology", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 695.0036029815674, - "y": 1242.6233216524124, - "z": "4842829a.c92f5c", + "x": 698.9997272491455, + "y": 1553.6235390901566, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "dbb9cf9c.1b8a", - "fefb45a2.751f18" + "b3354b35.0339d8", + "83e6dff5.c0823" ] ] }, { - "id": "fefb45a2.751f18", + "id": "83e6dff5.c0823", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 939.0035572052002, - "y": 1263.6231385469437, - "z": "4842829a.c92f5c", + "x": 942.9996814727783, + "y": 1574.6233559846878, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "96dbc97.ce15e38" + "5884381c.754b78" ] ] }, { - "id": "96dbc97.ce15e38", + "id": "5884381c.754b78", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1109.003496170044, - "y": 1266.6231385469437, - "z": "4842829a.c92f5c", + "x": 1112.999620437622, + "y": 1577.6233559846878, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "95ee12f3.671c4", + "id": "3a834e9e.d6b4c2", "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=\"Error executing Create vpn topology failed\" />\n", "comments": "", - "x": 1109.0036182403564, - "y": 1222.6231385469437, - "z": "4842829a.c92f5c", + "x": 1112.9997425079346, + "y": 1533.6233559846878, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "dbb9cf9c.1b8a", + "id": "b3354b35.0339d8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 942.003496170044, - "y": 1222.6231385469437, - "z": "4842829a.c92f5c", + "x": 945.9996204376221, + "y": 1533.6233559846878, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "95ee12f3.671c4" + "3a834e9e.d6b4c2" ] ] }, { - "id": "722c21e0.94316", + "id": "97a06baa.a4df68", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1113.569179534912, - "y": 955.2990155220032, - "z": "4842829a.c92f5c", + "x": 1061.5652923583984, + "y": 928.2990293502808, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "db5d0d5.71c66f", + "id": "c4f38bc0.54d238", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 650.0689697265625, - "y": 1004.2993149757385, - "z": "4842829a.c92f5c", + "x": 658.0650634765625, + "y": 954.2993497848511, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "9f61640b.56f5e8", - "fcbf7eb7.5e0e6", - "b9617b3d.71b3f8" + "b1ed8af2.ff9cc8", + "64af3109.c43ba", + "b545c5fe.0aa818" ] ] }, { - "id": "9f61640b.56f5e8", + "id": "b1ed8af2.ff9cc8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 916.0691184997559, - "y": 967.2990155220032, - "z": "4842829a.c92f5c", + "x": 896.0651664733887, + "y": 928.2989978790283, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "722c21e0.94316" + "97a06baa.a4df68" ] ] }, { - "id": "fcbf7eb7.5e0e6", + "id": "64af3109.c43ba", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 912.55983543396, - "y": 1005.8731122016907, - "z": "4842829a.c92f5c", + "x": 892.5559043884277, + "y": 964.8731408119202, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "ae421a1b.b35b38" + "84eeaaa5.5de4f8" ] ] }, { - "id": "b9617b3d.71b3f8", + "id": "b545c5fe.0aa818", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 907.89284324646, - "y": 1047.206425189972, - "z": "4842829a.c92f5c", + "x": 886.8889579772949, + "y": 1001.2064542770386, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e4bd895d.631da8" + "4396ff0e.50b9e" ] ] }, { - "id": "ae421a1b.b35b38", + "id": "84eeaaa5.5de4f8", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1089.1312465667725, - "y": 994.158848285675, - "z": "4842829a.c92f5c", + "x": 1049.1273345947266, + "y": 964.1588926315308, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "e4bd895d.631da8", + "id": "4396ff0e.50b9e", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1095.6653995513916, - "y": 1042.6456179618835, - "z": "4842829a.c92f5c", + "x": 1048.6615295410156, + "y": 996.6456785202026, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "2eef69ed.8c4646", + "id": "6973f8af.870f38", "type": "for", "name": "for pnidx.. mdsal-psd.service-data.networks.network_length[]", "xml": "<for index='pnidx' start='0' end='`$mdsal-parentsd.service-data.networks.network_length`' >\n", "comments": "", "outputs": 1, - "x": 1987.5011825561523, - "y": 1280.1222764253616, - "z": "4842829a.c92f5c", + "x": 1991.4972763061523, + "y": 1263.122277855873, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "19a68b02.3eedc5" + "86298d2a.4e81d" ] ] }, { - "id": "532b87f6.cba248", + "id": "9e5424eb.2e5b98", "type": "switchNode", "name": "switch ActivateSDWANConnectivityInstance", "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.request-information.request-action == ActivateSDWANConnectivityInstance`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 1834.169578552246, - "y": 1369.122292637825, - "z": "4842829a.c92f5c", + "x": 1838.165672302246, + "y": 1352.1222940683365, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "f7df899d.2cdaa8" + "7568a55.272e35c" ] ] }, { - "id": "f7df899d.2cdaa8", + "id": "7568a55.272e35c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2090.1690311431885, - "y": 1367.1222316026688, - "z": "4842829a.c92f5c", + "x": 2094.1651248931885, + "y": 1350.1222330331802, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "4ad4efb2.b5354" + "e1df3461.3efed8" ] ] }, { - "id": "f89715ac.25dc68", + "id": "34f69c4e.e0acb4", "type": "for", "name": "for loop paramidx - Get topology from servicedata", "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 1877.1676940917969, - "y": 1460.1214705705643, - "z": "4842829a.c92f5c", + "x": 1881.1637878417969, + "y": 1443.1214720010757, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "c531c63.7b95a38" + "1b29b6f3.84c7e9" ] ] }, { - "id": "bd704489.7274d8", + "id": "9dd144dd.7929d8", "type": "switchNode", "name": "switch topology", "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n", "comments": "", "outputs": 1, - "x": 2331.1680545806885, - "y": 1447.1217604875565, - "z": "4842829a.c92f5c", + "x": 2335.1641483306885, + "y": 1430.121761918068, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "76f653aa.77e0bc" + "e3be96aa.c2c8a8" ] ] }, { - "id": "76f653aa.77e0bc", + "id": "e3be96aa.c2c8a8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2480.1678104400635, - "y": 1442.121882557869, - "z": "4842829a.c92f5c", + "x": 2484.1639041900635, + "y": 1425.1218839883804, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e332cfdd.3a325" + "23ce8dd3.49fc12" ] ] }, { - "id": "e332cfdd.3a325", + "id": "23ce8dd3.49fc12", "type": "set", "name": "set topology", "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2620.1679973602295, - "y": 1439.7217980623245, - "z": "4842829a.c92f5c", + "x": 2624.1640911102295, + "y": 1422.721799492836, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "95926f9f.7a56d", + "id": "ecf33c6a.0e252", "type": "switchNode", "name": "switch vpnId", "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n", "comments": "", "outputs": 1, - "x": 2318.8340015411377, - "y": 1485.4549852609634, - "z": "4842829a.c92f5c", + "x": 2322.8300952911377, + "y": 1468.454986691475, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "915a39b2.608e28" + "3bf645ac.c4019a" ] ] }, { - "id": "915a39b2.608e28", + "id": "3bf645ac.c4019a", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2458.8339443206787, - "y": 1485.4548016786575, - "z": "4842829a.c92f5c", + "x": 2462.8300380706787, + "y": 1468.454803109169, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "56e124a4.ba815c" + "f947fdb0.d1a3c" ] ] }, { - "id": "56e124a4.ba815c", + "id": "f947fdb0.d1a3c", "type": "set", "name": "set prop.vpn1Id", "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2606.833948135376, - "y": 1485.0548692941666, - "z": "4842829a.c92f5c", + "x": 2610.830041885376, + "y": 1468.054870724678, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "537ad820.346958", + "id": "6a97289d.80a568", "type": "execute", "name": "execute RestApiCallNode create vpn ", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 664.0019989013672, - "y": 1151.122742652893, - "z": "4842829a.c92f5c", + "x": 667.9981231689453, + "y": 1462.1229600906372, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "3ba3cba0.b1b5b4", - "14233b12.99c415" + "5ffc81bd.b86cd", + "2fd24486.c6bc7c" ] ] }, { - "id": "14233b12.99c415", + "id": "2fd24486.c6bc7c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 884.0019016265869, - "y": 1147.1227074861526, - "z": "4842829a.c92f5c", + "x": 887.998025894165, + "y": 1458.1229249238968, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e9e1022d.54d97" + "10a20cb7.762a63" ] ] }, { - "id": "e9e1022d.54d97", + "id": "10a20cb7.762a63", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1054.0018405914307, - "y": 1150.1227074861526, - "z": "4842829a.c92f5c", + "x": 1057.9979648590088, + "y": 1461.1229249238968, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "12277977.d003a7", + "id": "bb44545a.967818", "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=\"Error executing Create vpn failed\" />\n", "comments": "", - "x": 1054.0019626617432, - "y": 1106.1227074861526, - "z": "4842829a.c92f5c", + "x": 1057.9980869293213, + "y": 1417.1229249238968, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "3ba3cba0.b1b5b4", + "id": "5ffc81bd.b86cd", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 887.0018405914307, - "y": 1106.1227074861526, - "z": "4842829a.c92f5c", + "x": 890.9979648590088, + "y": 1417.1229249238968, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "12277977.d003a7" + "bb44545a.967818" ] ] }, { - "id": "4ac994c1.39bcbc", + "id": "c6900049.d4f2a", "type": "set", "name": "set prop.name", "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n", "comments": "", - "x": 2464.0007343292236, - "y": 1074.121461391449, - "z": "4842829a.c92f5c", + "x": 2467.9968280792236, + "y": 1057.1214628219604, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "24b71c25.bdf914", + "id": "6d71d4d6.b3bfec", "type": "switchNode", "name": "switch sdwanVpnName", "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'sdwanVpnName'`\">\n", "comments": "", "outputs": 1, - "x": 2143.5004901885986, - "y": 1079.121461391449, - "z": "4842829a.c92f5c", + "x": 2147.4965839385986, + "y": 1062.1214628219604, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "4b8a8916.d5df08" + "95235e68.5208b" ] ] }, { - "id": "4b8a8916.d5df08", + "id": "95235e68.5208b", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2320.5007343292236, - "y": 1076.121461391449, - "z": "4842829a.c92f5c", + "x": 2324.4968280792236, + "y": 1059.1214628219604, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "4ac994c1.39bcbc" + "c6900049.d4f2a" ] ] }, { - "id": "35fb02d9.bc983e", + "id": "5dc928bc.725628", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1233.0308837890625, - "y": 897.3190293312073, - "z": "4842829a.c92f5c", + "x": 1237.0269775390625, + "y": 880.3190307617188, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "5177b2ec.7304dc", - "72795760.cf2f58", - "48fba41e.5e07cc" + "32321857.9b87a8", + "8e15f4fa.e90f28", + "9fc5f700.68a778" ] ] }, { - "id": "19eae0e7.50657f", + "id": "69e18ab9.627484", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 826.18505859375, - "y": 906.0944199562073, - "z": "4842829a.c92f5c", + "x": 830.18115234375, + "y": 889.0944213867188, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "35fb02d9.bc983e" + "5dc928bc.725628" ] ] }, { - "id": "72795760.cf2f58", + "id": "8e15f4fa.e90f28", "type": "execute", "name": "generate tmp.ar-url-connection url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 1482.0002059936523, - "y": 895.6668076515198, - "z": "4842829a.c92f5c", + "x": 1485.9962997436523, + "y": 878.6668090820312, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "48fba41e.5e07cc", + "id": "9fc5f700.68a778", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n", "comments": "", "outputs": 1, - "x": 1631, - "y": 934.333372592926, - "z": "4842829a.c92f5c", + "x": 1634.99609375, + "y": 917.3333740234375, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e77eab64.b80238", - "a4de5ab0.2e8518" + "9ffe3ec9.11aa8", + "b156e259.c2b83" ] ] }, { - "id": "13a1cc8b.f27593", + "id": "d8ea80f8.53dca", "type": "execute", "name": "generate prop.ar-parent-service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/> \n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar-parent-service-instance-id`\"/>\n\n", "comments": "", "outputs": 1, - "x": 1661.3334655761719, - "y": 1143.0003348588943, - "z": "4842829a.c92f5c", + "x": 1665.3295593261719, + "y": 1126.0003362894058, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "8c1064b8.0837a8", + "id": "f11b05ac.5891b8", "type": "execute", "name": "execute RestApiCallNode - get parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-parentsd\" />\n\n", "comments": "", "outputs": 1, - "x": 1680.3334350585938, - "y": 1177.0004206895828, - "z": "4842829a.c92f5c", + "x": 1684.3295288085938, + "y": 1160.0004221200943, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "224b80f9.f7e8e", - "8f7eca2d.7a5ac8" + "21194342.fd75ac", + "c26e60ea.9b07b" ] ] }, { - "id": "ab4a3566.1d4448", + "id": "ff4ce46e.aa5008", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1940.0311298370361, - "y": 1053.531129360199, - "z": "4842829a.c92f5c", + "x": 1944.0272235870361, + "y": 1036.5311307907104, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "9e31b20.ec7145", - "24b71c25.bdf914" + "17a801cc.ffa25e", + "6d71d4d6.b3bfec" ] ] }, { - "id": "4ad4efb2.b5354", + "id": "e1df3461.3efed8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1466.0316848754883, - "y": 1500.5313200950623, - "z": "4842829a.c92f5c", + "x": 1470.0277786254883, + "y": 1483.5313215255737, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "f89715ac.25dc68", - "6e129b4e.95cc44", - "5de3f774.9f5298", - "153d05d.db3defa" + "34f69c4e.e0acb4", + "f53c2301.9407e", + "c3f7512e.84f81", + "334c603e.da8c8" ] ] }, { - "id": "19a68b02.3eedc5", + "id": "86298d2a.4e81d", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1576.6673126220703, - "y": 1367.6670924425125, - "z": "4842829a.c92f5c", + "x": 1580.6634063720703, + "y": 1350.667093873024, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "532b87f6.cba248" + "9e5424eb.2e5b98" ] ] }, { - "id": "f041a5c4.8e5ff8", + "id": "5784939.f29e76c", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1802.0023765563965, - "y": 1904.6676589250565, - "z": "4842829a.c92f5c", + "x": 1805.9984703063965, + "y": 1887.667660355568, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "3ce210b6.91582" + "200a6173.10b10e" ] ] }, { - "id": "c531c63.7b95a38", + "id": "1b29b6f3.84c7e9", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2163.031629562378, - "y": 1460.531430363655, - "z": "4842829a.c92f5c", + "x": 2167.027723312378, + "y": 1443.5314317941666, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "bd704489.7274d8", - "95926f9f.7a56d" + "9dd144dd.7929d8", + "ecf33c6a.0e252" ] ] }, { - "id": "61033198.2b1b8", + "id": "5c15538f.0d810c", "type": "set", "name": "set prop.attach.siteId", "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n", "comments": "", - "x": 2054.668918609619, - "y": 1978.333869099617, - "z": "4842829a.c92f5c", + "x": 2058.665012359619, + "y": 1961.3338705301285, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "24aa0f5e.31356", + "id": "81072e73.36a9b", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2234.259433746338, - "y": 1759.0044165849686, - "z": "4842829a.c92f5c", + "x": 2238.255527496338, + "y": 1742.00441801548, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "e2678b6.a3e2078", - "322f0f47.8e765" + "fe54ca75.073228", + "452db2df.70966c" ] ] }, { - "id": "b1ee9c99.2aacf", + "id": "ea7d1279.422d1", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1857.759853363037, - "y": 2004.7543412446976, - "z": "4842829a.c92f5c", + "x": 1861.755947113037, + "y": 1987.754342675209, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "61033198.2b1b8", - "cbb60b59.d98d48", - "96db890b.9cff38" + "5c15538f.0d810c", + "62f62c1c.d1f314", + "9f8585c2.03c528" ] ] }, { - "id": "4041fa5f.8f6984", + "id": "19a39c5d.bf96f4", "type": "call", "name": "call sdwan-wanport-vnf-topology-operation-underlay", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 713.757890701294, - "y": 1359.2539811134338, - "z": "4842829a.c92f5c", + "x": 717.7540149688721, + "y": 1670.254198551178, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "1587faed.a593f5", + "id": "497d8e2c.0cabf", "type": "comment", "name": "underlay", "info": "1. Get consumed AR from service data\n2. for all the AR id's get the respective AR from MDSAL\n3. From MDSAL AR get parent service instance ID\n4. Get service data based in parent service instance ID to get parent service. i.e, SDWAN Infra service\n5. Get SDWAN connectivity from looping network and check for topology\n6. from parent service data get siteAttachInstance vnf and check the role\n7. from parent service data get wanportINstance vnf and check the transportNetworkName\n8. Get provided AR from the parent service data\n9. for each of the provided ARid get the AR from MDSAL\n10.in the AR check for hub\n\n", "comments": "", - "x": 621.7268695831299, - "y": 1324.2229199409485, - "z": "4842829a.c92f5c", + "x": 625.722993850708, + "y": 1635.2231373786926, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "585348e6.e28c68", + "id": "bcfeb911.f55008", "type": "set", "name": "set prop.siteAttachement_length=0", "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n", "comments": "", - "x": 663.0038757324219, - "y": 871.5311719179153, - "z": "4842829a.c92f5c", + "x": 666.9999694824219, + "y": 854.5311733484268, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "6e129b4e.95cc44", + "id": "f53c2301.9407e", "type": "set", "name": "set prop.ar-service-instance-id", "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n", "comments": "", - "x": 1826.0043029785156, - "y": 1498.5312304496765, - "z": "4842829a.c92f5c", + "x": 1830.0003967285156, + "y": 1481.531231880188, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "5de3f774.9f5298", + "id": "c3f7512e.84f81", "type": "execute", "name": "generate prop.ar-service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/> \n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n\n", "comments": "", "outputs": 1, - "x": 1836.3365745544434, - "y": 1539.409375667572, - "z": "4842829a.c92f5c", + "x": 1840.3326683044434, + "y": 1522.4093770980835, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "153d05d.db3defa", + "id": "334c603e.da8c8", "type": "execute", "name": "execute RestApiCallNode - get service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-sd\" />\n\n", "comments": "", "outputs": 1, - "x": 1865.3366394042969, - "y": 1580.409375667572, - "z": "4842829a.c92f5c", + "x": 1869.3327331542969, + "y": 1563.4093770980835, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "9f007bfc.0c1338", - "c288c029.05ff1" + "c3928a9a.4b87b8", + "3258f9bd.5d9236" ] ] }, { - "id": "9f007bfc.0c1338", + "id": "c3928a9a.4b87b8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2121.8563232421875, - "y": 1589.597209095955, - "z": "4842829a.c92f5c", + "x": 2125.8524169921875, + "y": 1572.5972105264664, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "690363c.d28ea9c" + "8e2c2a42.ebc3b8" ] ] }, { - "id": "c288c029.05ff1", + "id": "3258f9bd.5d9236", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2124.003993988037, - "y": 1628.5310813188553, - "z": "4842829a.c92f5c", + "x": 2128.000087738037, + "y": 1611.5310827493668, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "d23e72e1.4c912" + "db1a6308.98167" ] ] }, { - "id": "690363c.d28ea9c", + "id": "8e2c2a42.ebc3b8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2251.5045166015625, - "y": 1583.0311690568924, - "z": "4842829a.c92f5c", + "x": 2255.5006103515625, + "y": 1566.0311704874039, + "z": "5b3e3707.3aa6c8", "wires": [ [] ] }, { - "id": "d23e72e1.4c912", + "id": "db1a6308.98167", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1600.0037841796875, - "y": 1679.531129002571, - "z": "4842829a.c92f5c", + "x": 1603.9998779296875, + "y": 1662.5311304330826, + "z": "5b3e3707.3aa6c8", "wires": [ [ - "a9f31ecc.485fc" + "edc31606.488c38" ] ] }, { - "id": "54f08af3.c933d4", + "id": "1a500d64.c038a3", "type": "comment", "name": "TODO send Email", "info": "", "comments": "", - "x": 963.0038928985596, - "y": 1404.0313096046448, - "z": "4842829a.c92f5c", + "x": 967.0000171661377, + "y": 1715.031527042389, + "z": "5b3e3707.3aa6c8", "wires": [] }, { - "id": "96db890b.9cff38", + "id": "9f8585c2.03c528", "type": "set", "name": "Add site attachement to list and update length", "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 2137.253952026367, - "y": 2091.7539863586426, - "z": "4842829a.c92f5c", + "x": 2141.250045776367, + "y": 2074.753987789154, + "z": "5b3e3707.3aa6c8", + "wires": [] + }, + { + "id": "86fafd91.f4f2f", + "type": "execute", + "name": "execute RestApiCallNode Get token", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", + "comments": "", + "outputs": 1, + "x": 655.0038986206055, + "y": 1072.0041399002075, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "6e49d8b7.8b66c8", + "d4d84dda.9a08b" + ] + ] + }, + { + "id": "6e49d8b7.8b66c8", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 907.0040245056152, + "y": 1053.003957748413, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "2d072571.88985a" + ] + ] + }, + { + "id": "d4d84dda.9a08b", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 899.2540588378906, + "y": 1088.6470804214478, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "e6862503.c2ac28" + ] + ] + }, + { + "id": "e6862503.c2ac28", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1047.004051208496, + "y": 1086.3972024917603, + "z": "5b3e3707.3aa6c8", + "wires": [] + }, + { + "id": "2d072571.88985a", + "type": "set", + "name": "set token-id", + "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", + "comments": "", + "x": 1056.0040245056152, + "y": 1052.003927230835, + "z": "5b3e3707.3aa6c8", + "wires": [] + }, + { + "id": "df3f5d3a.29e2c", + "type": "get-resource", + "name": "get-resource service-subscription", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type \n AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'\n force=\"true\" pfx=\"tmp.AnAI-data-tenant\"> ", + "comments": "", + "outputs": 1, + "x": 645.8993682861328, + "y": 1184.5660381317139, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "a39bcd10.58925", + "2937722a.892cce" + ] + ] + }, + { + "id": "601b10b0.92d6e", + "type": "switchNode", + "name": "switch temp-ub-sub-account-id", + "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n", + "comments": "", + "outputs": 1, + "x": 1057.8994598388672, + "y": 1149.3161191940308, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "9400efe1.833e2", + "af14c507.1fb9e8" + ] + ] + }, + { + "id": "9400efe1.833e2", + "type": "outcome", + "name": "NULL", + "xml": "<outcome value=''>", + "comments": "", + "outputs": 1, + "x": 1250.6139106750488, + "y": 1123.3161602020264, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "97ca3fa8.80b92" + ] + ] + }, + { + "id": "af14c507.1fb9e8", + "type": "other", + "name": "Other", + "xml": "<outcome value='Other'>", + "comments": "", + "outputs": 1, + "x": 1203.8994903564453, + "y": 1217.3162384033203, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "98cbe213.a0ab5" + ] + ] + }, + { + "id": "a39bcd10.58925", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 856.3992309570312, + "y": 1157.3120965957642, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "601b10b0.92d6e" + ] + ] + }, + { + "id": "2937722a.892cce", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 850.0778198242188, + "y": 1209.5264081954956, + "z": "5b3e3707.3aa6c8", + "wires": [ + [ + "b04b740c.a6ef58" + ] + ] + }, + { + "id": "b04b740c.a6ef58", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1002.8278198242188, + "y": 1209.2764692306519, + "z": "5b3e3707.3aa6c8", + "wires": [] + }, + { + "id": "98cbe213.a0ab5", + "type": "set", + "name": "set prop.tenant-id", + "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n", + "comments": "", + "x": 1372.7566719055176, + "y": 1215.423252105713, + "z": "5b3e3707.3aa6c8", + "wires": [] + }, + { + "id": "55f46b97.799ce4", + "type": "execute", + "name": "execute RestApiCallNode Create tenant auth", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 683.3994293212891, + "y": 1251.4588842391968, + "z": "5b3e3707.3aa6c8", + "wires": [ + [] + ] + }, + { + "id": "97ca3fa8.80b92", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1363.042236328125, + "y": 1168.1375246047974, + "z": "5b3e3707.3aa6c8", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json index 8dbd089a..837612af 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json @@ -1,20 +1,20 @@ [ { - "id": "d0edaee0.371d2", + "id": "44d87731.3a3c18", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 130.00390625, - "y": 68.99999856948853, - "z": "28b033ee.a901cc", + "x": 95.0000228881836, + "y": 25, + "z": "9c3e2040.51e8d", "wires": [ [ - "ccac73a.016209" + "6fd2c371.0f81ec" ] ] }, { - "id": "ccac73a.016209", + "id": "6fd2c371.0f81ec", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1282 +22,1282 @@ "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": 313.00391006469727, - "y": 143.00001668930054, - "z": "28b033ee.a901cc", + "x": 278.00002670288086, + "y": 99.00001811981201, + "z": "9c3e2040.51e8d", "wires": [ [ - "20c8ba03.7fc266" + "45f888b.a092e78" ] ] }, { - "id": "20c8ba03.7fc266", + "id": "45f888b.a092e78", "type": "method", "name": "sdwan-attachment-topology-operation-create", "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 301.0040283203125, - "y": 230.99999952316284, - "z": "28b033ee.a901cc", + "x": 266.0001449584961, + "y": 187.00000095367432, + "z": "9c3e2040.51e8d", "wires": [ [ - "7fb8a0a8.cc16e" + "13d40907.770c77" ] ] }, { - "id": "7fb8a0a8.cc16e", + "id": "13d40907.770c77", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 221.00395965576172, - "y": 980.0002474784851, - "z": "28b033ee.a901cc", + "x": 186.0000762939453, + "y": 936.0002489089966, + "z": "9c3e2040.51e8d", "wires": [ [ - "2437dbcf.331264", - "730eea74.2853a4", - "3eb4cc5.e84ab34", - "98a0f1ed.ad821", - "48d3a6f4.7a9f68", - "5e870da5.d4b9c4", - "f395bfa7.29021", - "a35c1852.b6d228", - "128728fe.ad5877", - "7f796e7c.de4f4", - "52f115fe.31e7bc", - "6a649bce.b1cf84", - "549597d0.2434c8", - "b67f723e.a2fdd", - "e622a70a.fb3f98", - "3c5561ef.3b198e", - "34b5882f.c7cb48", - "273cbd63.ba5da2", - "7cadc884.11c378", - "f028e514.462408", - "2fe2b50e.b3feea", - "b0371fd5.a7b76", - "fdbceac6.217498" + "7bc4c8b1.1d9f68", + "9cf88721.96ba18", + "f2e620b.7ad45e", + "5cd475b4.e29f6c", + "e3b4ab98.b00c28", + "31146b5a.f96304", + "337b8132.75507e", + "33eb09e.c2f17f6", + "d6792827.57dcf8", + "145b2990.9f1986", + "e23f7239.d2c", + "c7cc4539.500a68", + "eae0ae19.16041", + "d8cd962c.832e98", + "81f242e0.4cfb8", + "a785b9fe.8e2b78", + "e1b91be4.687fd8", + "6d2b2eaf.a08e", + "55176b7b.204274", + "e7eec3f2.e0455", + "a8dc15.338363e8", + "3040fa3e.5fdf76", + "48507d03.0cfd24" ] ] }, { - "id": "ce81891c.9bbbd8", + "id": "b682cccd.903f2", "type": "comment", "name": "Set allotted resource id if not sent by SO", "info": "", "comments": "", - "x": 705.0806579589844, - "y": 140.43391847610474, - "z": "28b033ee.a901cc", + "x": 670.076774597168, + "y": 96.43391990661621, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "2437dbcf.331264", + "id": "7bc4c8b1.1d9f68", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n", "comments": "", "outputs": 1, - "x": 651.0039367675781, - "y": 195.9999918937683, - "z": "28b033ee.a901cc", + "x": 616.0000534057617, + "y": 151.99999332427979, + "z": "9c3e2040.51e8d", "wires": [ [ - "ae4415d.9e44fe8", - "c8d7b3ce.5e5a2" + "576ebd26.f091e4", + "24a61a74.3f6846" ] ] }, { - "id": "ae4415d.9e44fe8", + "id": "576ebd26.f091e4", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 849.0040245056152, - "y": 165.9999804496765, - "z": "28b033ee.a901cc", + "x": 814.0001411437988, + "y": 121.99998188018799, + "z": "9c3e2040.51e8d", "wires": [ [ - "349de4b3.2e578c" + "3df307a8.733fb8" ] ] }, { - "id": "c8d7b3ce.5e5a2", + "id": "24a61a74.3f6846", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 848.0039329528809, - "y": 202.999990940094, - "z": "28b033ee.a901cc", + "x": 813.0000495910645, + "y": 158.99999237060547, + "z": "9c3e2040.51e8d", "wires": [ [ - "106c46a5.0a2af9" + "318df0c4.63f14" ] ] }, { - "id": "106c46a5.0a2af9", + "id": "318df0c4.63f14", "type": "set", "name": "set tmp.ar.allotted-resource-id", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n", "comments": "", - "x": 1046.003921508789, - "y": 200.00001001358032, - "z": "28b033ee.a901cc", + "x": 1011.0000381469727, + "y": 156.0000114440918, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "730eea74.2853a4", + "id": "9cf88721.96ba18", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 619.0038604736328, - "y": 417.00009870529175, - "z": "28b033ee.a901cc", + "x": 583.9999771118164, + "y": 373.0001001358032, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "3eb4cc5.e84ab34", + "id": "f2e620b.7ad45e", "type": "execute", "name": "execute Properties", "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": 619.2657775878906, - "y": 498.6667799949646, - "z": "28b033ee.a901cc", + "x": 584.2618942260742, + "y": 454.6667814254761, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "98a0f1ed.ad821", + "id": "5cd475b4.e29f6c", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 672.2658386230469, - "y": 585.6666979789734, - "z": "28b033ee.a901cc", + "x": 637.2619552612305, + "y": 541.6666994094849, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "349de4b3.2e578c", + "id": "3df307a8.733fb8", "type": "execute", "name": "execute tmp.ar.allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n", "comments": "", "outputs": 1, - "x": 1064.0040016174316, - "y": 166.9999861717224, - "z": "28b033ee.a901cc", + "x": 1029.0001182556152, + "y": 122.99998760223389, + "z": "9c3e2040.51e8d", "wires": [ [ - "5d37f876.0cc698" + "4abca60e.39e308" ] ] }, { - "id": "5d37f876.0cc698", + "id": "4abca60e.39e308", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1282.0040435791016, - "y": 166.9999499320984, - "z": "28b033ee.a901cc", + "x": 1247.0001602172852, + "y": 122.99995136260986, + "z": "9c3e2040.51e8d", "wires": [ [ - "b5e2a2dc.0d71c" + "99c3fe86.a7edc" ] ] }, { - "id": "b5e2a2dc.0d71c", + "id": "99c3fe86.a7edc", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n", "comments": "", - "x": 1448.0039978027344, - "y": 166.99996423721313, - "z": "28b033ee.a901cc", + "x": 1413.000114440918, + "y": 122.99996566772461, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "8f7a89d.e442878", + "id": "4f647ff8.bc9ba", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1178.0041370391846, - "y": 657.7778706550598, - "z": "28b033ee.a901cc", + "x": 1143.0002536773682, + "y": 613.7778720855713, + "z": "9c3e2040.51e8d", "wires": [ [ - "b23dd04a.37b72" + "926c698b.647238" ] ] }, { - "id": "7072a3ba.59cbcc", + "id": "b4b47003.957fd", "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=\"Error: Existing connection attachment allotted resource\" />\n \n", "comments": "", - "x": 1911.5225162506104, - "y": 658.8439421653748, - "z": "28b033ee.a901cc", + "x": 1876.518632888794, + "y": 614.8439435958862, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "3b5bc99a.d557b6", + "id": "8e25385a.b2e448", "type": "comment", "name": "Check for non existence of allotted resource", "info": "", "comments": "", - "x": 1034.0040588378906, - "y": 591.777937412262, - "z": "28b033ee.a901cc", + "x": 999.0001754760742, + "y": 547.7779388427734, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "340e57cb.5c86a8", + "id": "164faa8f.422405", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1554.6706047058105, - "y": 802.000049829483, - "z": "28b033ee.a901cc", + "x": 1519.6667213439941, + "y": 758.0000512599945, + "z": "9c3e2040.51e8d", "wires": [ [ - "3cebd63.269772a" + "82bdbd96.1528d" ] ] }, { - "id": "5e870da5.d4b9c4", + "id": "31146b5a.f96304", "type": "switchNode", "name": "switch service-data.consumed-allotted-resources_length", "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 736.6699295043945, - "y": 778.7140822410583, - "z": "28b033ee.a901cc", + "x": 701.6660461425781, + "y": 734.7140836715698, + "z": "9c3e2040.51e8d", "wires": [ [ - "9df6142.79785e8", - "58099c96.2c7e34" + "89e1b0e1.b280a", + "42609e0d.0b1fc" ] ] }, { - "id": "9df6142.79785e8", + "id": "89e1b0e1.b280a", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1040.8128280639648, - "y": 747.5715193748474, - "z": "28b033ee.a901cc", + "x": 1005.8089447021484, + "y": 703.5715208053589, + "z": "9c3e2040.51e8d", "wires": [ [ - "be192375.06e28" + "d2a66fcc.9de12" ] ] }, { - "id": "58099c96.2c7e34", + "id": "42609e0d.0b1fc", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1017.8128776550293, - "y": 808.5714745521545, - "z": "28b033ee.a901cc", + "x": 982.8089942932129, + "y": 764.571475982666, + "z": "9c3e2040.51e8d", "wires": [ [ - "96b3b48a.902058" + "2a82891c.586b96" ] ] }, { - "id": "96b3b48a.902058", + "id": "2a82891c.586b96", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1177.9399681091309, - "y": 806.6974511146545, - "z": "28b033ee.a901cc", + "x": 1142.9360847473145, + "y": 762.697452545166, + "z": "9c3e2040.51e8d", "wires": [ [ - "340e57cb.5c86a8", - "718d194e.2e6788", - "a28f94f9.cae788" + "164faa8f.422405", + "6d36a6c.f47fa58", + "eedafcbb.09c83" ] ] }, { - "id": "be192375.06e28", + "id": "d2a66fcc.9de12", "type": "set", "name": "set cidx", "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n", "comments": "", - "x": 1190.6698112487793, - "y": 745.2855696678162, - "z": "28b033ee.a901cc", + "x": 1155.665927886963, + "y": 701.2855710983276, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "f395bfa7.29021", + "id": "337b8132.75507e", "type": "set", "name": "set consumed allotted resources", "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n", "comments": "", - "x": 665.5272216796875, - "y": 882.2856469154358, - "z": "28b033ee.a901cc", + "x": 630.5233383178711, + "y": 838.2856483459473, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "718d194e.2e6788", + "id": "6d36a6c.f47fa58", "type": "switchNode", "name": "switch tmp.found-cidx", "xml": "<switch test='`$tmp.found-cidx`'>\n", "comments": "", "outputs": 1, - "x": 1367.0550155639648, - "y": 838.7089738845825, - "z": "28b033ee.a901cc", + "x": 1332.0511322021484, + "y": 794.708975315094, + "z": "9c3e2040.51e8d", "wires": [ [ - "144fdd18.b7f4c3" + "23de8d9f.e2dd32" ] ] }, { - "id": "144fdd18.b7f4c3", + "id": "23de8d9f.e2dd32", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1557.0549697875977, - "y": 838.7089109420776, - "z": "28b033ee.a901cc", + "x": 1522.0510864257812, + "y": 794.7089123725891, + "z": "9c3e2040.51e8d", "wires": [ [ - "67e912a8.6bc78c" + "64af2897.2703a8" ] ] }, { - "id": "67e912a8.6bc78c", + "id": "64af2897.2703a8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1723.0549697875977, - "y": 838.7089109420776, - "z": "28b033ee.a901cc", + "x": 1688.0510864257812, + "y": 794.7089123725891, + "z": "9c3e2040.51e8d", "wires": [ [ - "95e82f8c.b9b06" + "923cdb1e.68a888" ] ] }, { - "id": "3cebd63.269772a", + "id": "82bdbd96.1528d", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1971.7822341918945, - "y": 799.0000767707825, - "z": "28b033ee.a901cc", + "x": 1936.7783508300781, + "y": 755.000078201294, + "z": "9c3e2040.51e8d", "wires": [ [ - "77a3d234.ab1d9c" + "87fbbf54.c1a56" ] ] }, { - "id": "77a3d234.ab1d9c", + "id": "87fbbf54.c1a56", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2153.591808319092, - "y": 799.4645237922668, - "z": "28b033ee.a901cc", + "x": 2118.5879249572754, + "y": 755.4645252227783, + "z": "9c3e2040.51e8d", "wires": [ [ - "c2bb18ee.6afb98" + "98cf5592.16f948" ] ] }, { - "id": "95e82f8c.b9b06", + "id": "923cdb1e.68a888", "type": "set", "name": "set tmp.cidx", "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n", "comments": "", - "x": 1884.928352355957, - "y": 838.2206120491028, - "z": "28b033ee.a901cc", + "x": 1849.9244689941406, + "y": 794.2206134796143, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "f6050ba6.e3a988", + "id": "b1e5bcf3.c8fd2", "type": "comment", "name": "Add to consumed service consumed-allotted-resources in mdsal", "info": "Prepare data and add to service-data", "comments": "", - "x": 757.671142578125, - "y": 709.0000462532043, - "z": "28b033ee.a901cc", + "x": 722.6672592163086, + "y": 665.0000476837158, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "950d939a.d6aa9", + "id": "7a7522d7.8a362c", "type": "comment", "name": "This set resource will be added to MDSAL by provider code", "info": "Below we add to service-data.consumed-allotted-resource at last index", "comments": "", - "x": 745.0040588378906, - "y": 847.7781386375427, - "z": "28b033ee.a901cc", + "x": 710.0001754760742, + "y": 803.7781400680542, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "fdbceac6.217498", + "id": "48507d03.0cfd24", "type": "update", - "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n", + "name": "save AAI allotted-resource", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n", "comments": "", "outputs": 1, - "x": 655.6947631835938, - "y": 1807.5319027900696, - "z": "28b033ee.a901cc", + "x": 620.6908798217773, + "y": 1763.531904220581, + "z": "9c3e2040.51e8d", "wires": [ [ - "49ae8647.6b2328", - "62f42f4e.42781" + "d0cb3ffb.0f22", + "8cbfcb17.5674d8" ] ] }, { - "id": "49ae8647.6b2328", + "id": "d0cb3ffb.0f22", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 850.4566993713379, - "y": 1798.4845042228699, - "z": "28b033ee.a901cc", + "x": 815.4528160095215, + "y": 1754.4845056533813, + "z": "9c3e2040.51e8d", "wires": [ [ - "c8a49936.3deaf8" + "551edb9d.a56dc4" ] ] }, { - "id": "c8a49936.3deaf8", + "id": "551edb9d.a56dc4", "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=\"AAI failed\" />\n", "comments": "", - "x": 1016.9805793762207, - "y": 1810.1035752296448, - "z": "28b033ee.a901cc", + "x": 981.9766960144043, + "y": 1766.1035766601562, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "62f42f4e.42781", + "id": "8cbfcb17.5674d8", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 857.5519866943359, - "y": 1831.2464718818665, - "z": "28b033ee.a901cc", + "x": 822.5481033325195, + "y": 1787.246473312378, + "z": "9c3e2040.51e8d", "wires": [ [ - "c8a49936.3deaf8" + "551edb9d.a56dc4" ] ] }, { - "id": "f380425c.83892", + "id": "7964b486.89bffc", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 689.5044403076172, - "y": 1775.8338742256165, - "z": "28b033ee.a901cc", + "x": 654.5005569458008, + "y": 1731.833875656128, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "c58c2e54.58ab4", + "id": "24a443b3.cdd5dc", "type": "comment", "name": "Set allotted resource type if not sent by SO", "info": "", "comments": "", - "x": 691.00390625, - "y": 248.99999952316284, - "z": "28b033ee.a901cc", + "x": 656.0000228881836, + "y": 205.00000095367432, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "48d3a6f4.7a9f68", + "id": "e3b4ab98.b00c28", "type": "switchNode", "name": "switch allotted-resource-type", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n", "comments": "", "outputs": 1, - "x": 652.9272155761719, - "y": 289.5660557746887, - "z": "28b033ee.a901cc", + "x": 617.9233322143555, + "y": 245.5660572052002, + "z": "9c3e2040.51e8d", "wires": [ [ - "a5628a44.6843d8", - "9e87888a.c266e8" + "7cb47d8a.56e0d4", + "161c8b14.4822c5" ] ] }, { - "id": "a5628a44.6843d8", + "id": "7cb47d8a.56e0d4", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 855.9273681640625, - "y": 274.56605863571167, - "z": "28b033ee.a901cc", + "x": 820.9234848022461, + "y": 230.56606006622314, + "z": "9c3e2040.51e8d", "wires": [ [ - "eafc3b17.674668" + "b02b0441.1428c8" ] ] }, { - "id": "9e87888a.c266e8", + "id": "161c8b14.4822c5", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 848.9271965026855, - "y": 314.5660786628723, - "z": "28b033ee.a901cc", + "x": 813.9233131408691, + "y": 270.5660800933838, + "z": "9c3e2040.51e8d", "wires": [ [ - "1455473e.f663e9" + "40a66352.bcb05c" ] ] }, { - "id": "1455473e.f663e9", + "id": "40a66352.bcb05c", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n", "comments": "", - "x": 1080.9271812438965, - "y": 314.5660834312439, - "z": "28b033ee.a901cc", + "x": 1045.92329788208, + "y": 270.56608486175537, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "f29b8b09.a0de68", + "id": "8a266541.a12688", "type": "comment", "name": "For storage in AAI connection-attachment-topology", "info": "", "comments": "", - "x": 716.0038681030273, - "y": 383.99999952316284, - "z": "28b033ee.a901cc", + "x": 680.9999847412109, + "y": 340.0000009536743, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "c8d768ea.3ebd78", + "id": "755897d2.b185f8", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 691.0038528442383, - "y": 465.8889088630676, - "z": "28b033ee.a901cc", + "x": 655.9999694824219, + "y": 421.8889102935791, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "40de4362.ae07ec", + "id": "6815830a.cf38ec", "type": "comment", "name": "Used for Put AR by id to MDSAL", "info": "", "comments": "", - "x": 657.0039367675781, - "y": 554.8889260292053, - "z": "28b033ee.a901cc", + "x": 622.0000534057617, + "y": 510.8889274597168, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "1f6351e.76805ae", + "id": "6533f8ad.391638", "type": "comment", "name": "Obtain the last index in services", "info": "ServiceData is added by Provider code", "comments": "", - "x": 658.4483795166016, - "y": 740.888870716095, - "z": "28b033ee.a901cc", + "x": 623.4444961547852, + "y": 696.8888721466064, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "7cadc884.11c378", + "id": "55176b7b.204274", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 641.2720489501953, - "y": 1714.3592019081116, - "z": "28b033ee.a901cc", + "x": 606.2681655883789, + "y": 1670.359203338623, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "f028e514.462408", + "id": "e7eec3f2.e0455", "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": 609.6851348876953, - "y": 1876.9749283790588, - "z": "28b033ee.a901cc", + "x": 574.6812515258789, + "y": 1832.9749298095703, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "eafc3b17.674668", + "id": "b02b0441.1428c8", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n", "comments": "", - "x": 1095.0040550231934, - "y": 274.9999852180481, - "z": "28b033ee.a901cc", + "x": 1060.000171661377, + "y": 230.99998664855957, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "273cbd63.ba5da2", + "id": "6d2b2eaf.a08e", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 692.0041809082031, - "y": 1648.0001311302185, - "z": "28b033ee.a901cc", + "x": 657.0002975463867, + "y": 1604.00013256073, + "z": "9c3e2040.51e8d", "wires": [ [ - "98032a32.e6e0f8", - "aa969973.4cd018", - "1764b80a.4c5668" + "2544cf2e.7797d", + "d0176f37.1631f", + "3214e8f5.c864c8" ] ] }, { - "id": "98032a32.e6e0f8", + "id": "2544cf2e.7797d", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 941.6455345153809, - "y": 1686.331461429596, - "z": "28b033ee.a901cc", + "x": 906.6416511535645, + "y": 1642.3314628601074, + "z": "9c3e2040.51e8d", "wires": [ [ - "2942de2a.1ad962" + "93bb925b.d10a9" ] ] }, { - "id": "aa969973.4cd018", + "id": "d0176f37.1631f", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 932.6455841064453, - "y": 1654.8314871788025, - "z": "28b033ee.a901cc", + "x": 897.6417007446289, + "y": 1610.831488609314, + "z": "9c3e2040.51e8d", "wires": [ [ - "2942de2a.1ad962" + "93bb925b.d10a9" ] ] }, { - "id": "1764b80a.4c5668", + "id": "3214e8f5.c864c8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 936.395622253418, - "y": 1625.1885920539498, - "z": "28b033ee.a901cc", + "x": 901.3917388916016, + "y": 1581.1885934844613, + "z": "9c3e2040.51e8d", "wires": [ [ - "801134b3.e6dc28" + "92a0c9d6.d7b8b8" ] ] }, { - "id": "2942de2a.1ad962", + "id": "93bb925b.d10a9", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1102.395622253418, - "y": 1655.5815110206604, - "z": "28b033ee.a901cc", + "x": 1067.3917388916016, + "y": 1611.5815124511719, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "801134b3.e6dc28", + "id": "92a0c9d6.d7b8b8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1078.0515899658203, - "y": 1621.380761243403, - "z": "28b033ee.a901cc", + "x": 1043.047706604004, + "y": 1577.3807626739144, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "52f115fe.31e7bc", + "id": "e23f7239.d2c", "type": "execute", "name": "execute RestApiCallNode - Update parent provided service AR", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"parent\" />\n\n", "comments": "", "outputs": 1, - "x": 757.0038604736328, - "y": 1164.0001645088196, - "z": "28b033ee.a901cc", + "x": 721.9999771118164, + "y": 1120.000165939331, + "z": "9c3e2040.51e8d", "wires": [ [ - "d67d9a08.605298", - "22fe8dcf.9c57d2", - "85578012.048c2" + "42d4726.f4b8f8c", + "fcb14e51.71cdd", + "ed9689dc.1ce198" ] ] }, { - "id": "d67d9a08.605298", + "id": "42d4726.f4b8f8c", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1065.3119201660156, - "y": 1195.9984402656555, - "z": "28b033ee.a901cc", + "x": 1030.3080368041992, + "y": 1151.998441696167, + "z": "9c3e2040.51e8d", "wires": [ [ - "5c849a0e.1b8584" + "91022749.be6058" ] ] }, { - "id": "22fe8dcf.9c57d2", + "id": "fcb14e51.71cdd", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1056.31196975708, - "y": 1164.498466014862, - "z": "28b033ee.a901cc", + "x": 1021.3080863952637, + "y": 1120.4984674453735, + "z": "9c3e2040.51e8d", "wires": [ [ - "5c849a0e.1b8584" + "91022749.be6058" ] ] }, { - "id": "85578012.048c2", + "id": "ed9689dc.1ce198", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1060.0620079040527, - "y": 1134.8555708900094, - "z": "28b033ee.a901cc", + "x": 1025.0581245422363, + "y": 1090.8555723205209, + "z": "9c3e2040.51e8d", "wires": [ [ - "6e0abfa0.4ac64" + "c35c0848.28fbf8" ] ] }, { - "id": "5c849a0e.1b8584", + "id": "91022749.be6058", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1226.0620079040527, - "y": 1165.24848985672, - "z": "28b033ee.a901cc", + "x": 1191.0581245422363, + "y": 1121.2484912872314, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "6e0abfa0.4ac64", + "id": "c35c0848.28fbf8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1201.717975616455, - "y": 1131.0477400794625, - "z": "28b033ee.a901cc", + "x": 1166.7140922546387, + "y": 1087.047741509974, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "d900fe90.080fa", + "id": "bd46d511.3b0d08", "type": "comment", "name": "Put the parent allotted resource in mdsal", "info": "", "comments": "", - "x": 686.0038070678711, - "y": 1126.0000710487366, - "z": "28b033ee.a901cc", + "x": 650.9999237060547, + "y": 1082.000072479248, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "549597d0.2434c8", + "id": "eae0ae19.16041", "type": "set", "name": "set connection-attachment-ar-identifiers", "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n", "comments": "", - "x": 682.3609924316406, - "y": 1328.57169008255, - "z": "28b033ee.a901cc", + "x": 647.3571090698242, + "y": 1284.5716915130615, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "6a649bce.b1cf84", + "id": "c7cc4539.500a68", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />", "comments": "", - "x": 602.2178192138672, - "y": 1296.3811926841736, - "z": "28b033ee.a901cc", + "x": 567.2139358520508, + "y": 1252.381194114685, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "b67f723e.a2fdd", + "id": "d8cd962c.832e98", "type": "set", "name": "set identifiers in overall structure", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n", "comments": "", - "x": 661.1707916259766, - "y": 1362.6668753623962, - "z": "28b033ee.a901cc", + "x": 626.1669082641602, + "y": 1318.6668767929077, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "e622a70a.fb3f98", + "id": "81f242e0.4cfb8", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 613.5036315917969, - "y": 1436.0004029273987, - "z": "28b033ee.a901cc", + "x": 578.4997482299805, + "y": 1392.0004043579102, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "3c5561ef.3b198e", + "id": "a785b9fe.8e2b78", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 664.4906692504883, - "y": 1491.951635837555, - "z": "28b033ee.a901cc", + "x": 629.4867858886719, + "y": 1447.9516372680664, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "34b5882f.c7cb48", + "id": "e1b91be4.687fd8", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 609.0592880249023, - "y": 1397.5557608604431, - "z": "28b033ee.a901cc", + "x": 574.0554046630859, + "y": 1353.5557622909546, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "f1efc3d3.15b9f", + "id": "4b42ac54.3e0884", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 726.3927764892578, - "y": 1262.5556073188782, - "z": "28b033ee.a901cc", + "x": 691.3888931274414, + "y": 1218.5556087493896, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "7f796e7c.de4f4", + "id": "145b2990.9f1986", "type": "execute", "name": "generate parent-ar url - replace allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 721.5039215087891, - "y": 1090.0000100135803, - "z": "28b033ee.a901cc", + "x": 686.5000381469727, + "y": 1046.0000114440918, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "128728fe.ad5877", + "id": "d6792827.57dcf8", "type": "execute", "name": "generate parent-ar url - replace service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 717.5038452148438, - "y": 1047.0001463890076, - "z": "28b033ee.a901cc", + "x": 682.4999618530273, + "y": 1003.000147819519, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "6a7cea15.b62614", + "id": "78c9708b.d276a", "type": "comment", "name": "Prepare Parent AR URL", "info": "Preparation to set provided-allotted-resource in parent service instance", "comments": "", - "x": 635.5043029785156, - "y": 976.0000996589661, - "z": "28b033ee.a901cc", + "x": 600.5004196166992, + "y": 932.0001010894775, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "a35c1852.b6d228", + "id": "33eb09e.c2f17f6", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 674.5040969848633, - "y": 1009.500039100647, - "z": "28b033ee.a901cc", + "x": 639.5002136230469, + "y": 965.5000405311584, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "c2bb18ee.6afb98", + "id": "98cf5592.16f948", "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=\"Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n", "comments": "", - "x": 2231.7608795166016, - "y": 847.6458287239075, - "z": "28b033ee.a901cc", + "x": 2196.756996154785, + "y": 803.645830154419, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "a28f94f9.cae788", + "id": "eedafcbb.09c83", "type": "set", "name": "set tmp.found-cidx", "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n", "comments": "", - "x": 1357.6500511169434, - "y": 759.3125717639923, - "z": "28b033ee.a901cc", + "x": 1322.646167755127, + "y": 715.3125731945038, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "c891031.324ba", + "id": "e5b4f922.408cd8", "type": "comment", "name": "Add to parent services provided-allotted-resources in mdsal", "info": "", "comments": "", - "x": 746.2054138183594, - "y": 943.9792561531067, - "z": "28b033ee.a901cc", + "x": 711.201530456543, + "y": 899.9792575836182, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "2273a66f.0415ca", + "id": "367dfa87.13b4b6", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 666.9726028442383, - "y": 1229.9689364433289, - "z": "28b033ee.a901cc", + "x": 631.9687194824219, + "y": 1185.9689378738403, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "b23dd04a.37b72", + "id": "926c698b.647238", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1340.003957748413, - "y": 657.2777600288391, - "z": "28b033ee.a901cc", + "x": 1305.0000743865967, + "y": 613.2777614593506, + "z": "9c3e2040.51e8d", "wires": [ [ - "a6dda7d3.822f38" + "34cda0a8.01ed1" ] ] }, { - "id": "a6dda7d3.822f38", + "id": "34cda0a8.01ed1", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1527.8613376617432, - "y": 657.8968954086304, - "z": "28b033ee.a901cc", + "x": 1492.8574542999268, + "y": 613.8968968391418, + "z": "9c3e2040.51e8d", "wires": [ [ - "5bd5d251.e9afcc" + "4253f13d.3a8c2" ] ] }, { - "id": "5bd5d251.e9afcc", + "id": "4253f13d.3a8c2", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1727.1944599151611, - "y": 657.8969740867615, - "z": "28b033ee.a901cc", + "x": 1692.1905765533447, + "y": 613.896975517273, + "z": "9c3e2040.51e8d", "wires": [ [ - "7072a3ba.59cbcc" + "b4b47003.957fd" ] ] }, { - "id": "2fe2b50e.b3feea", + "id": "a8dc15.338363e8", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 812.0039596557617, - "y": 652.0000357627869, - "z": "28b033ee.a901cc", + "x": 777.0000762939453, + "y": 608.0000371932983, + "z": "9c3e2040.51e8d", "wires": [ [ - "8f7a89d.e442878", - "3a286aef.d7f3b6" + "4f647ff8.bc9ba", + "37dd5f16.a8f17" ] ] }, { - "id": "3a286aef.d7f3b6", + "id": "37dd5f16.a8f17", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1180.0039901733398, - "y": 622.0000338554382, - "z": "28b033ee.a901cc", + "x": 1145.0001068115234, + "y": 578.0000352859497, + "z": "9c3e2040.51e8d", "wires": [ [ - "13ffa20f.c9e16e" + "7fea5096.61664" ] ] }, { - "id": "13ffa20f.c9e16e", + "id": "7fea5096.61664", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1332.0039901733398, - "y": 621.0000338554382, - "z": "28b033ee.a901cc", + "x": 1297.0001068115234, + "y": 577.0000352859497, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "b0371fd5.a7b76", + "id": "3040fa3e.5fdf76", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 618.0078277587891, - "y": 1567.2500023841858, - "z": "28b033ee.a901cc", + "x": 583.0039443969727, + "y": 1523.2500038146973, + "z": "9c3e2040.51e8d", "wires": [ [ - "54125d93.5f9234", - "a3376785.58e1f8" + "a477b468.1a1198", + "df63659d.a31038" ] ] }, { - "id": "54125d93.5f9234", + "id": "a477b468.1a1198", "type": "for", "name": "for each sdwan-get-request-input-param", "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n", "comments": "", "outputs": 1, - "x": 953.0080261230469, - "y": 1513.2501246333122, - "z": "28b033ee.a901cc", + "x": 918.0041427612305, + "y": 1469.2501260638237, + "z": "9c3e2040.51e8d", "wires": [ [ - "e2f37c7a.7e92e" + "f75d6e3.e38f69" ] ] }, { - "id": "36f9a762.8e3a68", + "id": "bcc416f0.2895c8", "type": "comment", "name": "Required for filling template values", "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters", "comments": "", - "x": 975.4525299072266, - "y": 1547.083285331726, - "z": "28b033ee.a901cc", + "x": 940.4486465454102, + "y": 1503.0832867622375, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "5c5d6d04.0459d4", + "id": "40c178cb.5bcab8", "type": "comment", "name": "Remove VNFC prefix", "info": "", "comments": "", - "x": 1036.007869720459, - "y": 1469.6944603919983, - "z": "28b033ee.a901cc", + "x": 1001.0039863586426, + "y": 1425.6944618225098, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "e2f37c7a.7e92e", + "id": "f75d6e3.e38f69", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1200.0078735351562, - "y": 1514.6943697929382, - "z": "28b033ee.a901cc", + "x": 1165.0039901733398, + "y": 1470.6943712234497, + "z": "9c3e2040.51e8d", "wires": [ [ - "c041009d.8b993", - "2dcd0480.dbffec" + "a64439d1.ae5a88", + "3b97b61d.424c1a" ] ] }, { - "id": "cfd8cad0.68f218", + "id": "9ddd821f.74043", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1468.0077209472656, - "y": 1430.2503678798676, - "z": "28b033ee.a901cc", + "x": 1433.0038375854492, + "y": 1386.250369310379, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "c041009d.8b993", + "id": "a64439d1.ae5a88", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1419.0423889160156, - "y": 1465.2294640541077, - "z": "28b033ee.a901cc", + "x": 1384.0385055541992, + "y": 1421.2294654846191, + "z": "9c3e2040.51e8d", "wires": [ [] ] }, { - "id": "2dcd0480.dbffec", + "id": "3b97b61d.424c1a", "type": "set", "name": "set parameterName", "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1407.4868621826172, - "y": 1569.2294344902039, - "z": "28b033ee.a901cc", + "x": 1372.4829788208008, + "y": 1525.2294359207153, + "z": "9c3e2040.51e8d", "wires": [] }, { - "id": "a3376785.58e1f8", + "id": "df63659d.a31038", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 994.0078735351562, - "y": 1587.2500643730164, - "z": "28b033ee.a901cc", + "x": 959.0039901733398, + "y": 1543.2500658035278, + "z": "9c3e2040.51e8d", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json index 448098c1..2792153f 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json @@ -1,20 +1,20 @@ [ { - "id": "7430f04a.1774", + "id": "3141f6c5.a52fda", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 85.00390625, - "y": 36.999999046325684, - "z": "5c37638f.99fd6c", + "x": 91.00000190734863, + "y": 30.000000476837158, + "z": "36b7dca4.321614", "wires": [ [ - "7176568b.6d7dc8" + "528c7612.26f178" ] ] }, { - "id": "7176568b.6d7dc8", + "id": "528c7612.26f178", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,2120 +22,2586 @@ "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": 297.00391006469727, - "y": 109.00001621246338, - "z": "5c37638f.99fd6c", + "x": 275.00000381469727, + "y": 101.0000171661377, + "z": "36b7dca4.321614", "wires": [ [ - "1281a61c.40d4ba" + "1e8ab7f2.25f3b8" ] ] }, { - "id": "1281a61c.40d4ba", + "id": "1e8ab7f2.25f3b8", "type": "method", "name": "sdwan-attachment-topology-operation-deactivate", "xml": "<method rpc='sdwan-attachment-topology-operation-deactivate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 285.0040283203125, - "y": 196.99999904632568, - "z": "5c37638f.99fd6c", + "x": 263.0001220703125, + "y": 189, + "z": "36b7dca4.321614", "wires": [ [ - "cb789dee.7e0ea" + "64150157.da1a5" ] ] }, { - "id": "cb789dee.7e0ea", + "id": "64150157.da1a5", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 301.0040283203125, - "y": 752.0002436637878, - "z": "5c37638f.99fd6c", - "wires": [ - [ - "b3e4fdfd.73c98", - "6160e5eb.eabd7c", - "36f03095.f7624", - "8b80d6.bfb8df28", - "c3c64d17.8399b", - "79aaa9c4.4c7368", - "f2ac7b6a.645e98", - "17808c6d.fbcb64", - "d8dcd45a.fcb0f8", - "bbb611b3.fa639", - "3e42552f.cc2b3a", - "dcc926d7.4a3488", - "4623075d.b08748", - "c6cd0b89.3b6988", - "d4cf70d6.63ae5", - "96741252.7528f", - "b30219b.8f8bde8", - "7dea7f5b.a3b81", - "5b38ce7d.8512a", - "4ed101e7.e4ff7", - "2a2d01cd.5646fe", - "4b5b6f95.ae82b", - "63f14ad3.bfd8e4" - ] - ] - }, - { - "id": "b3e4fdfd.73c98", + "x": 279.0001220703125, + "y": 744.0002446174622, + "z": "36b7dca4.321614", + "wires": [ + [ + "563dda64.17acc4", + "19755347.d05f3d", + "2f1e916c.daf57e", + "ff9c9326.09054", + "b6c9d7ee.523f68", + "d85e62b3.69a86", + "18a74ff1.92546", + "201a455d.c2e4fa", + "552d726e.db02dc", + "ed4b4b67.4cc708", + "b195de1c.2a671", + "98b3af96.5e7de", + "15eb2076.5c064", + "df909612.fb6138", + "ec442d3.475ffd", + "d5f5fd72.fb157", + "984be839.303c58", + "d0fca62a.672dd8", + "ce4d5b8.f77d2a8", + "2b9c4213.cf45fe", + "aac6b4b9.62d5b8", + "2888718c.b9c46e", + "217830b4.c0fbe", + "ddc38088.8a3fe", + "4044e726.54dc28", + "67ff0ce7.080b74", + "bf17376.0f432c8" + ] + ] + }, + { + "id": "563dda64.17acc4", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 697.9974670410156, - "y": 150.9934859275818, - "z": "5c37638f.99fd6c", + "x": 675.9935607910156, + "y": 142.9934868812561, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "e79f6bf1.e760c8", + "id": "b26eaf7f.105fd", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 726.9577789306641, - "y": 115.02528190612793, - "z": "5c37638f.99fd6c", + "x": 704.9538726806641, + "y": 107.02528285980225, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "6160e5eb.eabd7c", + "id": "19755347.d05f3d", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 651.9974060058594, - "y": 243.99349117279053, - "z": "5c37638f.99fd6c", + "x": 629.9934997558594, + "y": 235.99349212646484, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "8b80d6.bfb8df28", + "id": "ff9c9326.09054", "type": "execute", "name": "execute Properties", "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": 658.2592964172363, - "y": 331.6602201461792, - "z": "5c37638f.99fd6c", + "x": 636.2553901672363, + "y": 323.6602210998535, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "36f03095.f7624", + "id": "2f1e916c.daf57e", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 708.2593994140625, - "y": 418.6602210998535, - "z": "5c37638f.99fd6c", + "x": 686.2554931640625, + "y": 410.66022205352783, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "a79814d4.cdbed8", + "id": "33dbe9f9.3e0e86", "type": "comment", "name": "GET connection-attachment-allotted-resource from mdsal", "info": "", "comments": "", - "x": 751.8124237060547, - "y": 510.5387668609619, - "z": "5c37638f.99fd6c", + "x": 729.8085174560547, + "y": 502.53876781463623, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "ad19a624.c947b8", + "id": "7a97d908.325eb8", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 705.9974365234375, - "y": 210.9935007095337, - "z": "5c37638f.99fd6c", + "x": 683.9935302734375, + "y": 202.993501663208, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "543e0d5a.474aa4", + "id": "3fa36e27.322c42", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 723.9974021911621, - "y": 296.882381439209, - "z": "5c37638f.99fd6c", + "x": 701.9934959411621, + "y": 288.8823823928833, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "512154aa.b3fb3c", + "id": "5088b8ea.1a2868", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 749.9974212646484, - "y": 383.8823404312134, - "z": "5c37638f.99fd6c", + "x": 727.9935150146484, + "y": 375.8823413848877, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "515ee298.e46b6c", + "id": "758df544.297bec", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1192.6707344055176, - "y": 537.0000276565552, - "z": "5c37638f.99fd6c", + "x": 1170.6668281555176, + "y": 529.0000286102295, + "z": "36b7dca4.321614", "wires": [ [ - "abb973f1.c78ab" + "50aac25b.5a95fc" ] ] }, { - "id": "abb973f1.c78ab", + "id": "50aac25b.5a95fc", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1361.6707382202148, - "y": 535.4999284744263, - "z": "5c37638f.99fd6c", + "x": 1339.6668319702148, + "y": 527.4999294281006, + "z": "36b7dca4.321614", "wires": [ [ - "e8fcf921.210ef8" + "7cf78dbb.742bf4" ] ] }, { - "id": "e8fcf921.210ef8", + "id": "7cf78dbb.742bf4", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1534.5280075073242, - "y": 473.11909103393555, - "z": "5c37638f.99fd6c", + "x": 1512.5241012573242, + "y": 465.11909198760986, + "z": "36b7dca4.321614", "wires": [ [ - "386d63ec.fd330c", - "7e042bd8.776d24" + "e18ada9c.684278", + "c1fde691.c1a3e8" ] ] }, { - "id": "386d63ec.fd330c", + "id": "e18ada9c.684278", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1771.8612518310547, - "y": 451.1190414428711, - "z": "5c37638f.99fd6c", + "x": 1749.8573455810547, + "y": 443.1190423965454, + "z": "36b7dca4.321614", "wires": [ [ - "d200a0fb.28d9a" + "13bc9514.12e8bb" ] ] }, { - "id": "d200a0fb.28d9a", + "id": "13bc9514.12e8bb", "type": "block", "name": "block: atomic", "xml": "<block atomic='true'>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1956.3851413726807, - "y": 448.02387523651123, - "z": "5c37638f.99fd6c", + "x": 1934.3812351226807, + "y": 440.02387619018555, + "z": "36b7dca4.321614", "wires": [ [ - "e41bac9c.61118", - "88329a50.a105f8", - "89950442.815df8" + "50a0dec4.4003e", + "ac41a03e.121ee", + "77bc2227.abfd3c" ] ] }, { - "id": "d190b08a.d3505", + "id": "70cd8379.2fdf1c", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1880.5229835510254, - "y": 573.0661163330078, - "z": "5c37638f.99fd6c", + "x": 1858.5190773010254, + "y": 565.0661172866821, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "24c1e070.0695f", + "id": "eebf6b21.03ca48", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1184.5225372314453, - "y": 572.0661125183105, - "z": "5c37638f.99fd6c", + "x": 1162.5186309814453, + "y": 564.0661134719849, + "z": "36b7dca4.321614", "wires": [ [ - "4c6403f2.3fe66c" + "6e2aefa.c6ce31" ] ] }, { - "id": "4c6403f2.3fe66c", + "id": "6e2aefa.c6ce31", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1364.5224876403809, - "y": 572.732663154602, - "z": "5c37638f.99fd6c", + "x": 1342.5185813903809, + "y": 564.7326641082764, + "z": "36b7dca4.321614", "wires": [ [ - "d190b08a.d3505" + "70cd8379.2fdf1c" ] ] }, { - "id": "7e042bd8.776d24", + "id": "c1fde691.c1a3e8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1760.1892051696777, - "y": 488.3994016647339, - "z": "5c37638f.99fd6c", + "x": 1738.1852989196777, + "y": 480.3994026184082, + "z": "36b7dca4.321614", "wires": [ [ - "d190b08a.d3505" + "70cd8379.2fdf1c" ] ] }, { - "id": "e41bac9c.61118", + "id": "50a0dec4.4003e", "type": "set", "name": "set connection-attachment-ar from get", "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n", "comments": "", - "x": 2202.448699951172, - "y": 408.0001049041748, - "z": "5c37638f.99fd6c", + "x": 2180.444793701172, + "y": 400.0001058578491, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "89950442.815df8", + "id": "77bc2227.abfd3c", "type": "set", "name": "set oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments": "", - "x": 2135.4486961364746, - "y": 498.4286594390869, - "z": "5c37638f.99fd6c", + "x": 2113.4447898864746, + "y": 490.42866039276123, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "88329a50.a105f8", + "id": "ac41a03e.121ee", "type": "switchNode", "name": "switch order-status", "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 2146.448532104492, - "y": 452.00010871887207, - "z": "5c37638f.99fd6c", + "x": 2124.444625854492, + "y": 444.0001096725464, + "z": "36b7dca4.321614", "wires": [ [ - "ca3f78a2.5bc238", - "968020a5.6806a" + "d58b4ded.2510b", + "aa0b471a.e14908" ] ] }, { - "id": "ca3f78a2.5bc238", + "id": "d58b4ded.2510b", "type": "outcome", "name": "outcome Active", "xml": "<outcome value='Active'>\n", "comments": "", "outputs": 1, - "x": 2353.048480987549, - "y": 442.00010871887207, - "z": "5c37638f.99fd6c", + "x": 2331.044574737549, + "y": 434.0001096725464, + "z": "36b7dca4.321614", "wires": [ [ - "58491b2c.42f3c4" + "48037.fd500fc9" ] ] }, { - "id": "968020a5.6806a", + "id": "aa0b471a.e14908", "type": "outcome", "name": "outcome Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2352.7630004882812, - "y": 484.4286994934082, - "z": "5c37638f.99fd6c", + "x": 2330.7590942382812, + "y": 476.4287004470825, + "z": "36b7dca4.321614", "wires": [ [ - "4c9f7920.4c2598" + "e35bc0de.32ae1" ] ] }, { - "id": "58491b2c.42f3c4", + "id": "48037.fd500fc9", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2505.5190353393555, - "y": 440.37575912475586, - "z": "5c37638f.99fd6c", + "x": 2483.5151290893555, + "y": 432.3757600784302, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "4c9f7920.4c2598", + "id": "e35bc0de.32ae1", "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\" \n value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n", "comments": "", - "x": 2525.6708908081055, - "y": 481.0001106262207, - "z": "5c37638f.99fd6c", + "x": 2503.6669845581055, + "y": 473.000111579895, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "60f55e27.f2b8e", + "id": "91894f21.7c315", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 913.3070220947266, - "y": 633.4935898780823, - "z": "5c37638f.99fd6c", + "x": 891.3031158447266, + "y": 625.4935908317566, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "c3c64d17.8399b", + "id": "b6c9d7ee.523f68", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 610.3131866455078, - "y": 634.4999380111694, - "z": "5c37638f.99fd6c", + "x": 588.3092803955078, + "y": 626.4999389648438, + "z": "36b7dca4.321614", "wires": [ [ - "60f55e27.f2b8e" + "91894f21.7c315" ] ] }, { - "id": "4352df33.d9426", + "id": "45ae063f.ddd9a8", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 792.0043487548828, - "y": 695.5316972732544, - "z": "5c37638f.99fd6c", + "x": 770.0004425048828, + "y": 687.5316982269287, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "536fbd5d.ad4c74", + "id": "a44115de.ea89b8", "type": "comment", "name": "GET connection-attachment-ar to store AR data from mdsal", "info": "", "comments": "", - "x": 2185.476852416992, - "y": 372.50396823883057, - "z": "5c37638f.99fd6c", + "x": 2163.472946166992, + "y": 364.5039691925049, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "d407857f.3d4ed8", + "id": "d6f0728e.e8007", "type": "comment", "name": "Set source end point", "info": "", "comments": "", - "x": 623.9767456054688, - "y": 602.2540636062622, - "z": "5c37638f.99fd6c", + "x": 601.9728393554688, + "y": 594.2540645599365, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "79aaa9c4.4c7368", + "id": "d85e62b3.69a86", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 676.9728240966797, - "y": 727.000207901001, - "z": "5c37638f.99fd6c", + "x": 654.9689178466797, + "y": 719.0002088546753, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "a093fbeb.16ad58", + "id": "c65a917f.0654d", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1054.9728202819824, - "y": 776.0002069473267, - "z": "5c37638f.99fd6c", + "x": 1032.9689140319824, + "y": 768.000207901001, + "z": "36b7dca4.321614", "wires": [ [ - "c54cab5a.e88d98" + "a84f11cf.944ed" ] ] }, { - "id": "46b4b052.24e9d", + "id": "6f7e92ff.c163ec", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1046.8246231079102, - "y": 811.066291809082, - "z": "5c37638f.99fd6c", + "x": 1024.8207168579102, + "y": 803.0662927627563, + "z": "36b7dca4.321614", "wires": [ [ - "b51504e3.dadba8" + "fcea4987.f76f78" ] ] }, { - "id": "b51504e3.dadba8", + "id": "fcea4987.f76f78", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1221.9733085632324, - "y": 807.3336420059204, - "z": "5c37638f.99fd6c", + "x": 1199.9694023132324, + "y": 799.3336429595947, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "c54cab5a.e88d98", + "id": "a84f11cf.944ed", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1205.9728202819824, - "y": 774.0002069473267, - "z": "5c37638f.99fd6c", + "x": 1183.9689140319824, + "y": 766.000207901001, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "bdec135a.84aa6", + "id": "c1b43a2f.b6d498", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 920.7347373962402, - "y": 1750.9527831077576, - "z": "5c37638f.99fd6c", + "x": 1013.730827331543, + "y": 2270.9528436660767, + "z": "36b7dca4.321614", "wires": [ [ - "323e9893.b0b728" + "37d1e2b4.1ecc0e" ] ] }, { - "id": "323e9893.b0b728", + "id": "37d1e2b4.1ecc0e", "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=\"AAI failed\" />\n", "comments": "", - "x": 1082.2585716247559, - "y": 1795.571829199791, - "z": "5c37638f.99fd6c", + "x": 1175.2546615600586, + "y": 2315.57188975811, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "f668942a.019a38", + "id": "46e90256.1233fc", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 922.8299789428711, - "y": 1816.7147258520126, - "z": "5c37638f.99fd6c", + "x": 1015.8260688781738, + "y": 2336.7147864103317, + "z": "36b7dca4.321614", "wires": [ [ - "323e9893.b0b728" + "37d1e2b4.1ecc0e" ] ] }, { - "id": "24abbd36.f847b2", + "id": "38a39849.f42568", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 634.7824058532715, - "y": 1766.302146434784, - "z": "5c37638f.99fd6c", + "x": 727.7784957885742, + "y": 2286.302206993103, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "dcc926d7.4a3488", + "id": "98b3af96.5e7de", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 649.5501022338867, - "y": 1687.827627658844, - "z": "5c37638f.99fd6c", + "x": 742.5461921691895, + "y": 2207.827688217163, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "4623075d.b08748", + "id": "15eb2076.5c064", "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": 596.9632415771484, - "y": 1882.4434466362, - "z": "5c37638f.99fd6c", + "x": 689.9593315124512, + "y": 2402.443507194519, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "3e42552f.cc2b3a", + "id": "b195de1c.2a671", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 699.2822036743164, - "y": 1595.4684014320374, - "z": "5c37638f.99fd6c", + "x": 792.2782936096191, + "y": 2115.4684619903564, + "z": "36b7dca4.321614", "wires": [ [ - "5966123b.c0928c", - "28e0d860.c64a68", - "4d9dd2fd.a02e7c" + "710256d4.ce9368", + "9d8f4fc7.29648", + "1056e6c3.05afa9" ] ] }, { - "id": "5966123b.c0928c", + "id": "710256d4.ce9368", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 967.9235801696777, - "y": 1646.7998131737113, - "z": "5c37638f.99fd6c", + "x": 1060.9196701049805, + "y": 2166.7998737320304, + "z": "36b7dca4.321614", "wires": [ [ - "1d15a206.04371e" + "8d13b843.178988" ] ] }, { - "id": "28e0d860.c64a68", + "id": "9d8f4fc7.29648", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 958.9236297607422, - "y": 1615.2998389229178, - "z": "5c37638f.99fd6c", + "x": 1051.919719696045, + "y": 2135.299899481237, + "z": "36b7dca4.321614", "wires": [ [ - "1d15a206.04371e" + "8d13b843.178988" ] ] }, { - "id": "4d9dd2fd.a02e7c", + "id": "1056e6c3.05afa9", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 962.6736679077148, - "y": 1585.6569437980652, - "z": "5c37638f.99fd6c", + "x": 1055.6697578430176, + "y": 2105.6570043563843, + "z": "36b7dca4.321614", "wires": [ [ - "e1b7a04e.aa4f3" + "d9dd1fc6.57ca5" ] ] }, { - "id": "1d15a206.04371e", + "id": "8d13b843.178988", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1128.6736679077148, - "y": 1616.0498627647758, - "z": "5c37638f.99fd6c", + "x": 1221.6697578430176, + "y": 2136.049923323095, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "e1b7a04e.aa4f3", + "id": "d9dd1fc6.57ca5", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1104.3296356201172, - "y": 1581.8491129875183, - "z": "5c37638f.99fd6c", + "x": 1197.32572555542, + "y": 2101.8491735458374, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "f2ac7b6a.645e98", + "id": "18a74ff1.92546", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n", "comments": "", - "x": 599.4958229064941, - "y": 1445.849324464798, - "z": "5c37638f.99fd6c", + "x": 692.4919128417969, + "y": 1965.849385023117, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "d8dcd45a.fcb0f8", + "id": "552d726e.db02dc", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 616.781665802002, - "y": 1518.468922138214, - "z": "5c37638f.99fd6c", + "x": 709.7777557373047, + "y": 2038.4689826965332, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "bbb611b3.fa639", + "id": "ed4b4b67.4cc708", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 671.7687225341797, - "y": 1556.4200596809387, - "z": "5c37638f.99fd6c", + "x": 764.7648124694824, + "y": 2076.420120239258, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "17808c6d.fbcb64", + "id": "201a455d.c2e4fa", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 613.3373641967773, - "y": 1485.0239748954773, - "z": "5c37638f.99fd6c", + "x": 706.3334541320801, + "y": 2005.0240354537964, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "83fab007.e00bd", + "id": "dc1f553a.3746d8", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 722.6707954406738, - "y": 1401.0238497257233, - "z": "5c37638f.99fd6c", + "x": 815.6668853759766, + "y": 1921.0239102840424, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "ce9eef3f.571d2", + "id": "4d3306db.2fbdf8", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 664.2506217956543, - "y": 1368.4371514320374, - "z": "5c37638f.99fd6c", + "x": 757.246711730957, + "y": 1888.4372119903564, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "63f14ad3.bfd8e4", + "id": "2888718c.b9c46e", "type": "update", "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n", + "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n", "comments": "", "outputs": 1, - "x": 661.2266845703125, - "y": 1803.754289150238, - "z": "5c37638f.99fd6c", + "x": 754.2227745056152, + "y": 2323.754349708557, + "z": "36b7dca4.321614", "wires": [ [ - "bdec135a.84aa6", - "f668942a.019a38" + "c1b43a2f.b6d498", + "46e90256.1233fc" ] ] }, { - "id": "c6cd0b89.3b6988", + "id": "df909612.fb6138", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 825.3378601074219, - "y": 553.4999485015869, - "z": "5c37638f.99fd6c", + "x": 803.3339538574219, + "y": 545.4999494552612, + "z": "36b7dca4.321614", "wires": [ [ - "515ee298.e46b6c", - "24c1e070.0695f" + "758df544.297bec", + "eebf6b21.03ca48" ] ] }, { - "id": "d4cf70d6.63ae5", + "id": "ec442d3.475ffd", "type": "execute", "name": "get parent-service-data tmp.ar-url-psd", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 679.0041046142578, - "y": 762.0002098083496, - "z": "5c37638f.99fd6c", + "x": 657.0001983642578, + "y": 754.0002107620239, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "96741252.7528f", + "id": "d5f5fd72.fb157", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 746.0040664672852, - "y": 797.0002937316895, - "z": "5c37638f.99fd6c", + "x": 724.0001602172852, + "y": 789.0002946853638, + "z": "36b7dca4.321614", "wires": [ [ - "a093fbeb.16ad58", - "46b4b052.24e9d" + "c65a917f.0654d", + "6f7e92ff.c163ec" ] ] }, { - "id": "490fd156.3cc2e", + "id": "4db8d90d.4f7238", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2566.816566467285, - "y": 814.3294501304626, - "z": "5c37638f.99fd6c", + "x": 2544.812660217285, + "y": 806.329451084137, + "z": "36b7dca4.321614", "wires": [ [ - "88745fb7.28e43" + "5ae4c974.91c268" ] ] }, { - "id": "edb86366.daca5", + "id": "d1626b48.25fc18", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2600.66805267334, - "y": 760.3954167366028, - "z": "5c37638f.99fd6c", + "x": 2578.66414642334, + "y": 752.3954176902771, + "z": "36b7dca4.321614", "wires": [ [ - "ae1d17f2.d02858" + "ab84a2c3.2ae2b" ] ] }, { - "id": "92d891d3.4ab0e", + "id": "a8b146e3.827bd8", "type": "for", "name": "for arvidx.. mdsal-sd.service-data.vnfs.vnf_length[]", "xml": "<for index='arvidx' start='0' end='`$mdsal-sd.service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 2085.81746673584, - "y": 1641.9966707229614, - "z": "5c37638f.99fd6c", + "x": 2063.81356048584, + "y": 1633.9966716766357, + "z": "36b7dca4.321614", "wires": [ [ - "71080db2.ebc5d4" + "151d247e.ada54c" ] ] }, { - "id": "71080db2.ebc5d4", + "id": "151d247e.ada54c", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2361.4840393066406, - "y": 1642.9967036247253, - "z": "5c37638f.99fd6c", + "x": 2339.4801330566406, + "y": 1634.9967045783997, + "z": "36b7dca4.321614", "wires": [ [ - "a5010038.a8cca" + "ce8318c6.862998" ] ] }, { - "id": "a5010038.a8cca", + "id": "ce8318c6.862998", "type": "switchNode", "name": "switch ActivateSiteInstance", "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == ActivateSiteInstance`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2598.34774017334, - "y": 1647.194667339325, - "z": "5c37638f.99fd6c", + "x": 2576.34383392334, + "y": 1639.1946682929993, + "z": "36b7dca4.321614", "wires": [ [ - "78d61896.379bb8" + "38959100.baa79" ] ] }, { - "id": "78d61896.379bb8", + "id": "38959100.baa79", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2807.347255706787, - "y": 1647.1948204040527, - "z": "5c37638f.99fd6c", + "x": 2785.343349456787, + "y": 1639.194821357727, + "z": "36b7dca4.321614", "wires": [ [ - "bfec68b.915a698" + "8dc66f20.128aa" ] ] }, { - "id": "9280788a.1a5978", + "id": "ae283116.659c4", "type": "set", "name": "set tmp.sitevidx ", "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n", "comments": "", - "x": 2204.3482055664062, - "y": 1751.195249080658, - "z": "5c37638f.99fd6c", + "x": 2182.3442993164062, + "y": 1743.1952500343323, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "a8aa86a8.764d68", + "id": "cc813b15.219a98", "type": "set", "name": "set prop.ar-parent-service-instance-id", "xml": "<set>\n<parameter name='prop.ar-parent-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n", "comments": "", - "x": 2120.8163681030273, - "y": 1064.996099472046, - "z": "5c37638f.99fd6c", + "x": 2098.8124618530273, + "y": 1056.9961004257202, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "9f1816e2.642ea8", + "id": "16d565c8.6fce0a", "type": "for", "name": "for loop aridx - Get role from allotted resource", "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2146.816162109375, - "y": 1013.4959707260132, - "z": "5c37638f.99fd6c", + "x": 2124.812255859375, + "y": 1005.4959716796875, + "z": "36b7dca4.321614", "wires": [ [ - "9c8b4e3c.7c8c5" + "412ffbe3.a86674" ] ] }, { - "id": "9c8b4e3c.7c8c5", + "id": "412ffbe3.a86674", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2401.81649017334, - "y": 1010.4964303970337, - "z": "5c37638f.99fd6c", + "x": 2379.81258392334, + "y": 1002.496431350708, + "z": "36b7dca4.321614", "wires": [ [ - "30449575.75463a", - "92ec0f10.dba05" + "e0854b83.a59ed8", + "67be11c6.fc4b4" ] ] }, { - "id": "30449575.75463a", + "id": "e0854b83.a59ed8", "type": "switchNode", "name": "switch Role", "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n", "comments": "", "outputs": 1, - "x": 2531.8163108825684, - "y": 982.4963674545288, - "z": "5c37638f.99fd6c", + "x": 2509.8124046325684, + "y": 974.4963684082031, + "z": "36b7dca4.321614", "wires": [ [ - "b4910f3d.0db62" + "60e8b373.f2f1cc" ] ] }, { - "id": "b4910f3d.0db62", + "id": "60e8b373.f2f1cc", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2672.8166427612305, - "y": 981.4963665008545, - "z": "5c37638f.99fd6c", + "x": 2650.8127365112305, + "y": 973.4963674545288, + "z": "36b7dca4.321614", "wires": [ [ - "367dfe9f.4b0012" + "564d6e3.a986e9" ] ] }, { - "id": "367dfe9f.4b0012", + "id": "564d6e3.a986e9", "type": "set", "name": "set prop.role", "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n", "comments": "", - "x": 2838.8173065185547, - "y": 976.096269607544, - "z": "5c37638f.99fd6c", + "x": 2816.8134002685547, + "y": 968.0962705612183, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "1009f0e9.e8787f", + "id": "bef02da7.b5697", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2418.8169898986816, - "y": 1159.996376991272, - "z": "5c37638f.99fd6c", + "x": 2396.8130836486816, + "y": 1151.9963779449463, + "z": "36b7dca4.321614", "wires": [ [ - "38660dd.8ae9ef2" + "e69aff22.57aef" ] ] }, { - "id": "c9a9abe5.0b0758", + "id": "108f0456.69aaac", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2412.668731689453, - "y": 1116.0624141693115, - "z": "5c37638f.99fd6c", + "x": 2390.664825439453, + "y": 1108.0624151229858, + "z": "36b7dca4.321614", "wires": [ [ - "faec6a4d.0cfc28" + "d2cf1da5.9ee9a" ] ] }, { - "id": "ae1d17f2.d02858", + "id": "ab84a2c3.2ae2b", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2726.816177368164, - "y": 757.4958500862122, - "z": "5c37638f.99fd6c", + "x": 2704.812271118164, + "y": 749.4958510398865, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "88745fb7.28e43", + "id": "5ae4c974.91c268", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1856.3160400390625, - "y": 1031.4959707260132, - "z": "5c37638f.99fd6c", + "x": 1834.3121337890625, + "y": 1023.4959716796875, + "z": "36b7dca4.321614", "wires": [ [ - "9f1816e2.642ea8", - "a8aa86a8.764d68", - "56d62d96.7f8ce4", - "b96757af.5cca38" + "16d565c8.6fce0a", + "cc813b15.219a98", + "6c3854b6.659a5c", + "ddb36283.9977d" ] ] }, { - "id": "faec6a4d.0cfc28", + "id": "d2cf1da5.9ee9a", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2542.3168506622314, - "y": 1109.4963340759277, - "z": "5c37638f.99fd6c", + "x": 2520.3129444122314, + "y": 1101.496335029602, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "38660dd.8ae9ef2", + "id": "e69aff22.57aef", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1932.3163299560547, - "y": 1236.4959840774536, - "z": "5c37638f.99fd6c", + "x": 1910.3124237060547, + "y": 1228.495985031128, + "z": "36b7dca4.321614", "wires": [ [ - "c768cf9a.62862" + "a7e7f8fb.8ee848" ] ] }, { - "id": "4edc1d8f.0a1944", + "id": "5dfa5d99.6db7b4", "type": "for", "name": "for loop siteidx - Get site ID from servicedata", "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2296.3190536499023, - "y": 1792.497006893158, - "z": "5c37638f.99fd6c", + "x": 2274.3151473999023, + "y": 1784.4970078468323, + "z": "36b7dca4.321614", "wires": [ [ - "3d77f67c.b5ecea" + "824eb6f3.bc12a8" ] ] }, { - "id": "ead36ab7.282438", + "id": "4af98bb7.a04904", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n", "comments": "", "outputs": 1, - "x": 2368.3210372924805, - "y": 1860.497986316681, - "z": "5c37638f.99fd6c", + "x": 2346.3171310424805, + "y": 1852.4979872703552, + "z": "36b7dca4.321614", "wires": [ [ - "d924a586.673c18" + "1cabca59.917da6" ] ] }, { - "id": "321bf129.18913e", + "id": "ad1a1b89.af61c8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2222.8193130493164, - "y": 1933.9970240592957, - "z": "5c37638f.99fd6c", + "x": 2200.8154067993164, + "y": 1925.99702501297, + "z": "36b7dca4.321614", "wires": [ [ - "875c4bea.660358", - "ecb79aa0.650108", - "f8b5c142.e5e42" + "fbdfeb83.50c018", + "6ab1dd86.bc5ac4", + "dfe3d1ff.2a521" ] ] }, { - "id": "4ed101e7.e4ff7", + "id": "bf17376.0f432c8", "type": "execute", "name": "execute RestApiCallNode delete vpn topology", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 697.8168258666992, - "y": 1193.496681213379, - "z": "5c37638f.99fd6c", + "x": 790.812915802002, + "y": 1713.496741771698, + "z": "36b7dca4.321614", "wires": [ [ - "79fecdbb.444414", - "8f4a1544.240ce8" + "dd133500.c9b588", + "4ff52f01.dec2a" ] ] }, { - "id": "79fecdbb.444414", + "id": "dd133500.c9b588", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 952.816593170166, - "y": 1209.496681213379, - "z": "5c37638f.99fd6c", + "x": 1045.8126831054688, + "y": 1729.496741771698, + "z": "36b7dca4.321614", "wires": [ [ - "1ef5ce22.99b2f2" + "fedffe27.13d88" ] ] }, { - "id": "1ef5ce22.99b2f2", + "id": "fedffe27.13d88", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1122.8165321350098, - "y": 1212.496681213379, - "z": "5c37638f.99fd6c", + "x": 1215.8126220703125, + "y": 1732.496741771698, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "13d95323.743e4d", + "id": "93a1a55.98e1f58", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1122.8166542053223, - "y": 1168.496681213379, - "z": "5c37638f.99fd6c", + "x": 1215.812744140625, + "y": 1688.496741771698, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "8f4a1544.240ce8", + "id": "4ff52f01.dec2a", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 955.8165321350098, - "y": 1168.496681213379, - "z": "5c37638f.99fd6c", + "x": 1048.8126220703125, + "y": 1688.496741771698, + "z": "36b7dca4.321614", "wires": [ [ - "13d95323.743e4d" + "93a1a55.98e1f58" ] ] }, { - "id": "9f45ce4d.1731c", + "id": "9c440320.0009b", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1103.3835430145264, - "y": 965.1728572845459, - "z": "5c37638f.99fd6c", + "x": 1216.3796367645264, + "y": 1251.1728959083557, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "4b5b6f95.ae82b", + "id": "aac6b4b9.62d5b8", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 672.8832855224609, - "y": 1016.1732077598572, - "z": "5c37638f.99fd6c", + "x": 785.8793792724609, + "y": 1302.173246383667, + "z": "36b7dca4.321614", "wires": [ [ - "9379b94d.ebf738", - "85618b89.4df498", - "d4faaa3e.0874d8" + "f554c450.4c9bc8", + "250a3c3a.bfa264", + "1866c1d3.5923ee" ] ] }, { - "id": "9379b94d.ebf738", + "id": "f554c450.4c9bc8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 931.8835773468018, - "y": 971.1728410720825, - "z": "5c37638f.99fd6c", + "x": 1044.8796710968018, + "y": 1257.1728796958923, + "z": "36b7dca4.321614", "wires": [ [ - "9f45ce4d.1731c" + "9c440320.0009b" ] ] }, { - "id": "85618b89.4df498", + "id": "250a3c3a.bfa264", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 928.3742942810059, - "y": 1009.74693775177, - "z": "5c37638f.99fd6c", + "x": 1041.3703880310059, + "y": 1295.7469763755798, + "z": "36b7dca4.321614", "wires": [ [ - "ef8f714d.57ad1" + "6a9152f3.8b088c" ] ] }, { - "id": "d4faaa3e.0874d8", + "id": "1866c1d3.5923ee", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 923.7073020935059, - "y": 1051.0802507400513, - "z": "5c37638f.99fd6c", + "x": 1036.7033958435059, + "y": 1337.080289363861, + "z": "36b7dca4.321614", "wires": [ [ - "7ed2ad4f.8bf614" + "90697580.51d788" ] ] }, { - "id": "ef8f714d.57ad1", + "id": "6a9152f3.8b088c", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1078.9456100463867, - "y": 1004.0326900482178, - "z": "5c37638f.99fd6c", + "x": 1191.9417037963867, + "y": 1290.0327286720276, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "7ed2ad4f.8bf614", + "id": "90697580.51d788", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1085.4797630310059, - "y": 1052.5194597244263, - "z": "5c37638f.99fd6c", + "x": 1198.4758567810059, + "y": 1338.519498348236, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "c768cf9a.62862", + "id": "a7e7f8fb.8ee848", "type": "for", - "name": "for pnidx.. mdsal-psd.service-data.networks.network_length[]", + "name": "for pnidx.. mdsal-parentsd.service-data.networks.network_length[]", "xml": "<for index='pnidx' start='0' end='`$mdsal-parentsd.service-data.networks.network_length`' >\n", "comments": "", "outputs": 1, - "x": 2257.315902709961, - "y": 1235.9957118034363, - "z": "5c37638f.99fd6c", - "wires": [ - [ - "e252e8ae.c32088" - ] - ] - }, - { - "id": "e252e8ae.c32088", - "type": "block", - "name": "block", - "xml": "<block>\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 1935.9829940795898, - "y": 1326.9955472946167, - "z": "5c37638f.99fd6c", + "x": 2235.311996459961, + "y": 1227.9957127571106, + "z": "36b7dca4.321614", "wires": [ [ - "14486987.b85df6" + "134d81a7.f5395e" ] ] }, { - "id": "14486987.b85df6", + "id": "bce6e7ae.f035f8", "type": "switchNode", "name": "switch ActivateSDWANConnectivityInstance", "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2180.983726501465, - "y": 1328.9959135055542, - "z": "5c37638f.99fd6c", + "x": 2158.979820251465, + "y": 1320.9959144592285, + "z": "36b7dca4.321614", "wires": [ [ - "1a69042b.c0872c" + "8b710972.a5d448" ] ] }, { - "id": "1a69042b.c0872c", + "id": "8b710972.a5d448", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2437.9832191467285, - "y": 1327.9960436820984, - "z": "5c37638f.99fd6c", + "x": 2415.9793128967285, + "y": 1319.9960446357727, + "z": "36b7dca4.321614", "wires": [ [ - "ecc75ce5.52a22" + "ad16d848.956c28" ] ] }, { - "id": "693abfa.fed9d4", + "id": "e503187.dfdbbe8", "type": "for", "name": "for loop paramidx - Get topology from servicedata", "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2239.9839057922363, - "y": 1417.9956316947937, - "z": "5c37638f.99fd6c", + "x": 2217.9799995422363, + "y": 1409.995632648468, + "z": "36b7dca4.321614", "wires": [ [ - "3b22a756.98c7f8" + "2aaa98b1.97fbe8" ] ] }, { - "id": "3b22a756.98c7f8", + "id": "2aaa98b1.97fbe8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2505.983594894409, - "y": 1414.995954990387, - "z": "5c37638f.99fd6c", + "x": 2483.979688644409, + "y": 1406.9959559440613, + "z": "36b7dca4.321614", "wires": [ [ - "dccdc0aa.2bb7b", - "b18f2a38.d85ae8" + "93e924c8.1cbc78", + "9a3cf2e3.de00a" ] ] }, { - "id": "dccdc0aa.2bb7b", + "id": "93e924c8.1cbc78", "type": "switchNode", "name": "switch topology", - "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n", + "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n", "comments": "", "outputs": 1, - "x": 2676.98392868042, - "y": 1383.9954648017883, - "z": "5c37638f.99fd6c", + "x": 2654.98002243042, + "y": 1375.9954657554626, + "z": "36b7dca4.321614", "wires": [ [ - "e0213c77.0f4ca" + "3f47b224.ea53fe" ] ] }, { - "id": "e0213c77.0f4ca", + "id": "3f47b224.ea53fe", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2828.9839191436768, - "y": 1385.9954953193665, - "z": "5c37638f.99fd6c", + "x": 2806.9800128936768, + "y": 1377.9954962730408, + "z": "36b7dca4.321614", "wires": [ [ - "71cd0898.67eff8" + "2d4beaeb.2d5ae6" ] ] }, { - "id": "71cd0898.67eff8", + "id": "2d4beaeb.2d5ae6", "type": "set", "name": "set topology", - "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", + "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2972.9839305877686, - "y": 1385.5954298973083, - "z": "5c37638f.99fd6c", + "x": 2950.9800243377686, + "y": 1377.5954308509827, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "b18f2a38.d85ae8", + "id": "9a3cf2e3.de00a", "type": "switchNode", "name": "switch vpnId", - "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n", + "xml": "<switch test=\"`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n", "comments": "", "outputs": 1, - "x": 2668.649652481079, - "y": 1426.3284468650818, - "z": "5c37638f.99fd6c", + "x": 2646.645746231079, + "y": 1418.328447818756, + "z": "36b7dca4.321614", "wires": [ [ - "5ef41a40.56fe94" + "805a8b6a.884b08" ] ] }, { - "id": "5ef41a40.56fe94", + "id": "805a8b6a.884b08", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2820.649642944336, - "y": 1428.32847738266, - "z": "5c37638f.99fd6c", + "x": 2798.645736694336, + "y": 1420.3284783363342, + "z": "36b7dca4.321614", "wires": [ [ - "25d7449c.78b97c" + "47c03332.4437ec" ] ] }, { - "id": "25d7449c.78b97c", + "id": "47c03332.4437ec", "type": "set", "name": "set prop.vpn1Id", "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2964.6496543884277, - "y": 1427.9284119606018, - "z": "5c37638f.99fd6c", + "x": 2942.6457481384277, + "y": 1419.9284129142761, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "2a2d01cd.5646fe", + "id": "2b9c4213.cf45fe", "type": "execute", "name": "execute RestApiCallNode delete vpn ", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 670.8164978027344, - "y": 1304.9966464042664, - "z": "5c37638f.99fd6c", + "x": 763.8125877380371, + "y": 1824.9967069625854, + "z": "36b7dca4.321614", "wires": [ [ - "c4c9f687.9e7588", - "802fa182.99b1f" + "b5d353ac.0589e", + "2c7732a6.dbeb5e" ] ] }, { - "id": "c4c9f687.9e7588", + "id": "b5d353ac.0589e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 903.8165760040283, - "y": 1329.996645450592, - "z": "5c37638f.99fd6c", + "x": 996.812665939331, + "y": 1849.9967060089111, + "z": "36b7dca4.321614", "wires": [ [ - "1b0d22fd.e671fd" + "35c412a7.ab087e" ] ] }, { - "id": "1b0d22fd.e671fd", + "id": "35c412a7.ab087e", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1073.816514968872, - "y": 1332.996645450592, - "z": "5c37638f.99fd6c", + "x": 1166.8126049041748, + "y": 1852.9967060089111, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "588dc5fe.3853dc", + "id": "3622d573.b4a8aa", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1073.8166370391846, - "y": 1288.996645450592, - "z": "5c37638f.99fd6c", + "x": 1166.8127269744873, + "y": 1808.9967060089111, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "802fa182.99b1f", + "id": "2c7732a6.dbeb5e", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 906.8165149688721, - "y": 1288.996645450592, - "z": "5c37638f.99fd6c", + "x": 999.8126049041748, + "y": 1808.9967060089111, + "z": "36b7dca4.321614", "wires": [ [ - "588dc5fe.3853dc" + "3622d573.b4a8aa" ] ] }, { - "id": "67ff2f7e.84dea", + "id": "72ba670d.964b28", "type": "set", "name": "set prop.name", "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n", "comments": "", - "x": 2886.8163108825684, - "y": 1028.995940208435, - "z": "5c37638f.99fd6c", + "x": 2864.8124046325684, + "y": 1020.9959411621094, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "92ec0f10.dba05", + "id": "67be11c6.fc4b4", "type": "switchNode", "name": "switch sdwanVpnName", "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'sdwanVpnName'`\">\n", "comments": "", "outputs": 1, - "x": 2567.316150665283, - "y": 1031.9959325790405, - "z": "5c37638f.99fd6c", + "x": 2545.312244415283, + "y": 1023.9959335327148, + "z": "36b7dca4.321614", "wires": [ [ - "da5b9464.fd80d8" + "9940a94a.c22938" ] ] }, { - "id": "da5b9464.fd80d8", + "id": "9940a94a.c22938", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2738.3163108825684, - "y": 1030.9960012435913, - "z": "5c37638f.99fd6c", + "x": 2716.3124046325684, + "y": 1022.9960021972656, + "z": "36b7dca4.321614", "wires": [ [ - "67ff2f7e.84dea" + "72ba670d.964b28" ] ] }, { - "id": "1f17ba6f.07fd86", + "id": "c293dea2.46ad3", "type": "set", "name": "set prop.ar.provided-allotted-resource-id", "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n\n", "comments": "", - "x": 2052.81591796875, - "y": 772.9960646629333, - "z": "5c37638f.99fd6c", + "x": 2030.81201171875, + "y": 764.9960656166077, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "5609c5e0.866b1c", + "id": "bfa616d6.8ac5b8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1230.8463745117188, - "y": 880.1932344436646, - "z": "5c37638f.99fd6c", + "x": 1343.8424682617188, + "y": 1166.1932730674744, + "z": "36b7dca4.321614", "wires": [ [ - "b59d7969.b1f2f8" + "afc6f5e9.2167e8" ] ] }, { - "id": "cd36d7b2.2df868", + "id": "97d5dacd.f274d8", "type": "execute", "name": "generate tmp.ar-url-connection url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 2037.3335800170898, - "y": 806.3295407295227, - "z": "5c37638f.99fd6c", + "x": 2015.3296737670898, + "y": 798.329541683197, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "f53ba2f7.ad562", + "id": "a06e500e.c5ed3", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n", "comments": "", "outputs": 1, - "x": 2177.333209991455, - "y": 841.9958319664001, - "z": "5c37638f.99fd6c", + "x": 2155.329303741455, + "y": 833.9958329200745, + "z": "36b7dca4.321614", "wires": [ [ - "edb86366.daca5", - "490fd156.3cc2e" + "d1626b48.25fc18", + "4db8d90d.4f7238" ] ] }, { - "id": "56d62d96.7f8ce4", + "id": "6c3854b6.659a5c", "type": "execute", "name": "execute RestApiCallNode - get parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-parentsd\" />\n\n", "comments": "", "outputs": 1, - "x": 2153.0004501342773, - "y": 1134.995888710022, - "z": "5c37638f.99fd6c", + "x": 2130.9965438842773, + "y": 1126.9958896636963, + "z": "36b7dca4.321614", "wires": [ [ - "1009f0e9.e8787f", - "c9a9abe5.0b0758" + "bef02da7.b5697", + "108f0456.69aaac" ] ] }, { - "id": "ecc75ce5.52a22", + "id": "ad16d848.956c28", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1897.333869934082, - "y": 1424.6630945205688, - "z": "5c37638f.99fd6c", + "x": 1875.329963684082, + "y": 1416.6630954742432, + "z": "36b7dca4.321614", "wires": [ [ - "693abfa.fed9d4", - "90dd080.179f4f8", - "74e88748.645e58", - "a1a950eb.a0193" + "e503187.dfdbbe8", + "8d2d1c34.602ed", + "d55381bc.ca39b", + "376fcdda.5c0302" ] ] }, { - "id": "875c4bea.660358", + "id": "fbdfeb83.50c018", "type": "set", "name": "set prop.attach.siteId", "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$mdsal-sd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n\n", "comments": "", - "x": 2489.002185821533, - "y": 1915.6638503074646, - "z": "5c37638f.99fd6c", + "x": 2466.998279571533, + "y": 1907.663851261139, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "d924a586.673c18", + "id": "1cabca59.917da6", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2509.00244140625, - "y": 1860.663676738739, - "z": "5c37638f.99fd6c", + "x": 2486.99853515625, + "y": 1852.6636776924133, + "z": "36b7dca4.321614", "wires": [ [ - "321bf129.18913e" + "ad1a1b89.af61c8" ] ] }, { - "id": "bfec68b.915a698", + "id": "8dc66f20.128aa", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2001.668327331543, - "y": 1746.3301873207092, - "z": "5c37638f.99fd6c", + "x": 1979.664421081543, + "y": 1738.3301882743835, + "z": "36b7dca4.321614", "wires": [ [ - "4edc1d8f.0a1944", - "9280788a.1a5978" + "5dfa5d99.6db7b4", + "ae283116.659c4" ] ] }, { - "id": "b30219b.8f8bde8", + "id": "984be839.303c58", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 838.185131072998, - "y": 915.6358346939087, - "z": "5c37638f.99fd6c", + "x": 951.181224822998, + "y": 1201.6358733177185, + "z": "36b7dca4.321614", "wires": [ [ - "5609c5e0.866b1c" + "bfa616d6.8ac5b8" ] ] }, { - "id": "3d77f67c.b5ecea", + "id": "824eb6f3.bc12a8", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2213.668685913086, - "y": 1857.000834941864, - "z": "5c37638f.99fd6c", + "x": 2191.664779663086, + "y": 1849.0008358955383, + "z": "36b7dca4.321614", "wires": [ [ - "ead36ab7.282438" + "4af98bb7.a04904" ] ] }, { - "id": "7dea7f5b.a3b81", + "id": "d0fca62a.672dd8", "type": "set", "name": "set prop.siteAttachement_length=0", "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n", "comments": "", - "x": 684.00390625, - "y": 858.5311903953552, - "z": "5c37638f.99fd6c", + "x": 797, + "y": 1144.531229019165, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "ecb79aa0.650108", + "id": "6ab1dd86.bc5ac4", "type": "set", "name": "Add sites to list and update length", "xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 2516.506019592285, - "y": 1960.5316553115845, - "z": "5c37638f.99fd6c", + "x": 2494.502113342285, + "y": 1952.5316562652588, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "b96757af.5cca38", + "id": "ddb36283.9977d", "type": "execute", "name": "generate prop.ar-parent-service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/> \n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar-parent-service-instance-id`\"/>\n\n", "comments": "", "outputs": 1, - "x": 2137.504051208496, - "y": 1097.5314092636108, - "z": "5c37638f.99fd6c", + "x": 2115.500144958496, + "y": 1089.5314102172852, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "90dd080.179f4f8", + "id": "8d2d1c34.602ed", "type": "set", "name": "set prop.ar-service-instance-id", "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n", "comments": "", - "x": 2170.5044708251953, - "y": 1486.5313272476196, - "z": "5c37638f.99fd6c", + "x": 2148.5005645751953, + "y": 1478.531328201294, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "74e88748.645e58", + "id": "d55381bc.ca39b", "type": "execute", "name": "generate prop.ar-service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/> \n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n\n", "comments": "", "outputs": 1, - "x": 2195.836929321289, - "y": 1519.4096231460571, - "z": "5c37638f.99fd6c", + "x": 2173.833023071289, + "y": 1511.4096240997314, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "a1a950eb.a0193", + "id": "376fcdda.5c0302", "type": "execute", "name": "execute RestApiCallNode - get-resource service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-sd\" />\n\n", "comments": "", "outputs": 1, - "x": 2246.8370513916016, - "y": 1556.409441947937, - "z": "5c37638f.99fd6c", + "x": 2224.8331451416016, + "y": 1548.4094429016113, + "z": "36b7dca4.321614", "wires": [ [ - "d085c605.a64ce8", - "872e1cc1.fb142" + "24c5b010.6c228", + "5d5ea42b.5dad9c" ] ] }, { - "id": "872e1cc1.fb142", + "id": "5d5ea42b.5dad9c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2525.5041160583496, - "y": 1552.531153678894, - "z": "5c37638f.99fd6c", + "x": 2503.5002098083496, + "y": 1544.5311546325684, + "z": "36b7dca4.321614", "wires": [ [ - "eb1435b3.407188" + "70e96035.e38c9" ] ] }, { - "id": "d085c605.a64ce8", + "id": "24c5b010.6c228", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2523.3564453125, - "y": 1513.5972814559937, - "z": "5c37638f.99fd6c", + "x": 2501.3525390625, + "y": 1505.597282409668, + "z": "36b7dca4.321614", "wires": [ [ - "6579eeb9.4ad43" + "b0b3ac1b.bb725" ] ] }, { - "id": "6579eeb9.4ad43", + "id": "b0b3ac1b.bb725", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2653.004638671875, - "y": 1507.0312414169312, - "z": "5c37638f.99fd6c", + "x": 2631.000732421875, + "y": 1499.0312423706055, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "eb1435b3.407188", + "id": "70e96035.e38c9", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2674.505012512207, - "y": 1553.5313386917114, - "z": "5c37638f.99fd6c", + "x": 2652.501106262207, + "y": 1545.5313396453857, + "z": "36b7dca4.321614", "wires": [ [ - "92d891d3.4ab0e" + "a8b146e3.827bd8" ] ] }, { - "id": "b59d7969.b1f2f8", + "id": "afc6f5e9.2167e8", "type": "switchNode", "name": "switch allotted resource ID match", - "xml": "<switch test=\"`$prop.ar.provided-allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n", + "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">", "comments": "", "outputs": 1, - "x": 1454.504020690918, - "y": 877.0312628746033, - "z": "5c37638f.99fd6c", + "x": 1567.500114440918, + "y": 1163.031301498413, + "z": "36b7dca4.321614", "wires": [ [ - "d35d9e14.f135e" + "54c627b4.10bfd8" ] ] }, { - "id": "d35d9e14.f135e", + "id": "54c627b4.10bfd8", "type": "outcomeFalse", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1668.5040855407715, - "y": 808.0312933921814, - "z": "5c37638f.99fd6c", + "x": 1646.5001792907715, + "y": 800.0312943458557, + "z": "36b7dca4.321614", "wires": [ [ - "72234e91.d5575" + "3a3f312b.b33afe" ] ] }, { - "id": "72234e91.d5575", + "id": "3a3f312b.b33afe", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1810.5043334960938, - "y": 807.0312342643738, - "z": "5c37638f.99fd6c", + "x": 1788.5004272460938, + "y": 799.0312352180481, + "z": "36b7dca4.321614", "wires": [ [ - "1f17ba6f.07fd86", - "cd36d7b2.2df868", - "f53ba2f7.ad562" + "c293dea2.46ad3", + "97d5dacd.f274d8", + "a06e500e.c5ed3" ] ] }, { - "id": "d4480c4c.ab7f1", + "id": "d22dbfd2.187be", "type": "comment", "name": "if allotted resource Id match with the incomming allotted resource ID, sites in this service vnf should not be included", "info": "parent instId 200 | parent instId 200\nservice instId 100| service InstId 200\n site1 | site2\n allotted resId 1 | allotted resId 2 \n --------------------------------------\n Deactivate:\n loop for provided allotted res ID\n If allotted resId 1 matches with incomming allotted resource Id then we should delete the sites available in the service data 100\n for this we have to send request for deleting with site IDs site2 without including site1.\n \n \n ", "comments": "", - "x": 1763.5039367675781, - "y": 740.03129529953, - "z": "5c37638f.99fd6c", + "x": 1741.5000305175781, + "y": 732.0312962532043, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "44d17735.c18b38", + "id": "21d740e7.f725a", "type": "comment", "name": "loop for provided allotted rsource Id", "info": "", "comments": "", - "x": 950.50390625, - "y": 879.5312514305115, - "z": "5c37638f.99fd6c", + "x": 1063.5, + "y": 1165.5312900543213, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "e435a42b.3afe08", + "id": "c63c4b12.9b5788", "type": "comment", "name": "get allotted resource for the allotted resource ID", "info": "", "comments": "", - "x": 2324.504234313965, - "y": 741.5311732292175, - "z": "5c37638f.99fd6c", + "x": 2302.500328063965, + "y": 733.5311741828918, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "1438e6b6.ccead9", + "id": "830c94e.1851168", "type": "comment", "name": "get parent service data to get connectivity which has connectivity and vpn ID", "info": "", "comments": "", - "x": 2107.503761291504, - "y": 968.5312509536743, - "z": "5c37638f.99fd6c", + "x": 2085.499855041504, + "y": 960.5312519073486, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "32a9e203.7d629e", + "id": "3044102e.74314", "type": "comment", "name": "get service data from service instance id from allotted reosurce Id to get sites vnf", "info": "", "comments": "", - "x": 2296.503761291504, - "y": 1450.5310506820679, - "z": "5c37638f.99fd6c", + "x": 2274.499855041504, + "y": 1442.5310516357422, + "z": "36b7dca4.321614", "wires": [] }, { - "id": "5b38ce7d.8512a", + "id": "ce4d5b8.f77d2a8", "type": "call", "name": "call sdwan-vnf-topology-operation-underlay for delete", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 731.5040283203125, - "y": 1109.531298160553, - "z": "5c37638f.99fd6c", + "x": 824.5001182556152, + "y": 1629.531358718872, + "z": "36b7dca4.321614", "wires": [ [] ] }, { - "id": "f8b5c142.e5e42", + "id": "dfe3d1ff.2a521", "type": "set", "name": "Add site attachement to list and update length", "xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 2546.2539978027344, - "y": 2001.2539825439453, - "z": "5c37638f.99fd6c", + "x": 2524.2500915527344, + "y": 1993.2539834976196, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "217830b4.c0fbe", + "type": "execute", + "name": "execute RestApiCallNode Get token", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", + "comments": "", + "outputs": 1, + "x": 798.0000381469727, + "y": 1392.0001511573792, + "z": "36b7dca4.321614", + "wires": [ + [ + "96b3b1d6.6853f", + "1031f4ad.8e47bb" + ] + ] + }, + { + "id": "96b3b1d6.6853f", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 1050.0001640319824, + "y": 1372.9999690055847, + "z": "36b7dca4.321614", + "wires": [ + [ + "8b0a89e.ac4be78" + ] + ] + }, + { + "id": "8b0a89e.ac4be78", + "type": "set", + "name": "set token-id", + "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", + "comments": "", + "x": 1199.0001640319824, + "y": 1371.9999384880066, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "736e51fc.b11ae", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1190.0001907348633, + "y": 1406.3932137489319, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "1031f4ad.8e47bb", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1042.2501983642578, + "y": 1408.6430916786194, + "z": "36b7dca4.321614", + "wires": [ + [ + "736e51fc.b11ae" + ] + ] + }, + { + "id": "ddc38088.8a3fe", + "type": "get-resource", + "name": "get-resource service-subscription", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type \n AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'\n force=\"true\" pfx=\"tmp.AnAI-data-tenant\"> ", + "comments": "", + "outputs": 1, + "x": 788.8955078125, + "y": 1504.5620493888855, + "z": "36b7dca4.321614", + "wires": [ + [ + "7ac360ff.5d939", + "31a85191.f2ba9e" + ] + ] + }, + { + "id": "4044e726.54dc28", + "type": "execute", + "name": "execute RestApiCallNode Create tenant auth", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 826.3955688476562, + "y": 1571.4548954963684, + "z": "36b7dca4.321614", + "wires": [ + [] + ] + }, + { + "id": "31a85191.f2ba9e", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 993.0739593505859, + "y": 1529.5224194526672, + "z": "36b7dca4.321614", + "wires": [ + [ + "78002f69.6a616" + ] + ] + }, + { + "id": "7ac360ff.5d939", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 999.3953704833984, + "y": 1477.3081078529358, + "z": "36b7dca4.321614", + "wires": [ + [ + "267dc5cf.01d6aa" + ] + ] + }, + { + "id": "78002f69.6a616", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1145.823959350586, + "y": 1529.2724804878235, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "267dc5cf.01d6aa", + "type": "switchNode", + "name": "switch temp-ub-sub-account-id", + "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n", + "comments": "", + "outputs": 1, + "x": 1200.8955993652344, + "y": 1469.3121304512024, + "z": "36b7dca4.321614", + "wires": [ + [ + "b4bcdfc8.e4aa9", + "8620a0c4.6231" + ] + ] + }, + { + "id": "8620a0c4.6231", + "type": "outcome", + "name": "NULL", + "xml": "<outcome value=''>", + "comments": "", + "outputs": 1, + "x": 1434.00390625, + "y": 1428.0039439201355, + "z": "36b7dca4.321614", + "wires": [ + [ + "3c0adb4c.ddc524" + ] + ] + }, + { + "id": "b4bcdfc8.e4aa9", + "type": "other", + "name": "Other", + "xml": "<outcome value='Other'>", + "comments": "", + "outputs": 1, + "x": 1387.2894859313965, + "y": 1522.0040221214294, + "z": "36b7dca4.321614", + "wires": [ + [ + "89d850bf.fd785" + ] + ] + }, + { + "id": "89d850bf.fd785", + "type": "set", + "name": "set prop.tenant-id", + "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n", + "comments": "", + "x": 1556.1466674804688, + "y": 1520.111035823822, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "3c0adb4c.ddc524", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1546.4322319030762, + "y": 1472.8253083229065, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "67ff0ce7.080b74", + "type": "for", + "name": "for ntidx.. mdsal-psd.service-data.networks.network_length[]", + "xml": "<for index='ntidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n", + "comments": "", + "outputs": 1, + "x": 752.03125, + "y": 898.03125, + "z": "36b7dca4.321614", + "wires": [ + [ + "fd716ada.4b1c28" + ] + ] + }, + { + "id": "134d81a7.f5395e", + "type": "block", + "name": "block atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1883.0312728881836, + "y": 1319.0312900543213, + "z": "36b7dca4.321614", + "wires": [ + [ + "bce6e7ae.f035f8" + ] + ] + }, + { + "id": "fd716ada.4b1c28", + "type": "block", + "name": "block atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 716.03125, + "y": 970.03125, + "z": "36b7dca4.321614", + "wires": [ + [ + "f4a48bf3.c3a368" + ] + ] + }, + { + "id": "f4a48bf3.c3a368", + "type": "switchNode", + "name": "switch ActivateSDWANConnectivityInstance", + "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n \n \n\n", + "comments": "", + "outputs": 1, + "x": 991.9797973632812, + "y": 971.9958744049072, + "z": "36b7dca4.321614", + "wires": [ + [ + "f6cd9004.4ba44" + ] + ] + }, + { + "id": "f6cd9004.4ba44", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1248.979290008545, + "y": 970.9960045814514, + "z": "36b7dca4.321614", + "wires": [ + [ + "eb687439.718738" + ] + ] + }, + { + "id": "eb687439.718738", + "type": "block", + "name": "block atmoic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 708.3299407958984, + "y": 1067.6630554199219, + "z": "36b7dca4.321614", + "wires": [ + [ + "e1ac1018.71d85" + ] + ] + }, + { + "id": "e1ac1018.71d85", + "type": "for", + "name": "for loop paramidx - Get topology from servicedata", + "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param_length`\">\n \n \n", + "comments": "", + "outputs": 1, + "x": 987.9800415039062, + "y": 1056.995677947998, + "z": "36b7dca4.321614", + "wires": [ + [ + "512abcd4.05e604" + ] + ] + }, + { + "id": "512abcd4.05e604", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1185.9796714782715, + "y": 1109.996166229248, + "z": "36b7dca4.321614", + "wires": [ + [ + "3dd20169.7a4b1e", + "5ac591b5.a102a", + "2a45587b.540128" + ] + ] + }, + { + "id": "5ac591b5.a102a", + "type": "switchNode", + "name": "switch vpnId", + "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n\n", + "comments": "", + "outputs": 1, + "x": 1335.6458187103271, + "y": 1124.3284702301025, + "z": "36b7dca4.321614", + "wires": [ + [ + "a59aadb.7fc765" + ] + ] + }, + { + "id": "3dd20169.7a4b1e", + "type": "switchNode", + "name": "switch topology", + "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n", + "comments": "", + "outputs": 1, + "x": 1343.980094909668, + "y": 1081.995488166809, + "z": "36b7dca4.321614", + "wires": [ + [ + "ed3b57c2.963288" + ] + ] + }, + { + "id": "a59aadb.7fc765", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1487.645809173584, + "y": 1126.3285007476807, + "z": "36b7dca4.321614", + "wires": [ + [ + "9a98c08c.190ca" + ] + ] + }, + { + "id": "ed3b57c2.963288", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1495.9800853729248, + "y": 1083.9955186843872, + "z": "36b7dca4.321614", + "wires": [ + [ + "30eaf968.c9a7c6" + ] + ] + }, + { + "id": "30eaf968.c9a7c6", + "type": "set", + "name": "set topology", + "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", + "comments": "", + "x": 1580.9800987243652, + "y": 1021.59543800354, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "9a98c08c.190ca", + "type": "set", + "name": "set prop.vpn1Id", + "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", + "comments": "", + "x": 1635.6458740234375, + "y": 1115.928415298462, + "z": "36b7dca4.321614", + "wires": [] + }, + { + "id": "2a45587b.540128", + "type": "switchNode", + "name": "switch vpn name", + "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'name'`\">\n", + "comments": "", + "outputs": 1, + "x": 1307.0312728881836, + "y": 1040.0312776565552, + "z": "36b7dca4.321614", + "wires": [ + [ + "94f1ab0.72fe658" + ] + ] + }, + { + "id": "94f1ab0.72fe658", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1417.0312767028809, + "y": 984.031247138977, + "z": "36b7dca4.321614", + "wires": [ + [ + "4b5a252a.c365bc" + ] + ] + }, + { + "id": "4b5a252a.c365bc", + "type": "set", + "name": "set vpn name", + "xml": "<set>\n<parameter name='prop.name' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", + "comments": "", + "x": 1538.0312767028809, + "y": 949.6312837600708, + "z": "36b7dca4.321614", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json index b8ba3cda..49ba9cfe 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json @@ -1,20 +1,20 @@ [ { - "id": "9ff5a59d.ba1e08", + "id": "de2bb8e4.c4dbd8", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 90.00390625, - "y": 49.999999046325684, - "z": "3cf3c3f6.8ecf4c", + "x": 89, + "y": 38, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "2a13d7f0.0d4348" + "4df3844d.66920c" ] ] }, { - "id": "2a13d7f0.0d4348", + "id": "4df3844d.66920c", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,914 +22,918 @@ "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": 302.00391006469727, - "y": 122.00001621246338, - "z": "3cf3c3f6.8ecf4c", + "x": 301.00000381469727, + "y": 110.0000171661377, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "a747a1bc.5a7f6" + "defa06c2.08a958" ] ] }, { - "id": "a747a1bc.5a7f6", + "id": "defa06c2.08a958", "type": "method", "name": "sdwan-attachment-topology-operation-delete", "xml": "<method rpc='sdwan-attachment-topology-operation-delete' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 290.0040283203125, - "y": 209.99999904632568, - "z": "3cf3c3f6.8ecf4c", + "x": 289.0001220703125, + "y": 198, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "c8f19e0f.8c32c" + "6f0fe5c1.42509c" ] ] }, { - "id": "c8f19e0f.8c32c", + "id": "6f0fe5c1.42509c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 306.0040283203125, - "y": 765.0002436637878, - "z": "3cf3c3f6.8ecf4c", + "x": 305.0001220703125, + "y": 753.0002446174622, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "ac139f07.afe46", - "d564f17f.3cd7c", - "b24304d4.852188", - "81139b91.d72eb8", - "da5a8374.7ecac", - "72df0cf3.25ba74", - "b5ddcb9b.3d0b08", - "7e7d6803.801908", - "97410a5a.3537b8", - "d656e279.64fe3", - "be0fff75.07c73", - "38ea07fe.9ae708", - "9639b1d0.6aa4d", - "5ded2c1d.2cf294" + "d4b618b3.e243f8", + "daa2fd1c.e15f9", + "98a0548f.d105b8", + "4086ba28.5e7fb4", + "3a054970.ddb4f6", + "6a9e6940.dc60c8", + "1dcc043a.41212c", + "cfbf99ba.e9ea08", + "a788afc2.3b764", + "9bec45ba.823fc8", + "295f039a.2c737c", + "2676412c.7c20ee", + "8b527b2a.81e648", + "e2838697.661268", + "d9f8d014.bcccd" ] ] }, { - "id": "ac139f07.afe46", + "id": "d4b618b3.e243f8", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 702.9974670410156, - "y": 163.9934859275818, - "z": "3cf3c3f6.8ecf4c", + "x": 701.9935607910156, + "y": 151.9934868812561, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "c1a22f40.b7f8d", + "id": "2548027c.9fde3e", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 731.9577789306641, - "y": 128.02528190612793, - "z": "3cf3c3f6.8ecf4c", + "x": 730.9538726806641, + "y": 116.02528285980225, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "d564f17f.3cd7c", + "id": "daa2fd1c.e15f9", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 656.9974060058594, - "y": 256.9934911727905, - "z": "3cf3c3f6.8ecf4c", + "x": 655.9934997558594, + "y": 244.99349212646484, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "da5a8374.7ecac", + "id": "3a054970.ddb4f6", "type": "execute", "name": "execute Properties", "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": 663.2592964172363, - "y": 344.6602201461792, - "z": "3cf3c3f6.8ecf4c", + "x": 662.2553901672363, + "y": 332.6602210998535, + "z": "5256b6fe.7fc0a8", "wires": [ [] ] }, { - "id": "b24304d4.852188", + "id": "98a0548f.d105b8", "type": "execute", "name": "generate allotted-resource url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 695.2593231201172, - "y": 432.66020154953003, - "z": "3cf3c3f6.8ecf4c", + "x": 694.2554168701172, + "y": 420.66020250320435, + "z": "5256b6fe.7fc0a8", "wires": [ [] ] }, { - "id": "595e5ef1.fa051", + "id": "7276eff0.df0a8", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 710.9974365234375, - "y": 223.9935007095337, - "z": "3cf3c3f6.8ecf4c", + "x": 709.9935302734375, + "y": 211.993501663208, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "6c854173.f4bc7", + "id": "e3eaa523.b8fec8", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 728.9974021911621, - "y": 309.882381439209, - "z": "3cf3c3f6.8ecf4c", + "x": 727.9934959411621, + "y": 297.8823823928833, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "e788822e.3722e", + "id": "94cc654b.383a58", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 754.9974212646484, - "y": 396.8823404312134, - "z": "3cf3c3f6.8ecf4c", + "x": 753.9935150146484, + "y": 384.8823413848877, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "dff7fd40.e0f0c", + "id": "860c0bbd.079788", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 822.0042343139648, - "y": 851.5316219329834, - "z": "3cf3c3f6.8ecf4c", + "x": 821.0003280639648, + "y": 839.5316228866577, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "5cba16bf.c97498", + "id": "1bc8c1a0.e4996e", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1650.1888427734375, - "y": 1085.0042576789856, - "z": "3cf3c3f6.8ecf4c", + "x": 1649.1849365234375, + "y": 1073.00425863266, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "72856d05.385d64" + "389840a4.f6186" ] ] }, { - "id": "81139b91.d72eb8", + "id": "4086ba28.5e7fb4", "type": "switchNode", "name": "switch mdsal-psd.service-data.provided-allotted-resources_length", "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 801.1882019042969, - "y": 1091.7180404663086, - "z": "3cf3c3f6.8ecf4c", + "x": 800.1842956542969, + "y": 1079.718041419983, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "e3d57198.c43ea", - "2011daa6.6398e6" + "6019a57.13f705c", + "4a21aa00.3b1ac8" ] ] }, { - "id": "73a8d368.4b79bc", + "id": "30a78dd9.3c8b22", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1251.4583644866943, - "y": 1131.7015261650085, - "z": "3cf3c3f6.8ecf4c", + "x": 1250.4544582366943, + "y": 1119.7015271186829, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "5cba16bf.c97498", - "4ca0ceba.893a2" + "1bc8c1a0.e4996e", + "e9fadefb.0c149" ] ] }, { - "id": "72856d05.385d64", + "id": "389840a4.f6186", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2100.300048828125, - "y": 1083.0041155815125, - "z": "3cf3c3f6.8ecf4c", + "x": 2099.296142578125, + "y": 1071.0041165351868, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "f2234386.9854c" + "87f0a9d.62cd658" ] ] }, { - "id": "72df0cf3.25ba74", + "id": "6a9e6940.dc60c8", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 712.9726181030273, - "y": 887.0000667572021, - "z": "3cf3c3f6.8ecf4c", + "x": 711.9687118530273, + "y": 875.0000677108765, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "32223174.f7450e", + "id": "9c6dc3c.897554", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1092.972900390625, - "y": 965.0001816749573, - "z": "3cf3c3f6.8ecf4c", + "x": 1091.968994140625, + "y": 953.0001826286316, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "c45c28d6.ff3cc8" + "1e4f6a7c.485c96" ] ] }, { - "id": "e0a303bb.2dc06", + "id": "f96c62b7.b194", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1084.8247032165527, - "y": 1000.0662665367126, - "z": "3cf3c3f6.8ecf4c", + "x": 1083.8207969665527, + "y": 988.066267490387, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "3e0bcadf.484fe6" + "ecfe720a.b902e" ] ] }, { - "id": "3e0bcadf.484fe6", + "id": "ecfe720a.b902e", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1259.973388671875, - "y": 996.333616733551, - "z": "3cf3c3f6.8ecf4c", + "x": 1258.969482421875, + "y": 984.3336176872253, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "c45c28d6.ff3cc8", + "id": "1e4f6a7c.485c96", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1243.972900390625, - "y": 963.0001816749573, - "z": "3cf3c3f6.8ecf4c", + "x": 1242.968994140625, + "y": 951.0001826286316, + "z": "5256b6fe.7fc0a8", "wires": [ [] ] }, { - "id": "ebfdd448.549cc8", + "id": "5fa2362a.75f678", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 946.7346687316895, - "y": 1280.9528144598007, - "z": "3cf3c3f6.8ecf4c", + "x": 945.7307624816895, + "y": 1268.952815413475, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "65c46af.7320594" + "3cb41c0b.eae2b4" ] ] }, { - "id": "65c46af.7320594", + "id": "3cb41c0b.eae2b4", "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=\"AAI failed\" />\n", "comments": "", - "x": 1113.2585487365723, - "y": 1292.5718854665756, - "z": "3cf3c3f6.8ecf4c", + "x": 1112.2546424865723, + "y": 1280.57188642025, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "4d049da0.ca99b4", + "id": "144dae97.c82161", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 953.8299560546875, - "y": 1313.7147821187973, - "z": "3cf3c3f6.8ecf4c", + "x": 952.8260498046875, + "y": 1301.7147830724716, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "65c46af.7320594" + "3cb41c0b.eae2b4" ] ] }, { - "id": "36f9e028.ff6b9", + "id": "2d8a7679.e4417a", "type": "comment", "name": "TODO: Rework after confirmation from AAI", "info": "", "comments": "", - "x": 1078.1413345336914, - "y": 1231.8732142448425, - "z": "3cf3c3f6.8ecf4c", + "x": 1077.1374282836914, + "y": 1219.8732151985168, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "b5ddcb9b.3d0b08", + "id": "1dcc043a.41212c", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 679.5500564575195, - "y": 1244.8276815414429, - "z": "3cf3c3f6.8ecf4c", + "x": 678.5461502075195, + "y": 1232.8276824951172, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "7e7d6803.801908", + "id": "cfbf99ba.e9ea08", "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": 648.9631729125977, - "y": 1351.443561553955, - "z": "3cf3c3f6.8ecf4c", + "x": 647.9592666625977, + "y": 1339.4435625076294, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "97410a5a.3537b8", + "id": "a788afc2.3b764", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='Delete' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 728.6705703735352, - "y": 521.3333616256714, - "z": "3cf3c3f6.8ecf4c", + "x": 727.6666641235352, + "y": 509.3333625793457, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "1994f5fd.2a6f4a", - "da3ffcab.ea62a", - "e404bf43.f1066" + "694caf54.7b798", + "ae592dd1.c9cc1", + "f4c65729.068fc8" ] ] }, { - "id": "1994f5fd.2a6f4a", + "id": "694caf54.7b798", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 968.3120727539062, - "y": 561.6649098396301, - "z": "3cf3c3f6.8ecf4c", + "x": 967.3081665039062, + "y": 549.6649107933044, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "e45dc5dc.4ac748" + "cccfb0fc.4d54b" ] ] }, { - "id": "da3ffcab.ea62a", + "id": "ae592dd1.c9cc1", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 965.3120727539062, - "y": 518.1649074554443, - "z": "3cf3c3f6.8ecf4c", + "x": 964.3081665039062, + "y": 506.16490840911865, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "e45dc5dc.4ac748" + "cccfb0fc.4d54b" ] ] }, { - "id": "e404bf43.f1066", + "id": "f4c65729.068fc8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 972.0621528625488, - "y": 477.52200269699097, - "z": "3cf3c3f6.8ecf4c", + "x": 971.0582466125488, + "y": 465.5220036506653, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "6706c73a.4ce818" + "f5848024.451b6" ] ] }, { - "id": "e45dc5dc.4ac748", + "id": "cccfb0fc.4d54b", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1124.062240600586, - "y": 539.9149079322815, - "z": "3cf3c3f6.8ecf4c", + "x": 1123.058334350586, + "y": 527.9149088859558, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "6706c73a.4ce818", + "id": "f5848024.451b6", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1109.7180843353271, - "y": 477.7141823768616, - "z": "3cf3c3f6.8ecf4c", + "x": 1108.7141780853271, + "y": 465.7141833305359, + "z": "5256b6fe.7fc0a8", "wires": [ [] ] }, { - "id": "61ea2842.341858", + "id": "ace0db7.0de1828", "type": "comment", "name": "Delete Allotted Resource", "info": "", "comments": "", - "x": 676.0039520263672, - "y": 490.0000276565552, - "z": "3cf3c3f6.8ecf4c", + "x": 675.0000457763672, + "y": 478.0000286102295, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "6dbcd93.5772b28", + "id": "8845d317.b4499", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1626.0078125, - "y": 727.0039052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 1625.00390625, + "y": 715.00390625, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "8604274a.795a98" + "f7e8e6c4.e21498" ] ] }, { - "id": "d656e279.64fe3", + "id": "9bec45ba.823fc8", "type": "switchNode", "name": "switch service-data.consumed-allotted-resources_length", "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 779.0071983337402, - "y": 687.7179067134857, - "z": "3cf3c3f6.8ecf4c", + "x": 778.0032920837402, + "y": 675.71790766716, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "e4f37d32.adb08", - "b232603b.f0d15" + "105cf808.d9fc58", + "5f964ad4.a47694" ] ] }, { - "id": "e4f37d32.adb08", + "id": "105cf808.d9fc58", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1103.1500625610352, - "y": 670.5753412246704, - "z": "3cf3c3f6.8ecf4c", + "x": 1102.1461563110352, + "y": 658.5753421783447, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "157affe5.dc6c6" + "c721eaa0.d90778" ] ] }, { - "id": "b232603b.f0d15", + "id": "5f964ad4.a47694", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1089.1500854492188, - "y": 733.5753300189972, - "z": "3cf3c3f6.8ecf4c", + "x": 1088.1461791992188, + "y": 721.5753309726715, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "a3ecd1d6.43a2e" + "d487336b.5c21" ] ] }, { - "id": "a3ecd1d6.43a2e", + "id": "d487336b.5c21", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1249.2771759033203, - "y": 731.7013065814972, - "z": "3cf3c3f6.8ecf4c", + "x": 1248.2732696533203, + "y": 719.7013075351715, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "6dbcd93.5772b28", - "9971417.dd05cc" + "8845d317.b4499", + "2a5719f4.0daa06" ] ] }, { - "id": "be0fff75.07c73", + "id": "295f039a.2c737c", "type": "set", "name": "set consumed allotted resources for deletion", "xml": "<set>\n<parameter name=\"service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].\" value=\"\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n", "comments": "", - "x": 735.8645324707031, - "y": 758.2895498275757, - "z": "3cf3c3f6.8ecf4c", + "x": 734.8606262207031, + "y": 746.28955078125, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "8604274a.795a98", + "id": "f7e8e6c4.e21498", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2064.1194229125977, - "y": 723.0040273666382, - "z": "3cf3c3f6.8ecf4c", + "x": 2063.1155166625977, + "y": 711.0040283203125, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "3ce4b91e.bc1ea6" + "129a19f.57049e6" ] ] }, { - "id": "3ce4b91e.bc1ea6", + "id": "129a19f.57049e6", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2259.929244995117, - "y": 722.4683518409729, - "z": "3cf3c3f6.8ecf4c", + "x": 2258.925338745117, + "y": 710.4683527946472, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "bfbb9b9d.413298" + "e64da982.d670b8" ] ] }, { - "id": "5d4138bb.2e6948", + "id": "a61544d0.afeca8", "type": "set", "name": "set tmp.cidx", "xml": "<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n", "comments": "", - "x": 2575.2657775878906, - "y": 723.2246098518372, - "z": "3cf3c3f6.8ecf4c", + "x": 2574.2618713378906, + "y": 711.2246108055115, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "80fa82c1.032f3", + "id": "77efab9.9957c54", "type": "comment", "name": "Delete consumed service consumed-allotted-resources in mdsal", "info": "", "comments": "", - "x": 790.0084686279297, - "y": 620.003871455905, - "z": "3cf3c3f6.8ecf4c", + "x": 789.0045623779297, + "y": 608.0038724095793, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "b69750ea.d13e7", + "id": "78d83bc7.d44d54", "type": "comment", "name": "This set resource will be deleted in MDSAL by provider code", "info": "", "comments": "", - "x": 780.341251373291, - "y": 724.7819633483887, - "z": "3cf3c3f6.8ecf4c", + "x": 779.337345123291, + "y": 712.781964302063, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "24feb42b.2816cc", + "id": "a9f71f74.85a1", "type": "comment", "name": "Obtain the index of conusumed AR", "info": "", "comments": "", - "x": 702.7856597900391, - "y": 651.8927316665649, - "z": "3cf3c3f6.8ecf4c", + "x": 701.7817535400391, + "y": 639.8927326202393, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "157affe5.dc6c6", + "id": "c721eaa0.d90778", "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n", "comments": "", - "x": 1265.0078125, - "y": 671.0039052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 1264.00390625, + "y": 659.00390625, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "bfbb9b9d.413298", + "id": "e64da982.d670b8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2409.007843017578, - "y": 723.2539548873901, - "z": "3cf3c3f6.8ecf4c", + "x": 2408.003936767578, + "y": 711.2539558410645, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "5d4138bb.2e6948" + "a61544d0.afeca8" ] ] }, { - "id": "f597fe60.1abe5", + "id": "15284a02.c01676", "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=\"resource to be deleted is not available in mdsal\" />\n", "comments": "", - "x": 1719.2578125, - "y": 780.2539052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 1718.25390625, + "y": 768.25390625, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "15fa064d.455b2a", + "id": "3056effb.bf63e", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1581.7578125, - "y": 780.2539052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 1580.75390625, + "y": 768.25390625, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "f597fe60.1abe5" + "15284a02.c01676" ] ] }, { - "id": "9971417.dd05cc", + "id": "2a5719f4.0daa06", "type": "switchNode", "name": "switch tmp.cidx ", "xml": "<switch test=\"`$tmp.cidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1427.7578125, - "y": 780.2539052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 1426.75390625, + "y": 768.25390625, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "15fa064d.455b2a" + "3056effb.bf63e" ] ] }, { - "id": "78b32310.b31e1c", + "id": "7516e2f4.527d0c", "type": "comment", "name": "Delete provided service provided-allotted-resources in mdsal", "info": "", "comments": "", - "x": 776.5078277587891, - "y": 816.0039052963257, - "z": "3cf3c3f6.8ecf4c", + "x": 775.5039215087891, + "y": 804.00390625, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "2011daa6.6398e6", + "id": "4a21aa00.3b1ac8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1104.5080833435059, - "y": 1130.7540974617004, - "z": "3cf3c3f6.8ecf4c", + "x": 1103.5041770935059, + "y": 1118.7540984153748, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "73a8d368.4b79bc" + "30a78dd9.3c8b22" ] ] }, { - "id": "e3d57198.c43ea", + "id": "6019a57.13f705c", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1121.5080032348633, - "y": 1042.7539315223694, - "z": "3cf3c3f6.8ecf4c", + "x": 1120.5040969848633, + "y": 1030.7539324760437, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "e0cbd03d.fef77" + "949446a8.12d2b8" ] ] }, { - "id": "e0cbd03d.fef77", + "id": "949446a8.12d2b8", "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n", "comments": "", - "x": 1285.3656005859375, - "y": 1043.1824765205383, - "z": "3cf3c3f6.8ecf4c", + "x": 1284.3616943359375, + "y": 1031.1824774742126, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "8152d4f5.017ee8", + "id": "f670e307.a2a7a", "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=\"resource to be deleted is not available in mdsal\" />\n", "comments": "", - "x": 1716.7578563690186, - "y": 1160.7539353370667, - "z": "3cf3c3f6.8ecf4c", + "x": 1715.7539501190186, + "y": 1148.753936290741, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "9af42612.9cc9e8", + "id": "66a217ce.0565f8", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1579.2578563690186, - "y": 1160.7539353370667, - "z": "3cf3c3f6.8ecf4c", + "x": 1578.2539501190186, + "y": 1148.753936290741, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "8152d4f5.017ee8" + "f670e307.a2a7a" ] ] }, { - "id": "4ca0ceba.893a2", + "id": "e9fadefb.0c149", "type": "switchNode", "name": "switch tmp.pidx ", "xml": "<switch test=\"`$tmp.pidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1425.2578563690186, - "y": 1160.7539353370667, - "z": "3cf3c3f6.8ecf4c", + "x": 1424.2539501190186, + "y": 1148.753936290741, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "9af42612.9cc9e8" + "66a217ce.0565f8" ] ] }, { - "id": "f2234386.9854c", + "id": "87f0a9d.62cd658", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2289.508274078369, - "y": 1080.7540936470032, - "z": "3cf3c3f6.8ecf4c", + "x": 2288.504367828369, + "y": 1068.7540946006775, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "8c3b4c6c.f6375" + "9a3770db.667c5" ] ] }, { - "id": "51d5026c.5bd4fc", + "id": "30ce9227.a6174e", "type": "set", "name": "set tmp.pidx", "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n", "comments": "", - "x": 2357.8443908691406, - "y": 1215.510190486908, - "z": "3cf3c3f6.8ecf4c", + "x": 2356.8404846191406, + "y": 1203.5101914405823, + "z": "5256b6fe.7fc0a8", "wires": [] }, { - "id": "8c3b4c6c.f6375", + "id": "9a3770db.667c5", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2349.586727142334, - "y": 1151.5395798683167, - "z": "3cf3c3f6.8ecf4c", + "x": 2348.582820892334, + "y": 1139.539580821991, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "51d5026c.5bd4fc" + "30ce9227.a6174e" ] ] }, { - "id": "38ea07fe.9ae708", - "type": "set", - "name": "set provided allotted resources for deletion", - "xml": "<set>\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource[$pidx].\" value=\"\" />\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource_length\" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n", - "comments": "", - "x": 735.0079040527344, - "y": 1146.003975868225, - "z": "3cf3c3f6.8ecf4c", - "wires": [] - }, - { - "id": "a01da430.f51578", + "id": "d9f8d014.bcccd", "type": "update", "name": "update AAI allotted-resource", "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource' \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n", "comments": "", "outputs": 1, - "x": 692.2266616821289, - "y": 1300.7543454170227, - "z": "3cf3c3f6.8ecf4c", + "x": 691.2227554321289, + "y": 1288.754346370697, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "ebfdd448.549cc8", - "4d049da0.ca99b4" + "5fa2362a.75f678", + "144dae97.c82161" ] ] }, { - "id": "5ded2c1d.2cf294", + "id": "8b527b2a.81e648", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 782.3373260498047, - "y": 986.3333654403687, - "z": "3cf3c3f6.8ecf4c", + "x": 781.3334197998047, + "y": 974.333366394043, + "z": "5256b6fe.7fc0a8", "wires": [ [ - "32223174.f7450e", - "e0a303bb.2dc06" + "9c6dc3c.897554", + "f96c62b7.b194" ] ] }, { - "id": "9639b1d0.6aa4d", + "id": "2676412c.7c20ee", "type": "execute", "name": "get parent-service-data tmp.ar-url-psd", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>", "comments": "", "outputs": 1, - "x": 716.3372650146484, - "y": 944.3332047462463, - "z": "3cf3c3f6.8ecf4c", + "x": 715.3333587646484, + "y": 932.3332056999207, + "z": "5256b6fe.7fc0a8", + "wires": [ + [] + ] + }, + { + "id": "e2838697.661268", + "type": "execute", + "name": "execute RestApiCallNode - delete-resource parent service data", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd-delete\" />\n\n", + "comments": "", + "outputs": 1, + "x": 797.00390625, + "y": 1179.00390625, + "z": "5256b6fe.7fc0a8", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json new file mode 100644 index 00000000..dffd3096 --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json @@ -0,0 +1,212 @@ +[ + { + "id": "30fe9468.76f32c", + "type": "get-resource", + "name": "get-resource service-subscription", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type \n AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id'\n force=\"true\" pfx=\"tmp.AnAI-data-tenant\">\n \n", + "comments": "", + "outputs": 1, + "x": 632.8652648925781, + "y": 374.2938051223755, + "z": "97aa802d.404bc", + "wires": [ + [ + "a889eb39.2fcd08", + "483504b1.ecba4c" + ] + ] + }, + { + "id": "516f9f53.00463", + "type": "switchNode", + "name": "switch temp-ub-sub-account-id", + "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n", + "comments": "", + "outputs": 1, + "x": 1044.8653564453125, + "y": 339.0438861846924, + "z": "97aa802d.404bc", + "wires": [ + [ + "f1e993a3.ae05f", + "6af3c030.9694c" + ] + ] + }, + { + "id": "f1e993a3.ae05f", + "type": "outcome", + "name": "NULL", + "xml": "<outcome value=''>", + "comments": "", + "outputs": 1, + "x": 1237.5798072814941, + "y": 313.043927192688, + "z": "97aa802d.404bc", + "wires": [ + [ + "be0f95e9.861918" + ] + ] + }, + { + "id": "6af3c030.9694c", + "type": "other", + "name": "Other", + "xml": "<outcome value='Other'>", + "comments": "", + "outputs": 1, + "x": 1237.8653717041016, + "y": 368.04388999938965, + "z": "97aa802d.404bc", + "wires": [ + [ + "3bf7a2b9.96247e" + ] + ] + }, + { + "id": "a889eb39.2fcd08", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 843.3651275634766, + "y": 347.0398635864258, + "z": "97aa802d.404bc", + "wires": [ + [ + "516f9f53.00463" + ] + ] + }, + { + "id": "483504b1.ecba4c", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 837.0437164306641, + "y": 399.2541751861572, + "z": "97aa802d.404bc", + "wires": [ + [ + "212060fe.4fc32" + ] + ] + }, + { + "id": "212060fe.4fc32", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 989.7937164306641, + "y": 399.0042362213135, + "z": "97aa802d.404bc", + "wires": [] + }, + { + "id": "b6a8c3c7.8bc03", + "type": "service-logic", + "name": "GENERIC-RESOURCE-API ${project.version}", + "module": "GENERIC-RESOURCE-API", + "version": "${project.version}", + "comments": "", + "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>", + "outputs": 1, + "x": 212.86526489257812, + "y": 101.43669128417969, + "z": "97aa802d.404bc", + "wires": [ + [ + "68fe5032.b2685" + ] + ] + }, + { + "id": "f788aa3b.dab3e8", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 133.57955932617188, + "y": 39.19858169555664, + "z": "97aa802d.404bc", + "wires": [ + [ + "b6a8c3c7.8bc03" + ] + ] + }, + { + "id": "672a5bc8.7ace04", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 366.81766510009766, + "y": 338.0081157684326, + "z": "97aa802d.404bc", + "wires": [ + [ + "30fe9468.76f32c", + "ef87bbc7.0bf428" + ] + ] + }, + { + "id": "68fe5032.b2685", + "type": "method", + "name": "method sdwan-get-tenant-auth", + "xml": "<method rpc='sdwan-get-tenant-auth' mode='sync'>\n", + "comments": "", + "outputs": 1, + "x": 224.57955932617188, + "y": 195.7849235534668, + "z": "97aa802d.404bc", + "wires": [ + [ + "672a5bc8.7ace04" + ] + ] + }, + { + "id": "3bf7a2b9.96247e", + "type": "set", + "name": "set prop.tenant-id", + "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n", + "comments": "", + "x": 1415.7224426269531, + "y": 367.15094566345215, + "z": "97aa802d.404bc", + "wires": [] + }, + { + "id": "ef87bbc7.0bf428", + "type": "execute", + "name": "execute RestApiCallNode Create tenant auth", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 660.3652954101562, + "y": 477.1866149902344, + "z": "97aa802d.404bc", + "wires": [ + [] + ] + }, + { + "id": "be0f95e9.861918", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1420.0080490112305, + "y": 312.86523628234863, + "z": "97aa802d.404bc", + "wires": [] + } +] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json index 7bba81aa..1435c7cf 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json @@ -1,20 +1,20 @@ [ { - "id": "65a8b91d.24abd8", + "id": "b728dcab.e2e08", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 151.00390625, - "y": 84.99999904632568, - "z": "8dba42d4.2fc58", + "x": 93, + "y": 47, + "z": "4c287bc.f107e84", "wires": [ [ - "84123a61.191508" + "f1013e83.11195" ] ] }, { - "id": "84123a61.191508", + "id": "f1013e83.11195", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,767 +22,826 @@ "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": 337.00391006469727, - "y": 157.00001621246338, - "z": "8dba42d4.2fc58", + "x": 279.00000381469727, + "y": 119.0000171661377, + "z": "4c287bc.f107e84", "wires": [ [ - "8bfdb728.fd5fb8" + "4636719f.41274" ] ] }, { - "id": "8bfdb728.fd5fb8", + "id": "4636719f.41274", "type": "method", "name": "method sdwan-network-topology-operation-activate", "xml": "<method rpc='sdwan-network-topology-operation-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 325.0040283203125, - "y": 244.99999904632568, - "z": "8dba42d4.2fc58", + "x": 267.0001220703125, + "y": 207, + "z": "4c287bc.f107e84", "wires": [ [ - "61fe5ec.24b3ea" + "c7a7aadf.8ed488" ] ] }, { - "id": "61fe5ec.24b3ea", + "id": "c7a7aadf.8ed488", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 499.00392150878906, - "y": 353.0000581741333, - "z": "8dba42d4.2fc58", + "x": 441.00001525878906, + "y": 315.0000591278076, + "z": "4c287bc.f107e84", "wires": [ [ - "1c31cf0.eb62931", - "3d6bcf7d.5c2b4", - "55b053ca.9c8fec", - "efb367a9.777348", - "faa41b3d.6507b8", - "25d677c3.3e42d8", - "eb7cc280.f6366", - "178920a9.13ec3f", - "546fc3e9.7052dc", - "dc4c0558.42daa8", - "f31fc51b.0a7188", - "2ab6006d.5b2cc", - "1a43627f.6e263e", - "204db58e.69892a", - "634732f9.1dcf5c", - "d5289859.e9ecf8" + "98d3b92f.70fc48", + "189da6d2.5a6819", + "e988ff0f.b5aae", + "e4aad21c.e7ff7", + "39e02c84.3177e4", + "b96459be.6fd7a8", + "747d96dd.f43d58", + "39860903.53b456", + "69af4cc7.202f04", + "bc16f27b.ec50b", + "29cb6e2b.ecafd2", + "f71b9190.340d8", + "3eb35468.4702ac", + "d3877bd.f214188", + "73dbb3c3.f1d1fc", + "9bf6657f.dd37a8" ] ] }, { - "id": "1c31cf0.eb62931", + "id": "98d3b92f.70fc48", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 957.3928070068359, - "y": 101.99999904632568, - "z": "8dba42d4.2fc58", + "x": 899.3889007568359, + "y": 64, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "3d6bcf7d.5c2b4", + "id": "189da6d2.5a6819", "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=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n", "comments": "", "outputs": 1, - "x": 757.5595054626465, - "y": 155.77785205841064, - "z": "8dba42d4.2fc58", + "x": 699.5555992126465, + "y": 117.77785301208496, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "55b053ca.9c8fec", + "id": "e988ff0f.b5aae", "type": "set", "name": "set networkId and network-object-path", "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` \" />", "comments": "", - "x": 844.5597839355469, - "y": 1078.3134682178497, - "z": "8dba42d4.2fc58", + "x": 786.5558776855469, + "y": 1040.313469171524, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "efb367a9.777348", + "id": "e4aad21c.e7ff7", "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": 766.3375854492188, - "y": 1267.8688881397247, - "z": "8dba42d4.2fc58", + "x": 708.3336791992188, + "y": 1229.868889093399, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "faa41b3d.6507b8", + "id": "39e02c84.3177e4", "type": "set", "name": "set network-level-oper-status", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />", "comments": "", - "x": 811.4486999511719, - "y": 1139.53564286232, - "z": "8dba42d4.2fc58", + "x": 753.4447937011719, + "y": 1101.5356438159943, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "25d677c3.3e42d8", + "id": "b96459be.6fd7a8", "type": "execute", "name": "execute Properties", "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": 789.8616104125977, - "y": 208.77788829803467, - "z": "8dba42d4.2fc58", + "x": 731.8577041625977, + "y": 170.77788925170898, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "eb7cc280.f6366", + "id": "747d96dd.f43d58", "type": "update", "name": "update SDWAN VPN status to AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />", "comments": "", "outputs": 1, - "x": 828.6674156188965, - "y": 1202.2388544082642, - "z": "8dba42d4.2fc58", + "x": 770.6635093688965, + "y": 1164.2388553619385, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "178920a9.13ec3f", + "id": "39860903.53b456", "type": "set", "name": "set network in service-data", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />", "comments": "", - "x": 805.0043144226074, - "y": 1025.0913021564484, - "z": "8dba42d4.2fc58", + "x": 747.0004081726074, + "y": 987.0913031101227, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "546fc3e9.7052dc", + "id": "69af4cc7.202f04", "type": "for", "name": "for each network-input-parameters", "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 842.00390625, - "y": 279.00390657782555, - "z": "8dba42d4.2fc58", + "x": 784, + "y": 241.00390753149986, + "z": "4c287bc.f107e84", "wires": [ [ - "7343f9f8.91aa58" + "e4f0bee4.ba4a3" ] ] }, { - "id": "7343f9f8.91aa58", + "id": "e4f0bee4.ba4a3", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1098.8373374938965, - "y": 213.33725771307945, - "z": "8dba42d4.2fc58", + "x": 1040.8334312438965, + "y": 175.33725866675377, + "z": "4c287bc.f107e84", "wires": [ [ - "8d49b6eb.aacfa8", - "75ed8e31.a1e03" + "9e11c248.9eb9d", + "9793f672.805878" ] ] }, { - "id": "8d49b6eb.aacfa8", + "id": "9e11c248.9eb9d", "type": "switchNode", "name": "switch name", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n", "comments": "", "outputs": 1, - "x": 1289.8373985290527, - "y": 209.3372901380062, - "z": "8dba42d4.2fc58", + "x": 1231.8334922790527, + "y": 171.33729109168053, + "z": "4c287bc.f107e84", "wires": [ [ - "9aed38f3.ef1268" + "8c9ad24.52d233" ] ] }, { - "id": "9aed38f3.ef1268", + "id": "8c9ad24.52d233", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1463.8375244140625, - "y": 209.33729395270348, - "z": "8dba42d4.2fc58", + "x": 1405.8336181640625, + "y": 171.3372949063778, + "z": "4c287bc.f107e84", "wires": [ [ - "f86c1bb0.83c838" + "360dce92.bcd8b2" ] ] }, { - "id": "f86c1bb0.83c838", + "id": "360dce92.bcd8b2", "type": "set", "name": "set name", "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1626.8374099731445, - "y": 208.9372886121273, - "z": "8dba42d4.2fc58", + "x": 1568.8335037231445, + "y": 170.93728956580162, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "1a43627f.6e263e", + "id": "f71b9190.340d8", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 836.00390625, - "y": 388.00390657782555, - "z": "8dba42d4.2fc58", + "x": 778, + "y": 350.00390625, + "z": "4c287bc.f107e84", "wires": [ [ - "1feb8ff6.c06a9", - "a8710737.3b8c28", - "e42763ba.ed5ab" + "35c5eced.422b74", + "5db3feca.9679c", + "84542dcd.8c846" ] ] }, { - "id": "1feb8ff6.c06a9", + "id": "35c5eced.422b74", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1081.00390625, - "y": 334.00390657782555, - "z": "8dba42d4.2fc58", + "x": 1023, + "y": 296.00390753149986, + "z": "4c287bc.f107e84", "wires": [ [ - "4a6a181d.584358" + "b858bea3.dfbd9" ] ] }, { - "id": "a8710737.3b8c28", + "id": "5db3feca.9679c", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1084.494873046875, - "y": 381.5779422223568, - "z": "8dba42d4.2fc58", + "x": 1026.490966796875, + "y": 343.5779431760311, + "z": "4c287bc.f107e84", "wires": [ [ - "e9aab137.64b04" + "ea674168.c4155" ] ] }, { - "id": "e42763ba.ed5ab", + "id": "84542dcd.8c846", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1079.827880859375, - "y": 422.91125521063805, - "z": "8dba42d4.2fc58", + "x": 1021.823974609375, + "y": 384.91125616431236, + "z": "4c287bc.f107e84", "wires": [ [ - "4b35376e.7e4788" + "95ebd94d.24be88" ] ] }, { - "id": "4a6a181d.584358", + "id": "b858bea3.dfbd9", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1278.5039672851562, - "y": 322.00390657782555, - "z": "8dba42d4.2fc58", + "x": 1220.5000610351562, + "y": 284.00390753149986, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "e9aab137.64b04", + "id": "ea674168.c4155", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1261.0662841796875, - "y": 369.86367830634117, - "z": "8dba42d4.2fc58", + "x": 1203.0623779296875, + "y": 331.8636792600155, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "4b35376e.7e4788", + "id": "95ebd94d.24be88", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1267.6004371643066, - "y": 418.35044798254967, - "z": "8dba42d4.2fc58", + "x": 1209.5965309143066, + "y": 380.350448936224, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "204db58e.69892a", + "id": "3eb35468.4702ac", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 844.00390625, - "y": 499.00390657782555, - "z": "8dba42d4.2fc58", + "x": 786, + "y": 461.00390625, + "z": "4c287bc.f107e84", "wires": [ [ - "ced0b203.a391b", - "184980af.bcb96f" + "d801cca4.51d79", + "c1258051.e7f45" ] ] }, { - "id": "ced0b203.a391b", + "id": "d801cca4.51d79", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1083.003978729248, - "y": 477.0039367675781, - "z": "8dba42d4.2fc58", + "x": 1025.000072479248, + "y": 439.00393772125244, + "z": "4c287bc.f107e84", "wires": [ [ - "17cfd49c.8c98fb" + "f717dae9.6ebf18" ] ] }, { - "id": "184980af.bcb96f", + "id": "c1258051.e7f45", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1075.253978729248, - "y": 530.6468200683594, - "z": "8dba42d4.2fc58", + "x": 1017.250072479248, + "y": 492.6468210220337, + "z": "4c287bc.f107e84", "wires": [ [ - "2ec37152.e84eee" + "d37810c8.811c7" ] ] }, { - "id": "17cfd49c.8c98fb", + "id": "f717dae9.6ebf18", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1233.00390625, - "y": 478.00390657782555, - "z": "8dba42d4.2fc58", + "x": 1175, + "y": 440.00390625, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "2ec37152.e84eee", + "id": "d37810c8.811c7", "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=\"Error executing get token rest api\" />\n", "comments": "", - "x": 1228.003978729248, - "y": 530.3968811035156, - "z": "8dba42d4.2fc58", + "x": 1170.000072479248, + "y": 492.39688205718994, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "75ed8e31.a1e03", + "id": "9793f672.805878", "type": "switchNode", "name": "switch topology", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n", "comments": "", "outputs": 1, - "x": 1288.25390625, - "y": 262.00390657782555, - "z": "8dba42d4.2fc58", + "x": 1230.25, + "y": 224.00390753149986, + "z": "4c287bc.f107e84", "wires": [ [ - "6c4b55cb.0408ec" + "cfe36c58.4801f" ] ] }, { - "id": "6c4b55cb.0408ec", + "id": "cfe36c58.4801f", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1462.2540321350098, - "y": 262.0039103925228, - "z": "8dba42d4.2fc58", + "x": 1404.2501258850098, + "y": 224.00391134619713, + "z": "4c287bc.f107e84", "wires": [ [ - "6d553f1a.6f2d" + "3cd1ca28.cc1526" ] ] }, { - "id": "6d553f1a.6f2d", + "id": "3cd1ca28.cc1526", "type": "set", "name": "set topology", "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1625.2539176940918, - "y": 261.60390505194664, - "z": "8dba42d4.2fc58", + "x": 1567.2500114440918, + "y": 223.60390600562096, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "634732f9.1dcf5c", + "id": "d3877bd.f214188", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 765.7539520263672, - "y": 745.0040283203125, - "z": "8dba42d4.2fc58", + "x": 707.7500457763672, + "y": 707.0040292739868, + "z": "4c287bc.f107e84", "wires": [ [ - "f913ba01.d721f8" + "7110150.fd1e8ec" ] ] }, { - "id": "f913ba01.d721f8", + "id": "7110150.fd1e8ec", "type": "execute", "name": "execute RestApiCallNode Create network orchestration", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"orchestration-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1086.2540588378906, - "y": 734.004111289978, - "z": "8dba42d4.2fc58", + "x": 1028.2501525878906, + "y": 696.0041122436523, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "dc4c0558.42daa8", + "id": "bc16f27b.ec50b", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 768.2539215087891, - "y": 807.0039566457272, - "z": "8dba42d4.2fc58", + "x": 710.2500152587891, + "y": 769.0039575994015, + "z": "4c287bc.f107e84", "wires": [ [ - "fb537bd1.22fa68", - "e996dfd6.0f7c", - "81b5cd25.b683d" + "39c058d0.1d59d8", + "4d96e12b.86876", + "50f144c4.b6b2ac" ] ] }, { - "id": "e996dfd6.0f7c", + "id": "4d96e12b.86876", "type": "execute", "name": "execute RestApiCallNode Create vpn", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1039.7539672851562, - "y": 797.0040806233883, - "z": "8dba42d4.2fc58", + "x": 981.7500610351562, + "y": 759.0040815770626, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "fb537bd1.22fa68", + "id": "39c058d0.1d59d8", "type": "set", "name": "set prop.vpn-id and prop.vpn1Id", "xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n", "comments": "", - "x": 1035.7541236877441, - "y": 849.0041799545288, - "z": "8dba42d4.2fc58", + "x": 977.7502174377441, + "y": 811.0041809082031, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "81b5cd25.b683d", + "id": "50f144c4.b6b2ac", "type": "execute", "name": "execute RestApiCallNode Create vpn topology", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1067.2539710998535, - "y": 901.0039548873901, - "z": "8dba42d4.2fc58", + "x": 1009.2500648498535, + "y": 863.0039558410645, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "f31fc51b.0a7188", + "id": "29cb6e2b.ecafd2", "type": "set", "name": "set tenant-id to service-data", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />", "comments": "", - "x": 803.2540588378906, - "y": 942.7540893554688, - "z": "8dba42d4.2fc58", + "x": 745.2501525878906, + "y": 904.7540903091431, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "2ab6006d.5b2cc", + "id": "9bf6657f.dd37a8", "type": "get-resource", "name": "get-resource service-subscription", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n force=\"true\" pfx=\"tmp.AnAI-data\">\n \n", "comments": "", "outputs": 1, - "x": 821.5040435791016, - "y": 648.2539405822754, - "z": "8dba42d4.2fc58", + "x": 762.0715408325195, + "y": 611.6825218200684, + "z": "4c287bc.f107e84", "wires": [ [ - "7a3e9a9e.b5ebe4", - "beceadfe.18cd7" + "fbe99e6e.4017e", + "457e75b8.5e8e7c" ] ] }, { - "id": "1272bfc5.9264a", + "id": "ba35b9dd.539428", "type": "switchNode", "name": "switch temp-ub-sub-account-id", "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n", "comments": "", "outputs": 1, - "x": 1233.504135131836, - "y": 613.0040216445923, - "z": "8dba42d4.2fc58", + "x": 1174.071632385254, + "y": 576.4326028823853, + "z": "4c287bc.f107e84", "wires": [ [ - "89f0974b.4d94b8", - "b024d53.775b128" + "76b51f1a.0801", + "efbb35c.45c87c8" ] ] }, { - "id": "89f0974b.4d94b8", + "id": "76b51f1a.0801", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 1426.2185859680176, - "y": 587.0040626525879, - "z": "8dba42d4.2fc58", + "x": 1366.78609085083, + "y": 550.432635307312, + "z": "4c287bc.f107e84", "wires": [ [ - "13ebb7af.038dc8" + "a2a000be.ae6b" ] ] }, { - "id": "b024d53.775b128", + "id": "efbb35c.45c87c8", "type": "other", "name": "Other", "xml": "<outcome value='Other'>", "comments": "", "outputs": 1, - "x": 1426.504150390625, - "y": 642.0040254592896, - "z": "8dba42d4.2fc58", + "x": 1367.071647644043, + "y": 605.4326066970825, + "z": "4c287bc.f107e84", "wires": [ [ - "fbfaef01.8c56a" + "864dc517.ee5aa8" ] ] }, { - "id": "fbfaef01.8c56a", + "id": "5407a489.2a82dc", "type": "set", "name": "set prop.tenant-id", "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n", "comments": "", - "x": 1582.5043258666992, - "y": 700.0039434432983, - "z": "8dba42d4.2fc58", + "x": 1614.5002403259277, + "y": 690.5754070281982, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "13ebb7af.038dc8", + "id": "a2a000be.ae6b", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1564.2538948059082, - "y": 588.7539029121399, - "z": "8dba42d4.2fc58", + "x": 1506.2499885559082, + "y": 550.7539038658142, + "z": "4c287bc.f107e84", "wires": [ [ - "4e788339.2d713c", - "a323c09d.a8718", - "93da7d77.20b82", - "fa0331db.90ed7", - "b9f4426f.77ac" + "d533a7b3.2b7aa8", + "68abe37a.a97c3c", + "ebb2a924.447738", + "3179cec4.da2412", + "df370d35.edba", + "5f23c930.bf33c8", + "d5098f7f.2d7c" ] ] }, { - "id": "fa0331db.90ed7", + "id": "3179cec4.da2412", "type": "set", "name": "set prop.customer-id", "xml": "<set>\n<parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />\n", "comments": "", - "x": 1776.7542114257812, - "y": 525.7540578842163, - "z": "8dba42d4.2fc58", + "x": 1717.8930969238281, + "y": 361.3254642486572, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "4e788339.2d713c", + "id": "d533a7b3.2b7aa8", "type": "execute", "name": "execute RestApiCallNode Create tenant", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1837.75390625, - "y": 602.7539125978947, - "z": "8dba42d4.2fc58", + "x": 1776.8929138183594, + "y": 491.89675521850586, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "a323c09d.a8718", + "id": "68abe37a.a97c3c", "type": "set", "name": "set prop.tenant-id", "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\n", "comments": "", - "x": 1787.7541389465332, - "y": 654.7539834976196, - "z": "8dba42d4.2fc58", + "x": 1729.7502326965332, + "y": 616.753984451294, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "93da7d77.20b82", + "id": "ebb2a924.447738", "type": "execute", "name": "execute RestApiCallNode Create tenant auth", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1855.254135131836, - "y": 690.5039834976196, - "z": "8dba42d4.2fc58", + "x": 1797.250228881836, + "y": 652.503984451294, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "b9f4426f.77ac", + "id": "df370d35.edba", "type": "get-resource", - "name": "save-resource customer-id in service-subscription", - "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' />\n\n", + "name": "update-resource customer-id in service-subscription", + "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />\n<!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->\n\n\n", "comments": "", "outputs": 1, - "x": 1857.7540130615234, - "y": 563.7540616989136, - "z": "8dba42d4.2fc58", + "x": 1821.1786041259766, + "y": 552.8968715667725, + "z": "4c287bc.f107e84", "wires": [ [] ] }, { - "id": "7a3e9a9e.b5ebe4", + "id": "fbe99e6e.4017e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1032.00390625, - "y": 620.9999990463257, - "z": "8dba42d4.2fc58", + "x": 972.571403503418, + "y": 584.4285802841187, + "z": "4c287bc.f107e84", "wires": [ [ - "1272bfc5.9264a" + "ba35b9dd.539428" ] ] }, { - "id": "beceadfe.18cd7", + "id": "457e75b8.5e8e7c", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1024.25390625, - "y": 674.6428823471069, - "z": "8dba42d4.2fc58", + "x": 966.2499923706055, + "y": 636.6428918838501, + "z": "4c287bc.f107e84", "wires": [ [ - "e7f65c34.ba5cc" + "df05b13b.b352c" ] ] }, { - "id": "e7f65c34.ba5cc", + "id": "df05b13b.b352c", "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=\"Error executing get token rest api\" />\n", "comments": "", - "x": 1177.00390625, - "y": 674.3929433822632, - "z": "8dba42d4.2fc58", + "x": 1118.9999923706055, + "y": 636.3929529190063, + "z": "4c287bc.f107e84", "wires": [] }, { - "id": "d5289859.e9ecf8", + "id": "73dbb3c3.f1d1fc", "type": "set", "name": "set vpn-id to service-data", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />", "comments": "", - "x": 801.5039825439453, - "y": 980.5039672851562, - "z": "8dba42d4.2fc58", + "x": 743.5000762939453, + "y": 942.5039682388306, + "z": "4c287bc.f107e84", "wires": [] + }, + { + "id": "864dc517.ee5aa8", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1425.7224044799805, + "y": 688.5795984268188, + "z": "4c287bc.f107e84", + "wires": [ + [ + "5407a489.2a82dc", + "75fd5cb0.1720a4" + ] + ] + }, + { + "id": "75fd5cb0.1720a4", + "type": "execute", + "name": "execute RestApiCallNode Create tenant auth", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 1697.1510009765625, + "y": 737.1510009765625, + "z": "4c287bc.f107e84", + "wires": [ + [] + ] + }, + { + "id": "5f23c930.bf33c8", + "type": "set", + "name": "set prop.userAccount", + "xml": "<set>\n<parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />\n<parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />", + "comments": "", + "x": 1718, + "y": 439, + "z": "4c287bc.f107e84", + "wires": [] + }, + { + "id": "d5098f7f.2d7c", + "type": "execute", + "name": "execute concat customer-id and @test.com", + "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$prop.customer-id`'/>\n <parameter name=\"outputPath\" value=\"tmp.userAccountEmail\"/>\n <parameter name=\"target\" value=\"@test.com\"/>\n\n\n", + "comments": "", + "outputs": 1, + "x": 1793.0038757324219, + "y": 403.003942489624, + "z": "4c287bc.f107e84", + "wires": [ + [] + ] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json index 547ed010..876668fa 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json @@ -1,20 +1,20 @@ [ { - "id": "2cfde233.a1cf6e", + "id": "fd56c256.6611d", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 103.00390625, - "y": 35.003907203674316, - "z": "57d2d3d6.9aa6fc", + "x": 102, + "y": 37, + "z": "88e745dd.c19a68", "wires": [ [ - "3b2e232c.fd060c" + "e8a2c571.7151d8" ] ] }, { - "id": "3b2e232c.fd060c", + "id": "e8a2c571.7151d8", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,562 +22,698 @@ "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": 265.00391006469727, - "y": 107.0039234161377, - "z": "57d2d3d6.9aa6fc", + "x": 264.00000381469727, + "y": 109.00001621246338, + "z": "88e745dd.c19a68", "wires": [ [ - "a53b2fce.2a65f" + "501691b7.b8579" ] ] }, { - "id": "a53b2fce.2a65f", + "id": "501691b7.b8579", "type": "method", "name": "method sdwan-network-topology-operation-deactivate", "xml": "<method rpc='sdwan-network-topology-operation-deactivate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 253.0040283203125, - "y": 195.00390625, - "z": "57d2d3d6.9aa6fc", + "x": 252.0001220703125, + "y": 196.99999904632568, + "z": "88e745dd.c19a68", "wires": [ [ - "663d77f7.214e28" + "f268dab.9a2e128" ] ] }, { - "id": "663d77f7.214e28", + "id": "f268dab.9a2e128", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 427.00392150878906, - "y": 303.0039653778076, - "z": "57d2d3d6.9aa6fc", + "x": 426.00001525878906, + "y": 305.0000581741333, + "z": "88e745dd.c19a68", "wires": [ [ - "b928d5a5.e0ad38", - "4e2c1ff0.9578e", - "f4a9e349.c682f", - "23c4ff52.00447", - "77ecaa70.6d0df4", - "2ea7cfac.fbbe5", - "15a8b2bc.455b8d", - "b657cd65.d8e7b", - "e4693af9.dc3458", - "c69b48c1.cce2a8", - "992bd0be.f4511", - "565518bc.dd3838", - "5cca3c72.23bd74" + "b31f4e4c.0f578", + "34c8ec0.c180514", + "613a4de8.024144", + "5f55a204.78493c", + "b7c0b37c.27c35", + "f96046b8.ac5b48", + "f78b989e.79da48", + "76b3c50a.02876c", + "ad00b85d.5bef68", + "b370ae59.4bce9", + "2ec15.4c1aa3ebc", + "988eea5f.5a0298", + "2cf3fcb4.da9384", + "9a8305f1.e08cb8" ] ] }, { - "id": "b928d5a5.e0ad38", + "id": "b31f4e4c.0f578", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 885.3928070068359, - "y": 52.00390625, - "z": "57d2d3d6.9aa6fc", + "x": 884.3889007568359, + "y": 53.999999046325684, + "z": "88e745dd.c19a68", "wires": [ [] ] }, { - "id": "4e2c1ff0.9578e", + "id": "34c8ec0.c180514", "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=\"sdwan-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Deactivate\"/>\n", "comments": "", "outputs": 1, - "x": 685.5595054626465, - "y": 105.78175926208496, - "z": "57d2d3d6.9aa6fc", + "x": 684.5555992126465, + "y": 107.77785205841064, + "z": "88e745dd.c19a68", "wires": [ [] ] }, { - "id": "f4a9e349.c682f", + "id": "613a4de8.024144", "type": "set", "name": "set networkId and network-object-path", "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $network-topology-operation-input.network-information.network-id + '/network-data/'` \" />", "comments": "", - "x": 777.5597496032715, - "y": 732.3173627853394, - "z": "57d2d3d6.9aa6fc", + "x": 786.5558738708496, + "y": 849.3134832382202, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "23c4ff52.00447", + "id": "5f55a204.78493c", "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": 699.3375511169434, - "y": 921.8727827072144, - "z": "57d2d3d6.9aa6fc", + "x": 708.3336753845215, + "y": 1038.8689031600952, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "77ecaa70.6d0df4", + "id": "b7c0b37c.27c35", "type": "set", "name": "set network-level-oper-status", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />", "comments": "", - "x": 744.4486656188965, - "y": 793.5395374298096, - "z": "57d2d3d6.9aa6fc", + "x": 753.4447898864746, + "y": 910.5356578826904, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "2ea7cfac.fbbe5", + "id": "f96046b8.ac5b48", "type": "execute", "name": "execute Properties", "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": 717.8616104125977, - "y": 158.78179550170898, - "z": "57d2d3d6.9aa6fc", + "x": 716.8577041625977, + "y": 160.77788829803467, + "z": "88e745dd.c19a68", "wires": [ [] ] }, { - "id": "15a8b2bc.455b8d", + "id": "f78b989e.79da48", "type": "set", "name": "set network in service-data", "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />", "comments": "", - "x": 738.004280090332, - "y": 679.095196723938, - "z": "57d2d3d6.9aa6fc", + "x": 747.0004043579102, + "y": 796.0913171768188, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "b657cd65.d8e7b", + "id": "76b3c50a.02876c", "type": "for", "name": "for each network-input-parameters", "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 770.00390625, - "y": 229.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 769, + "y": 231.00390657782555, + "z": "88e745dd.c19a68", "wires": [ [ - "630ca78d.27ae88" + "1c6b88c6.f49ce7" ] ] }, { - "id": "630ca78d.27ae88", + "id": "1c6b88c6.f49ce7", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1026.8373374938965, - "y": 163.34116491675377, - "z": "57d2d3d6.9aa6fc", + "x": 1025.8334312438965, + "y": 165.33725771307945, + "z": "88e745dd.c19a68", "wires": [ [ - "3612556b.bbed1a", - "c60af583.51da48", - "a8faff93.c15f9", - "3a3baf52.54ed7" + "903569b7.4e2578", + "653d2c3c.262b14", + "c5910d9a.730a3", + "5b432d19.74fce4" ] ] }, { - "id": "3612556b.bbed1a", + "id": "903569b7.4e2578", "type": "switchNode", "name": "switch name", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n", "comments": "", "outputs": 1, - "x": 1248.837417602539, - "y": 53.34119987487793, - "z": "57d2d3d6.9aa6fc", + "x": 1247.833511352539, + "y": 55.33729267120361, + "z": "88e745dd.c19a68", "wires": [ [ - "8c14fd7b.27081" + "138e36c7.964e29" ] ] }, { - "id": "8c14fd7b.27081", + "id": "138e36c7.964e29", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1422.8375434875488, - "y": 53.341203689575195, - "z": "57d2d3d6.9aa6fc", + "x": 1421.8336372375488, + "y": 55.33729648590088, + "z": "88e745dd.c19a68", "wires": [ [ - "f4242145.e0099" + "cd7bebad.986118" ] ] }, { - "id": "f4242145.e0099", + "id": "cd7bebad.986118", "type": "set", "name": "set name", "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1585.8374290466309, - "y": 52.94119834899902, - "z": "57d2d3d6.9aa6fc", + "x": 1584.8335227966309, + "y": 54.93729114532471, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "e4693af9.dc3458", + "id": "ad00b85d.5bef68", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 764.00390625, - "y": 338.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 763, + "y": 340.00390657782555, + "z": "88e745dd.c19a68", "wires": [ [ - "fdb52017.6dec1", - "5ded5567.77825c", - "2c94536.83be9ac" + "2b0c648a.f8433c", + "f2e86cdd.3128a", + "918162b5.31748" ] ] }, { - "id": "fdb52017.6dec1", + "id": "2b0c648a.f8433c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1009.00390625, - "y": 284.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 1008, + "y": 286.00390657782555, + "z": "88e745dd.c19a68", "wires": [ [ - "2b35b6e5.d07f8a" + "a06faa05.f76618" ] ] }, { - "id": "5ded5567.77825c", + "id": "f2e86cdd.3128a", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1012.494873046875, - "y": 331.5818494260311, - "z": "57d2d3d6.9aa6fc", + "x": 1011.490966796875, + "y": 333.5779422223568, + "z": "88e745dd.c19a68", "wires": [ [ - "8424b2a8.48b9d" + "37a1f73b.b96e68" ] ] }, { - "id": "2c94536.83be9ac", + "id": "918162b5.31748", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1007.827880859375, - "y": 372.91516241431236, - "z": "57d2d3d6.9aa6fc", + "x": 1006.823974609375, + "y": 374.91125521063805, + "z": "88e745dd.c19a68", "wires": [ [ - "ab7ddb5c.582b78" + "4f66c6a.4583438" ] ] }, { - "id": "2b35b6e5.d07f8a", + "id": "a06faa05.f76618", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1206.5039672851562, - "y": 272.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 1205.5000610351562, + "y": 274.00390657782555, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "8424b2a8.48b9d", + "id": "37a1f73b.b96e68", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1189.0662841796875, - "y": 319.8675855100155, - "z": "57d2d3d6.9aa6fc", + "x": 1188.0623779296875, + "y": 321.86367830634117, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "ab7ddb5c.582b78", + "id": "4f66c6a.4583438", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1195.6004371643066, - "y": 368.354355186224, - "z": "57d2d3d6.9aa6fc", + "x": 1194.5965309143066, + "y": 370.35044798254967, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "c69b48c1.cce2a8", + "id": "b370ae59.4bce9", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 772.00390625, - "y": 449.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 771, + "y": 451.00390657782555, + "z": "88e745dd.c19a68", "wires": [ [ - "ce7c1b67.661578", - "8a934505.8ec3a8" + "61a5287d.5d14f8", + "99df3ba8.a50248" ] ] }, { - "id": "ce7c1b67.661578", + "id": "61a5287d.5d14f8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1007.00390625, - "y": 427.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 1006, + "y": 429.00390657782555, + "z": "88e745dd.c19a68", "wires": [ [ - "aa6da81f.8e3f18" + "951e43bb.f165" ] ] }, { - "id": "8a934505.8ec3a8", + "id": "99df3ba8.a50248", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 999.25390625, - "y": 480.6506970822811, - "z": "57d2d3d6.9aa6fc", + "x": 998.25, + "y": 482.6467898786068, + "z": "88e745dd.c19a68", "wires": [ [ - "928c6b17.a04a28" + "f26ec62f.ef46a8" ] ] }, { - "id": "aa6da81f.8e3f18", + "id": "951e43bb.f165", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1161.00390625, - "y": 428.00781378149986, - "z": "57d2d3d6.9aa6fc", + "x": 1160, + "y": 430.00390657782555, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "928c6b17.a04a28", + "id": "f26ec62f.ef46a8", "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=\"Error executing get token rest api\" />\n", "comments": "", - "x": 1152.00390625, - "y": 480.40075811743736, - "z": "57d2d3d6.9aa6fc", + "x": 1151, + "y": 482.39685091376305, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "c60af583.51da48", + "id": "653d2c3c.262b14", "type": "switchNode", "name": "switch topology", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n", "comments": "", "outputs": 1, - "x": 1254.253890991211, - "y": 96.00781416893005, - "z": "57d2d3d6.9aa6fc", + "x": 1253.249984741211, + "y": 98.00390696525574, + "z": "88e745dd.c19a68", "wires": [ [ - "6ea0ea88.c5d044" + "42e996e4.f57c78" ] ] }, { - "id": "6ea0ea88.c5d044", + "id": "42e996e4.f57c78", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1428.2540168762207, - "y": 96.00781798362732, - "z": "57d2d3d6.9aa6fc", + "x": 1427.2501106262207, + "y": 98.003910779953, + "z": "88e745dd.c19a68", "wires": [ [ - "230bc0ec.589fb" + "36533d51.327db2" ] ] }, { - "id": "230bc0ec.589fb", + "id": "36533d51.327db2", "type": "set", "name": "set topology", "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1591.2539024353027, - "y": 95.60781264305115, - "z": "57d2d3d6.9aa6fc", + "x": 1590.2499961853027, + "y": 97.60390543937683, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "992bd0be.f4511", + "id": "2ec15.4c1aa3ebc", "type": "execute", "name": "execute RestApiCallNode delete vpn", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-delete.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 770.7539825439453, - "y": 616.0080223083496, - "z": "57d2d3d6.9aa6fc", + "x": 779.7501068115234, + "y": 733.0041427612305, + "z": "88e745dd.c19a68", "wires": [ [] ] }, { - "id": "565518bc.dd3838", + "id": "988eea5f.5a0298", "type": "execute", "name": "execute RestApiCallNode delete vpn topology", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 800.2539978027344, - "y": 549.0079069137573, - "z": "57d2d3d6.9aa6fc", + "x": 809.2501220703125, + "y": 666.0040273666382, + "z": "88e745dd.c19a68", "wires": [ [] ] }, { - "id": "a8faff93.c15f9", + "id": "c5910d9a.730a3", "type": "switchNode", "name": "switch vpn-id", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpn-id'`\">\n", "comments": "", "outputs": 1, - "x": 1248.5039691925049, - "y": 179.00390815734863, - "z": "57d2d3d6.9aa6fc", + "x": 1247.5000629425049, + "y": 181.00000095367432, + "z": "88e745dd.c19a68", "wires": [ [ - "ae3a63c3.3c738" + "648a246c.73b5ec" ] ] }, { - "id": "ae3a63c3.3c738", + "id": "648a246c.73b5ec", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1430.5040016174316, - "y": 179.00390696525574, - "z": "57d2d3d6.9aa6fc", + "x": 1429.5000953674316, + "y": 180.99999976158142, + "z": "88e745dd.c19a68", "wires": [ [ - "4d67f5b4.fc8eec" + "701a4c1a.83d604" ] ] }, { - "id": "4d67f5b4.fc8eec", + "id": "701a4c1a.83d604", "type": "set", "name": "set prop.vpn-id", "xml": "<set>\n<parameter name='prop.vpn-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1593.5038871765137, - "y": 178.60390162467957, - "z": "57d2d3d6.9aa6fc", + "x": 1592.4999809265137, + "y": 180.59999442100525, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "3a3baf52.54ed7", + "id": "5b432d19.74fce4", "type": "switchNode", "name": "switch tenant-id", "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenant-id'`\">\n", "comments": "", "outputs": 1, - "x": 1254.25390625, - "y": 222.00390625, - "z": "57d2d3d6.9aa6fc", + "x": 1253.25, + "y": 223.99999904632568, + "z": "88e745dd.c19a68", "wires": [ [ - "1a8e58aa.aa1b17" + "f053b806.9e46f8" ] ] }, { - "id": "1a8e58aa.aa1b17", + "id": "f053b806.9e46f8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1428.2540321350098, - "y": 222.00391006469727, - "z": "57d2d3d6.9aa6fc", + "x": 1427.2501258850098, + "y": 224.00000286102295, + "z": "88e745dd.c19a68", "wires": [ [ - "3b8512ac.291e5e" + "7fc67227.287a4c" ] ] }, { - "id": "3b8512ac.291e5e", + "id": "7fc67227.287a4c", "type": "set", "name": "set prop.tenant-id", "xml": "<set>\n<parameter name='prop.tenant-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1591.2539176940918, - "y": 221.6039047241211, - "z": "57d2d3d6.9aa6fc", + "x": 1590.2500114440918, + "y": 223.59999752044678, + "z": "88e745dd.c19a68", "wires": [] }, { - "id": "5cca3c72.23bd74", + "id": "2cf3fcb4.da9384", "type": "update", "name": "update SDWAN VPN status to AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />", "comments": "", "outputs": 1, - "x": 758.0039443969727, - "y": 860.5039930343628, - "z": "57d2d3d6.9aa6fc", + "x": 767.0000686645508, + "y": 977.5001134872437, + "z": "88e745dd.c19a68", + "wires": [ + [] + ] + }, + { + "id": "9a8305f1.e08cb8", + "type": "get-resource", + "name": "get-resource service-subscription", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n force=\"true\" pfx=\"tmp.AnAI-data\">\n \n", + "comments": "", + "outputs": 1, + "x": 758.0038909912109, + "y": 533.0038976669312, + "z": "88e745dd.c19a68", + "wires": [ + [ + "6497125a.d4efec", + "61153347.107bfc" + ] + ] + }, + { + "id": "61153347.107bfc", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 973.1824684143066, + "y": 584.9642953872681, + "z": "88e745dd.c19a68", + "wires": [ + [ + "2a04bd37.e27582" + ] + ] + }, + { + "id": "6497125a.d4efec", + "type": "success", + "name": "success", + "xml": "<outcome value='success'>\n", + "comments": "", + "outputs": 1, + "x": 979.5038795471191, + "y": 532.7499837875366, + "z": "88e745dd.c19a68", + "wires": [ + [ + "954bff66.85de8" + ] + ] + }, + { + "id": "2a04bd37.e27582", + "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=\"Error executing get token rest api\" />\n", + "comments": "", + "x": 1125.9324684143066, + "y": 584.7143564224243, + "z": "88e745dd.c19a68", + "wires": [] + }, + { + "id": "954bff66.85de8", + "type": "switchNode", + "name": "switch temp-ub-sub-account-id", + "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n", + "comments": "", + "outputs": 1, + "x": 1181.004108428955, + "y": 524.7540063858032, + "z": "88e745dd.c19a68", + "wires": [ + [ + "81f571ba.fc753" + ] + ] + }, + { + "id": "81f571ba.fc753", + "type": "other", + "name": "Other", + "xml": "<outcome value='Other'>", + "comments": "", + "outputs": 1, + "x": 1374.0041236877441, + "y": 553.7540102005005, + "z": "88e745dd.c19a68", + "wires": [ + [ + "d50c5253.93df5" + ] + ] + }, + { + "id": "d50c5253.93df5", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1432.6548805236816, + "y": 636.9010019302368, + "z": "88e745dd.c19a68", + "wires": [ + [ + "5e8c6620.18c828", + "29548e46.007002" + ] + ] + }, + { + "id": "5e8c6620.18c828", + "type": "set", + "name": "set prop.tenant-id", + "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n", + "comments": "", + "x": 1621.432716369629, + "y": 638.8968105316162, + "z": "88e745dd.c19a68", + "wires": [] + }, + { + "id": "29548e46.007002", + "type": "execute", + "name": "execute RestApiCallNode Create tenant auth", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "comments": "", + "outputs": 1, + "x": 1704.0834770202637, + "y": 685.4724044799805, + "z": "88e745dd.c19a68", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json index 93cf8aee..798be486 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json @@ -1,17 +1,17 @@ [ { - "id": "50195fc6.898bb", + "id": "206c85aa.5a072a", "type": "comment", "name": "sdwan-vnf-topology-operation-device-activate", "info": "", "comments": "", - "x": 550.00390625, - "y": 71.00390625, - "z": "c21457e5.a6cbc8", + "x": 508.3447952270508, + "y": 68, + "z": "51909408.51161c", "wires": [] }, { - "id": "85d78052.fe7cc", + "id": "ca427018.80bcb", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -19,625 +19,614 @@ "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": 229.94481658935547, - "y": 142.0041732788086, - "z": "c21457e5.a6cbc8", + "x": 188.28570556640625, + "y": 139.0002670288086, + "z": "51909408.51161c", "wires": [ [ - "323cadd3.27c0d2" + "2fa01ba0.438244" ] ] }, { - "id": "aaa38f17.f307a", + "id": "d277668e.e654a8", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 150.65911102294922, - "y": 79.76606369018555, - "z": "c21457e5.a6cbc8", + "x": 109, + "y": 76.76215744018555, + "z": "51909408.51161c", "wires": [ [ - "85d78052.fe7cc" + "ca427018.80bcb" ] ] }, { - "id": "220347f8.1484e8", + "id": "29e19c37.979fb4", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 225.3257827758789, - "y": 421.43274879455566, - "z": "c21457e5.a6cbc8", + "x": 183.6666717529297, + "y": 418.42884254455566, + "z": "51909408.51161c", "wires": [ [ - "e6b80f71.25bd4", - "41d21371.3482cc", - "ede17b3a.f75148", - "d7029e79.59672", - "6ae18188.f2044", - "f628964.b562168", - "120defaf.28edc", - "46c583fa.d0b40c", - "139f4e2.66d6eb2", - "a27fb783.ef2f48", - "bcf0047f.528cc8", - "981acfda.e23ab", - "86570f1a.fe5e8", - "fba2af80.f96de" + "d0145adc.c61398", + "8a8e6e5a.af8ac", + "5365293b.242938", + "2b32a3df.95a32c", + "7f49e88e.6ac0a8", + "8f8a4ade.fb21d8", + "9162baea.a58618", + "96cec913.036c98", + "f1cfd3b2.a98b6", + "7bfd6f06.aec7d", + "a82fd005.9ab21", + "752aae5e.411ae", + "feaf1629.1e79e8", + "bd5ee22a.cd67b" ] ] }, { - "id": "41d21371.3482cc", + "id": "8a8e6e5a.af8ac", "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": 624.9925231933594, - "y": 1066.0995807647705, - "z": "c21457e5.a6cbc8", + "x": 589.0477142333984, + "y": 1021.6670913696289, + "z": "51909408.51161c", "wires": [] }, { - "id": "e6b80f71.25bd4", + "id": "d0145adc.c61398", "type": "set", "name": "set vnf-level-oper-status to Active", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 706.472583770752, - "y": 873.4367294311523, - "z": "c21457e5.a6cbc8", + "x": 670.527774810791, + "y": 829.0042400360107, + "z": "51909408.51161c", "wires": [] }, { - "id": "6ae18188.f2044", + "id": "7f49e88e.6ac0a8", "type": "set", "name": "copy input data to service data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n", "comments": "", - "x": 684.3257751464844, - "y": 929.4329051971436, - "z": "c21457e5.a6cbc8", + "x": 648.3809661865234, + "y": 885.000415802002, + "z": "51909408.51161c", "wires": [] }, { - "id": "4cad5392.24fc9c", + "id": "7ac7ee71.334c", "type": "comment", "name": "make sure this VNF doesn't exist already", "info": "", "comments": "", - "x": 1422.5162811279297, - "y": 644.9566164016724, - "z": "c21457e5.a6cbc8", + "x": 1383.7143249511719, + "y": 661.9527359008789, + "z": "51909408.51161c", "wires": [] }, { - "id": "a27fb783.ef2f48", + "id": "7bfd6f06.aec7d", "type": "save", - "name": "save deviceInstance configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->\n<parameter name='operational-status' value='Active' />", + "name": "update deviceInstance configuration in AAI", + "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->\n<parameter name='operational-status' value='Active' />", "comments": "", "outputs": 1, - "x": 708.6592712402344, - "y": 979.3219051361084, - "z": "c21457e5.a6cbc8", + "x": 672.7144622802734, + "y": 934.8894157409668, + "z": "51909408.51161c", "wires": [ [] ] }, { - "id": "323cadd3.27c0d2", + "id": "2fa01ba0.438244", "type": "method", "name": "method sdwan-vnf-topology-operation-device-activate", "xml": "<method rpc='sdwan-vnf-topology-operation-device-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 241.65911102294922, - "y": 236.3524055480957, - "z": "c21457e5.a6cbc8", + "x": 200, + "y": 233.3484992980957, + "z": "51909408.51161c", "wires": [ [ - "220347f8.1484e8" + "29e19c37.979fb4" ] ] }, { - "id": "ede17b3a.f75148", + "id": "5365293b.242938", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", - "x": 687.6592254638672, - "y": 822.352541923523, - "z": "c21457e5.a6cbc8", + "x": 651.7144165039062, + "y": 777.9200525283813, + "z": "51909408.51161c", "wires": [] }, { - "id": "fba2af80.f96de", + "id": "feaf1629.1e79e8", "type": "execute", "name": "execute RestApiCallNode Create Devcie Instance", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 763.1037368774414, - "y": 649.1304225921631, - "z": "c21457e5.a6cbc8", + "x": 724.3017807006836, + "y": 666.1265420913696, + "z": "51909408.51161c", "wires": [ [ - "1a1378b0.178537", - "d8dd7f14.0ab02" + "1fffde57.79b802", + "1d6faab2.67fba5" ] ] }, { - "id": "86570f1a.fe5e8", + "id": "752aae5e.411ae", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 717.1036605834961, - "y": 519.1302967071533, - "z": "c21457e5.a6cbc8", + "x": 675.4445495605469, + "y": 516.1263904571533, + "z": "51909408.51161c", "wires": [ [ - "946c47ae.42bcf8", - "ddd15567.8fafd8" + "32c81884.3acf08", + "5b1f77c1.6546b8" ] ] }, { - "id": "946c47ae.42bcf8", + "id": "32c81884.3acf08", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 949.1036605834961, - "y": 499.1302967071533, - "z": "c21457e5.a6cbc8", + "x": 907.4445495605469, + "y": 496.1263904571533, + "z": "51909408.51161c", "wires": [ [ - "8008bf96.00803" + "8863e5c0.8fc5a8" ] ] }, { - "id": "ddd15567.8fafd8", + "id": "5b1f77c1.6546b8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 941.3536605834961, - "y": 540.7731800079346, - "z": "c21457e5.a6cbc8", + "x": 899.6945495605469, + "y": 537.7692737579346, + "z": "51909408.51161c", "wires": [ [ - "87a9f03d.7da59" + "1b01e427.5d582c" ] ] }, { - "id": "8008bf96.00803", + "id": "8863e5c0.8fc5a8", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1086.103660583496, - "y": 499.1302967071533, - "z": "c21457e5.a6cbc8", + "x": 1044.4445495605469, + "y": 496.1263904571533, + "z": "51909408.51161c", "wires": [] }, { - "id": "87a9f03d.7da59", + "id": "1b01e427.5d582c", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1067.437156677246, - "y": 541.0192127227783, - "z": "c21457e5.a6cbc8", + "x": 1025.7780456542969, + "y": 538.0153064727783, + "z": "51909408.51161c", "wires": [ [] ] }, { - "id": "e45b42b8.e6dbb", + "id": "b65e0d53.3b7ed", "type": "comment", "name": "Do Nothing", "info": "", "comments": "", - "x": 1328.9927024841309, - "y": 341.9080295562744, - "z": "c21457e5.a6cbc8", + "x": 1287.3335914611816, + "y": 338.9041233062744, + "z": "51909408.51161c", "wires": [] }, { - "id": "928cde96.7898d", + "id": "aa15cb9e.3cdaa8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1189.7702026367188, - "y": 619.0192108154297, - "z": "c21457e5.a6cbc8", + "x": 1150.968246459961, + "y": 636.0153303146362, + "z": "51909408.51161c", "wires": [ [] ] }, { - "id": "d1dae5c1.63a508", + "id": "12eca3bc.6e077c", "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=\"Error executing Activate Device rest api\" />\n", "comments": "", - "x": 1191.2147827148438, - "y": 669.574743270874, - "z": "c21457e5.a6cbc8", + "x": 1152.412826538086, + "y": 686.5708627700806, + "z": "51909408.51161c", "wires": [] }, { - "id": "d8dd7f14.0ab02", + "id": "1d6faab2.67fba5", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1038.2146263122559, - "y": 672.5746974945068, - "z": "c21457e5.a6cbc8", + "x": 999.412670135498, + "y": 689.5708169937134, + "z": "51909408.51161c", "wires": [ [ - "d1dae5c1.63a508" + "12eca3bc.6e077c" ] ] }, { - "id": "1a1378b0.178537", + "id": "1fffde57.79b802", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1037.6591415405273, - "y": 616.2414093017578, - "z": "c21457e5.a6cbc8", + "x": 998.8571853637695, + "y": 633.2375288009644, + "z": "51909408.51161c", "wires": [ [ - "928cde96.7898d" + "aa15cb9e.3cdaa8" ] ] }, { - "id": "f628964.b562168", + "id": "8f8a4ade.fb21d8", "type": "set", "name": "set deviceId to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"deviceId\" />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$deviceResp.success[0].id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n", "comments": "", - "x": 693.6593780517578, - "y": 774.3527889251709, - "z": "c21457e5.a6cbc8", + "x": 657.7145690917969, + "y": 729.9202995300293, + "z": "51909408.51161c", "wires": [] }, { - "id": "7d88138b.724c0c", - "type": "comment", - "name": "AAI resource need to update", - "info": "", - "comments": "", - "x": 1019.6592254638672, - "y": 933.352541923523, - "z": "c21457e5.a6cbc8", - "wires": [] - }, - { - "id": "981acfda.e23ab", + "id": "a82fd005.9ab21", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 711.6593246459961, - "y": 423.35251808166504, - "z": "c21457e5.a6cbc8", + "x": 670.0002136230469, + "y": 420.34861183166504, + "z": "51909408.51161c", "wires": [ [ - "d90f92f1.56733", - "58ca0b39.c48274", - "871628e8.c20ff8" + "342b0391.a4834c", + "7a108269.f3476c", + "87289215.d0cea" ] ] }, { - "id": "d90f92f1.56733", + "id": "342b0391.a4834c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 952.6593818664551, - "y": 348.3524923324585, - "z": "c21457e5.a6cbc8", + "x": 911.0002708435059, + "y": 345.3485860824585, + "z": "51909408.51161c", "wires": [ [ - "9c017cb1.5ef39" + "21df5526.b03a8a" ] ] }, { - "id": "9c017cb1.5ef39", + "id": "21df5526.b03a8a", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1129.159423828125, - "y": 339.35248136520386, - "z": "c21457e5.a6cbc8", + "x": 1087.5003128051758, + "y": 336.34857511520386, + "z": "51909408.51161c", "wires": [] }, { - "id": "58ca0b39.c48274", + "id": "7a108269.f3476c", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 944.150218963623, - "y": 396.92654037475586, - "z": "c21457e5.a6cbc8", + "x": 902.4911079406738, + "y": 393.92263412475586, + "z": "51909408.51161c", "wires": [ [ - "48a5b30d.99482c" + "e9fd26db.c0e278" ] ] }, { - "id": "48a5b30d.99482c", + "id": "e9fd26db.c0e278", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1117.7216300964355, - "y": 385.21227645874023, - "z": "c21457e5.a6cbc8", + "x": 1076.0625190734863, + "y": 382.20837020874023, + "z": "51909408.51161c", "wires": [] }, { - "id": "871628e8.c20ff8", + "id": "87289215.d0cea", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 936.483226776123, - "y": 438.2598533630371, - "z": "c21457e5.a6cbc8", + "x": 894.8241157531738, + "y": 435.2559471130371, + "z": "51909408.51161c", "wires": [ [ - "59c1c9f6.0040b8" + "d7092d64.71989" ] ] }, { - "id": "59c1c9f6.0040b8", + "id": "d7092d64.71989", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1124.2557830810547, - "y": 433.69904613494873, - "z": "c21457e5.a6cbc8", + "x": 1082.5966720581055, + "y": 430.69513988494873, + "z": "51909408.51161c", "wires": [] }, { - "id": "bcf0047f.528cc8", - "type": "save", - "name": "save service relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />", - "comments": "", - "outputs": 1, - "x": 682.6594467163086, - "y": 1026.0994539260864, - "z": "c21457e5.a6cbc8", - "wires": [ - [] - ] - }, - { - "id": "d7029e79.59672", + "id": "2b32a3df.95a32c", "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=\"Provided alloted resource length\"/>\n<parameter name=\"field3\" value=\"'parameters length'\"/>\n<parameter name=\"field4\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'/>\n\n\n\n", "comments": "", "outputs": 1, - "x": 656.6591262817383, - "y": 301.0190849304199, - "z": "c21457e5.a6cbc8", + "x": 615.0000152587891, + "y": 298.0151786804199, + "z": "51909408.51161c", "wires": [ [] ] }, { - "id": "120defaf.28edc", + "id": "9162baea.a58618", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 744.6904144287109, - "y": 187.0351848602295, - "z": "c21457e5.a6cbc8", + "x": 703.0313034057617, + "y": 184.0312786102295, + "z": "51909408.51161c", "wires": [ [ - "2fb6d9ed.49aab6" + "b4173a9a.c4a2c8" ] ] }, { - "id": "2fb6d9ed.49aab6", + "id": "b4173a9a.c4a2c8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 993.0400085449219, - "y": 187.57525253295898, - "z": "c21457e5.a6cbc8", + "x": 951.3808975219727, + "y": 184.57134628295898, + "z": "51909408.51161c", "wires": [ [ - "974bf0fe.dc4fc" + "8ed61ccb.fe1d2" ] ] }, { - "id": "974bf0fe.dc4fc", + "id": "8ed61ccb.fe1d2", "type": "switchNode", "name": "switch vnfid found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1147.1196060180664, - "y": 187.28533458709717, - "z": "c21457e5.a6cbc8", + "x": 1105.4604949951172, + "y": 184.28142833709717, + "z": "51909408.51161c", "wires": [ [ - "82b55f94.090c5" + "25dffe3f.86e402" ] ] }, { - "id": "e03d76d9.cc3a98", + "id": "94dc5d4a.a00f9", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1440.7171173095703, - "y": 188.5856475830078, - "z": "c21457e5.a6cbc8", + "x": 1399.058006286621, + "y": 185.5817413330078, + "z": "51909408.51161c", "wires": [ [ - "dd0e8d25.544ad", - "d5fff7a1.3b1048", - "1fe66a57.7e4926" + "fa685102.6e48e", + "a75f325a.531e1", + "1c8ecc84.ad1ff3" ] ] }, { - "id": "82b55f94.090c5", + "id": "25dffe3f.86e402", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1302.0715980529785, - "y": 188.1780138015747, - "z": "c21457e5.a6cbc8", + "x": 1260.4124870300293, + "y": 185.1741075515747, + "z": "51909408.51161c", "wires": [ [ - "e03d76d9.cc3a98" + "94dc5d4a.a00f9" ] ] }, { - "id": "d5fff7a1.3b1048", + "id": "a75f325a.531e1", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n", "comments": "", - "x": 1682.0499725341797, - "y": 144.58570766448975, - "z": "c21457e5.a6cbc8", + "x": 1640.3908615112305, + "y": 141.58180141448975, + "z": "51909408.51161c", "wires": [] }, { - "id": "dd0e8d25.544ad", + "id": "fa685102.6e48e", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n", "comments": "", - "x": 1709.6036834716797, - "y": 97.92807197570801, - "z": "c21457e5.a6cbc8", + "x": 1667.9445724487305, + "y": 94.92416572570801, + "z": "51909408.51161c", "wires": [] }, { - "id": "1fe66a57.7e4926", + "id": "1c8ecc84.ad1ff3", "type": "call", "name": "call sdwan-get-device-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-device-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 1686.6904220581055, - "y": 207.03517818450928, - "z": "c21457e5.a6cbc8", + "x": 1645.0313110351562, + "y": 204.03127193450928, + "z": "51909408.51161c", "wires": [ [] ] }, { - "id": "46c583fa.d0b40c", + "id": "96cec913.036c98", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, - "x": 675.690299987793, - "y": 248.03515625, - "z": "c21457e5.a6cbc8", + "x": 634.0311889648438, + "y": 245.03125, + "z": "51909408.51161c", "wires": [ [ - "47e07fa8.46bc3" + "dd74e5cf.ddfed8" ] ] }, { - "id": "47e07fa8.46bc3", + "id": "dd74e5cf.ddfed8", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 823.1189422607422, - "y": 247.60656642913818, - "z": "c21457e5.a6cbc8", + "x": 781.459831237793, + "y": 244.60266017913818, + "z": "51909408.51161c", "wires": [ [ - "b8303d6e.293f7" + "f70bcb29.83b348" ] ] }, { - "id": "b8303d6e.293f7", + "id": "f70bcb29.83b348", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 972.5476684570312, - "y": 248.74948406219482, - "z": "c21457e5.a6cbc8", + "x": 930.888557434082, + "y": 245.74557781219482, + "z": "51909408.51161c", "wires": [] }, { - "id": "139f4e2.66d6eb2", + "id": "f1cfd3b2.a98b6", "type": "execute", "name": "execute Properties", "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": 670.690299987793, - "y": 344.03515625, - "z": "c21457e5.a6cbc8", + "x": 629.0311889648438, + "y": 341.03125, + "z": "51909408.51161c", + "wires": [ + [] + ] + }, + { + "id": "bd5ee22a.cd67b", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 654.2938385009766, + "y": 604.2938222885132, + "z": "51909408.51161c", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json index b25adaf1..36a7cfdc 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json @@ -1,6 +1,6 @@ [ { - "id": "9cb483d7.ff8df", + "id": "fd0440a.ecd51c", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -8,634 +8,634 @@ "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": 183.78570556640625, - "y": 145.0002658367157, - "z": "f234e69c.c27828", + "x": 196, + "y": 82.23810958862305, + "z": "842fbc05.cce04", "wires": [ [ - "82081d1c.b4352" + "127bb9c5.150526" ] ] }, { - "id": "a3a5e35d.08a8b", + "id": "e5b0a995.906238", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 104.5, - "y": 82.76215624809265, - "z": "f234e69c.c27828", + "x": 116.71429443359375, + "y": 20, + "z": "842fbc05.cce04", "wires": [ [ - "9cb483d7.ff8df" + "fd0440a.ecd51c" ] ] }, { - "id": "194cf25c.9d64be", + "id": "23553cdf.889914", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 185.16666412353516, - "y": 406.4288260936737, - "z": "f234e69c.c27828", + "x": 197.3809585571289, + "y": 343.66666984558105, + "z": "842fbc05.cce04", "wires": [ [ - "12b7db37.f7ff25", - "94ec7644.8f3208", - "d463d74.bf70428", - "ade80aa2.c72f18", - "d76d180.81a43e8", - "d4716c92.1b3cb", - "1202a9f6.764af6", - "50fb4440.68b56c", - "35434662.4bcfda", - "b21ec7e.52c2938", - "93472449.69d418", - "9bf97976.fa1928" + "bf0f7a26.a11068", + "f71d7490.89bd28", + "ed1f7a5f.52aa38", + "20a30a30.b04286", + "1a809147.c1ebef", + "53d08385.3ed46c", + "d658c8ee.f13848", + "8e20e633.b9b588", + "61dc4d5e.3ba864", + "43e73a53.fc83c4", + "ff98826e.6bc6d", + "60a78e84.5e55" ] ] }, { - "id": "94ec7644.8f3208", + "id": "f71d7490.89bd28", "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": 565.8336067199707, - "y": 1028.0958859920502, - "z": "f234e69c.c27828", + "x": 578.0479011535645, + "y": 965.3337297439575, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "12b7db37.f7ff25", + "id": "bf0f7a26.a11068", "type": "set", "name": "set vnf-level-oper-status to Created", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 655.3136177062988, - "y": 760.4329907894135, - "z": "f234e69c.c27828", + "x": 667.5279121398926, + "y": 697.6708345413208, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "ade80aa2.c72f18", + "id": "20a30a30.b04286", "type": "set", "name": "copy input data to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />", "comments": "", - "x": 633.1668090820312, - "y": 816.4291665554047, - "z": "f234e69c.c27828", + "x": 645.381103515625, + "y": 753.667010307312, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "bf289ee9.17eee", + "id": "ef25e38.ee9742", "type": "save", "name": "save deviceInstance configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.devcie-id = $prop.vnf-id' >\n<parameter name='devcie-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.device-id = $prop.vnf-id' >\n<parameter name='device-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />\n", "comments": "", "outputs": 1, - "x": 1111.5007019042969, - "y": 833.3184735774994, - "z": "f234e69c.c27828", + "x": 1123.7149963378906, + "y": 770.5563173294067, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "82081d1c.b4352", + "id": "127bb9c5.150526", "type": "method", "name": "method sdwan-vnf-topology-operation-device-create", "xml": "<method rpc='sdwan-vnf-topology-operation-device-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 195.5, - "y": 239.3484981060028, - "z": "f234e69c.c27828", + "x": 207.71429443359375, + "y": 176.58634185791016, + "z": "842fbc05.cce04", "wires": [ [ - "194cf25c.9d64be" + "23553cdf.889914" ] ] }, { - "id": "d463d74.bf70428", + "id": "ed1f7a5f.52aa38", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />", "comments": "", - "x": 636.5002593994141, - "y": 709.3488032817841, - "z": "f234e69c.c27828", + "x": 648.7145538330078, + "y": 646.5866470336914, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "b128ad93.6f9ac", + "id": "abbdb9a7.a00168", "type": "set", "name": "set deviceId to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n", "comments": "", - "x": 642.5004119873047, - "y": 661.349050283432, - "z": "f234e69c.c27828", + "x": 654.7147064208984, + "y": 598.5868940353394, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "de11064d.94a5d8", + "id": "c106be0b.38899", "type": "comment", "name": "AAI resource need to update", "info": "", "comments": "", - "x": 957.5003051757812, - "y": 787.3489129543304, - "z": "f234e69c.c27828", + "x": 969.714599609375, + "y": 724.5867567062378, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "4f128f3f.350cf", + "id": "63a58c6c.370174", "type": "execute", "name": "execute generate-vnf-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n", "comments": "", "outputs": 1, - "x": 1141.5006866455078, - "y": 174.3486087322235, - "z": "f234e69c.c27828", + "x": 1153.7149810791016, + "y": 111.58645248413086, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "9bf97976.fa1928", + "id": "60a78e84.5e55", "type": "save", "name": "save service relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.device-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />", "comments": "", "outputs": 1, - "x": 623.500560760498, - "y": 983.0957877635956, - "z": "f234e69c.c27828", + "x": 635.7148551940918, + "y": 920.3336315155029, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "d76d180.81a43e8", + "id": "1a809147.c1ebef", "type": "switchNode", "name": "switch vnf-id", "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n", "comments": "", "outputs": 1, - "x": 605.5001068115234, - "y": 278.0000274181366, - "z": "f234e69c.c27828", + "x": 617.7144012451172, + "y": 215.23787117004395, + "z": "842fbc05.cce04", "wires": [ [ - "621f97e2.b689f8", - "786ad46d.cda56c" + "ecde6b48.bbfc48", + "1019aeef.5808d1" ] ] }, { - "id": "621f97e2.b689f8", + "id": "ecde6b48.bbfc48", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 746.5001106262207, - "y": 253.00001883506775, - "z": "f234e69c.c27828", + "x": 758.7144050598145, + "y": 190.2378625869751, + "z": "842fbc05.cce04", "wires": [ [ - "ef09f155.972b9" + "81003234.70dcc" ] ] }, { - "id": "ef09f155.972b9", + "id": "81003234.70dcc", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 894.5002136230469, - "y": 189.00001120567322, - "z": "f234e69c.c27828", + "x": 906.7145080566406, + "y": 126.23785495758057, + "z": "842fbc05.cce04", "wires": [ [ - "4f128f3f.350cf", - "e345eb47.17b7c8", - "82623d50.b5d47" + "63a58c6c.370174", + "69aa8a5d.0ac9a4", + "6eb09a3f.09bc74" ] ] }, { - "id": "786ad46d.cda56c", + "id": "1019aeef.5808d1", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 743.0312881469727, - "y": 313.03125643730164, - "z": "f234e69c.c27828", + "x": 755.2455825805664, + "y": 250.26910018920898, + "z": "842fbc05.cce04", "wires": [ [ - "b8aff249.035f2" + "b2303be.abcc1c8" ] ] }, { - "id": "8bf27ffe.7192e", + "id": "fe4dccde.57bcf", "type": "set", "name": "set prop.vnf-id", "xml": "<set>\n<parameter name='prop.vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n", "comments": "", - "x": 1082.0320434570312, - "y": 392.03162956237793, - "z": "f234e69c.c27828", + "x": 1094.246337890625, + "y": 329.2694733142853, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "b8aff249.035f2", + "id": "b2303be.abcc1c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 894.0317077636719, - "y": 345.03137850761414, - "z": "f234e69c.c27828", + "x": 906.2460021972656, + "y": 282.2692222595215, + "z": "842fbc05.cce04", "wires": [ [ - "8bf27ffe.7192e", - "82623d50.b5d47", - "ac207b07.0b4de8" + "fe4dccde.57bcf", + "6eb09a3f.09bc74", + "d5a722bf.9d266" ] ] }, { - "id": "d4716c92.1b3cb", + "id": "53d08385.3ed46c", "type": "set", "name": "set prop.sdncCreate=false", "xml": "<set>\n<parameter name='prop.sdncCreate' value='false' />\n", "comments": "", - "x": 680.0313568115234, - "y": 169.03125071525574, - "z": "f234e69c.c27828", + "x": 692.2456512451172, + "y": 106.26909446716309, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "1202a9f6.764af6", + "id": "d658c8ee.f13848", "type": "switchNode", "name": "switch prop.sdncCreate", "xml": "<switch test='`$prop.sdncCreate`'>\n", "comments": "", "outputs": 1, - "x": 602.5316925048828, - "y": 863.031670331955, - "z": "f234e69c.c27828", + "x": 614.7459869384766, + "y": 800.2695140838623, + "z": "842fbc05.cce04", "wires": [ [ - "a65c4106.c8fe7", - "b49509b2.10c3c8" + "be0155ce.278c18", + "f63d8c0c.a2846" ] ] }, { - "id": "a65c4106.c8fe7", + "id": "be0155ce.278c18", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 848.5314636230469, - "y": 833.5314071178436, - "z": "f234e69c.c27828", + "x": 860.7457580566406, + "y": 770.769250869751, + "z": "842fbc05.cce04", "wires": [ [ - "bf289ee9.17eee" + "ef25e38.ee9742" ] ] }, { - "id": "b49509b2.10c3c8", + "id": "f63d8c0c.a2846", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 850.0314483642578, - "y": 888.5314214229584, - "z": "f234e69c.c27828", + "x": 862.2457427978516, + "y": 825.7692651748657, + "z": "842fbc05.cce04", "wires": [ [ - "593b4cfd.497904" + "2097a67.fbc2c5a" ] ] }, { - "id": "e345eb47.17b7c8", + "id": "69aa8a5d.0ac9a4", "type": "set", "name": "set prop.updateAAIsdncCreate", "xml": "<set>\n<parameter name='prop.sdncCreate' value='true' />\n", "comments": "", - "x": 1159.0317764282227, - "y": 134.03133463859558, - "z": "f234e69c.c27828", + "x": 1171.2460708618164, + "y": 71.26917839050293, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "50fb4440.68b56c", + "id": "8e20e633.b9b588", "type": "for", "name": "for loop idx - VNF input parameters", "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n", "comments": "", "outputs": 1, - "x": 668.0314331054688, - "y": 463.0312850475311, - "z": "f234e69c.c27828", + "x": 680.2457275390625, + "y": 400.2691287994385, + "z": "842fbc05.cce04", "wires": [ [ - "d8830e39.7254c" + "6a3b248.f431cdc" ] ] }, { - "id": "d8830e39.7254c", + "id": "6a3b248.f431cdc", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 882.8097763061523, - "y": 460.58686900138855, - "z": "f234e69c.c27828", + "x": 895.0240707397461, + "y": 397.8247127532959, + "z": "842fbc05.cce04", "wires": [ [ - "6cb4a749.692908", - "24244ebf.8f5572" + "c1af467b.da6408", + "b9f2cae.04bc638" ] ] }, { - "id": "24244ebf.8f5572", + "id": "b9f2cae.04bc638", "type": "set", "name": "set parameterName", "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1048.5104064941406, - "y": 475.3351237773895, - "z": "f234e69c.c27828", + "x": 1060.7247009277344, + "y": 412.5729675292969, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "6cb4a749.692908", + "id": "c1af467b.da6408", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1079.0659790039062, - "y": 438.3350074291229, - "z": "f234e69c.c27828", + "x": 1091.2802734375, + "y": 375.5728511810303, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "35434662.4bcfda", + "id": "61dc4d5e.3ba864", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n", "comments": "", - "x": 630.0310516357422, - "y": 537.3559997081757, - "z": "f234e69c.c27828", + "x": 642.2453460693359, + "y": 474.593843460083, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "b21ec7e.52c2938", + "id": "43e73a53.fc83c4", "type": "call", "name": "call sdwan-get-device-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-device-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 655.0314331054688, - "y": 569.3561599254608, - "z": "f234e69c.c27828", + "x": 667.2457275390625, + "y": 506.59400367736816, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "bcf057ee.ac0fd8", + "id": "98f6587a.b563b8", "type": "comment", "name": "if SO provide vnf-id use that else create new", "info": "", "comments": "", - "x": 697.0312805175781, - "y": 223.0312602519989, - "z": "f234e69c.c27828", + "x": 709.2455749511719, + "y": 160.26910400390625, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "82623d50.b5d47", + "id": "6eb09a3f.09bc74", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1102.5317840576172, - "y": 271.0313537120819, - "z": "f234e69c.c27828", + "x": 1114.746078491211, + "y": 208.26919746398926, + "z": "842fbc05.cce04", "wires": [ [ - "d5e68c18.6d168", - "2bfd5f0a.c7681" + "10311b8f.214a74", + "d0785948.131e88" ] ] }, { - "id": "d5e68c18.6d168", + "id": "10311b8f.214a74", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 1346.5316734313965, - "y": 228.0313470363617, - "z": "f234e69c.c27828", + "x": 1358.7459678649902, + "y": 165.26919078826904, + "z": "842fbc05.cce04", "wires": [ [ - "f59d1f3f.83f78", - "475c8f31.8dce6" + "e8ee65b6.e0bb98", + "8e4d05a7.18d778" ] ] }, { - "id": "f59d1f3f.83f78", + "id": "e8ee65b6.e0bb98", "type": "other", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1560.2460556030273, - "y": 211.1741178035736, - "z": "f234e69c.c27828", + "x": 1572.460350036621, + "y": 148.41196155548096, + "z": "842fbc05.cce04", "wires": [ [ - "b1cc315c.65ade" + "2bb1c8ad.9ae4c8" ] ] }, { - "id": "b1cc315c.65ade", + "id": "2bb1c8ad.9ae4c8", "type": "set", "name": "set vnf-index=0", "xml": "<set>\n<parameter name='vnf-index' value='0' />\n", "comments": "", - "x": 1708.5317039489746, - "y": 208.17417216300964, - "z": "f234e69c.c27828", + "x": 1720.7459983825684, + "y": 145.412015914917, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "475c8f31.8dce6", + "id": "8e4d05a7.18d778", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1563.6745529174805, - "y": 256.45990920066833, - "z": "f234e69c.c27828", + "x": 1575.8888473510742, + "y": 193.69775295257568, + "z": "842fbc05.cce04", "wires": [ [ - "f950bc3f.5973b" + "20358c1.fc83f74" ] ] }, { - "id": "f950bc3f.5973b", + "id": "20358c1.fc83f74", "type": "set", "name": "set vnf-index = vnf_length", "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n", "comments": "", - "x": 1747.5322952270508, - "y": 256.74567770957947, - "z": "f234e69c.c27828", + "x": 1759.7465896606445, + "y": 193.98352146148682, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "2bfd5f0a.c7681", + "id": "d0785948.131e88", "type": "set", "name": "set new vnf_length", "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n", "comments": "", - "x": 1293.5318145751953, - "y": 276.0313377380371, - "z": "f234e69c.c27828", + "x": 1305.746109008789, + "y": 213.26918148994446, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "593b4cfd.497904", + "id": "2097a67.fbc2c5a", "type": "save", "name": "update deviceInstance configuration in AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.device-id = $prop.vnf-id' >\n<parameter name='device-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />\n", "comments": "", "outputs": 1, - "x": 1103.5312805175781, - "y": 891.0312745571136, - "z": "f234e69c.c27828", + "x": 1115.7455749511719, + "y": 828.269118309021, + "z": "842fbc05.cce04", "wires": [ [] ] }, { - "id": "ac207b07.0b4de8", + "id": "d5a722bf.9d266", "type": "for", "name": "for each existing VNF", "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1109.5313186645508, - "y": 343.03128695487976, - "z": "f234e69c.c27828", + "x": 1121.7456130981445, + "y": 280.2691307067871, + "z": "842fbc05.cce04", "wires": [ [ - "d4f21952.f2dd68" + "aceae556.187d88" ] ] }, { - "id": "4fb64c02.89a0b4", + "id": "7b2ea8f.f293e58", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1646.1031284332275, - "y": 391.17424178123474, - "z": "f234e69c.c27828", + "x": 1658.3174228668213, + "y": 328.4120855331421, + "z": "842fbc05.cce04", "wires": [ [ - "1752f719.1e90a9" + "6db207f2.3f0a88" ] ] }, { - "id": "1752f719.1e90a9", + "id": "6db207f2.3f0a88", "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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n", "comments": "", - "x": 1784.6744861602783, - "y": 391.17420268058777, - "z": "f234e69c.c27828", + "x": 1796.888780593872, + "y": 328.4120464324951, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "1b529b77.5e22e5", + "id": "f8ea0727.32b188", "type": "comment", "name": "make sure this vnf-id doesn't exist already", "info": "", "comments": "", - "x": 1739.959602355957, - "y": 520.174124956131, - "z": "f234e69c.c27828", + "x": 1752.1738967895508, + "y": 457.41196870803833, + "z": "842fbc05.cce04", "wires": [] }, { - "id": "d4f21952.f2dd68", + "id": "aceae556.187d88", "type": "switchNode", "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id", "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n", "comments": "", "outputs": 1, - "x": 1448.5313262939453, - "y": 344.0312898159027, - "z": "f234e69c.c27828", + "x": 1460.745620727539, + "y": 281.26913356781006, + "z": "842fbc05.cce04", "wires": [ [ - "4fb64c02.89a0b4" + "7b2ea8f.f293e58" ] ] }, { - "id": "93472449.69d418", + "id": "ff98826e.6bc6d", "type": "set", "name": "set sdncCreate to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"sdncCreate\" />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.sdncCreate`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n", "comments": "", - "x": 616.5313682556152, - "y": 924.0312774181366, - "z": "f234e69c.c27828", + "x": 628.745662689209, + "y": 861.269121170044, + "z": "842fbc05.cce04", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json index 56aa38d2..c4a03e72 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json @@ -1,20 +1,20 @@ [ { - "id": "28277ffa.638ba", + "id": "6b385e45.7a3f5", "type": "dgstart", "name": "DGSTART", "outputs": 1, "x": 139.57137298583984, - "y": 52.00390625, - "z": "3dfa2ee1.d9eb62", + "y": 40, + "z": "757466fd.415308", "wires": [ [ - "4a59deb7.c7457" + "1dde2ff0.4c745" ] ] }, { - "id": "4a59deb7.c7457", + "id": "1dde2ff0.4c745", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -23,293 +23,294 @@ "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": 214.8570785522461, - "y": 92.24201774597168, - "z": "3dfa2ee1.d9eb62", + "y": 80.23811149597168, + "z": "757466fd.415308", "wires": [ [ - "4241d8c0.16daf8" + "ea4d719e.008e2" ] ] }, { - "id": "4241d8c0.16daf8", + "id": "ea4d719e.008e2", "type": "method", "name": "method sdwan-vnf-topology-operation-device-deactivate", "xml": "<method rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync'>\n", "comments": "", "outputs": 1, "x": 208, - "y": 132.0039005279541, - "z": "3dfa2ee1.d9eb62", + "y": 119.9999942779541, + "z": "757466fd.415308", "wires": [ [ - "e1131c3b.26e86" + "8022f97f.a9e9c8" ] ] }, { - "id": "e1131c3b.26e86", + "id": "8022f97f.a9e9c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 232.73810195922852, - "y": 322.69744873046875, - "z": "3dfa2ee1.d9eb62", + "y": 310.69354248046875, + "z": "757466fd.415308", "wires": [ [ - "f0fdfb5e.5f4f98", - "f90e57ef.2882a8", - "7e2abc70.e22d84", - "c34a88b2.04b7e8", - "270267d5.5e26e8", - "58a16fad.ea89b", - "90a0a7b1.52f328", - "f53c993f.c19e48", - "30405ea5.d01402", - "6f2e8f06.6beb6", - "8a59eab6.8ca808", - "fd82888d.de41f8", - "86982181.80824" + "fe2f71f.5a0549", + "90ac7c05.1df59", + "62c2b68c.cb8668", + "2f2e6d66.de0b42", + "499b8fd4.89df6", + "60947bb5.977bb4", + "e2cd50c2.c2f0d", + "b764369b.fbe158", + "5d47732a.38d94c", + "58377091.27285", + "dac79818.50d828", + "744539f4.efb448", + "560d559f.36474c", + "d89f363a.ca5158" ] ] }, { - "id": "f0fdfb5e.5f4f98", + "id": "fe2f71f.5a0549", "type": "set", "name": "set vnf in service-data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />", "comments": "", "x": 488.57144927978516, - "y": 745.0041379928589, - "z": "3dfa2ee1.d9eb62", + "y": 733.0002317428589, + "z": "757466fd.415308", "wires": [] }, { - "id": "f90e57ef.2882a8", + "id": "90ac7c05.1df59", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", "x": 510.12699127197266, - "y": 787.2263488769531, - "z": "3dfa2ee1.d9eb62", + "y": 775.2224426269531, + "z": "757466fd.415308", "wires": [] }, { - "id": "c34a88b2.04b7e8", + "id": "2f2e6d66.de0b42", "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": 468.90482330322266, - "y": 949.7816972732544, - "z": "3dfa2ee1.d9eb62", + "y": 937.7777910232544, + "z": "757466fd.415308", "wires": [] }, { - "id": "86982181.80824", + "id": "560d559f.36474c", "type": "update", "name": "update SDWAN DeviceInstance status to AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='operational-status' value='PendingDelete' />", "comments": "", "outputs": 1, "x": 559.2344131469727, - "y": 890.1517286300659, - "z": "3dfa2ee1.d9eb62", + "y": 878.1478223800659, + "z": "757466fd.415308", "wires": [ [] ] }, { - "id": "7e2abc70.e22d84", + "id": "62c2b68c.cb8668", "type": "set", "name": "set vnf-level-oper-status to PendingDelete", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", "x": 548.5714797973633, - "y": 844.0041055679321, - "z": "3dfa2ee1.d9eb62", + "y": 832.0001993179321, + "z": "757466fd.415308", "wires": [] }, { - "id": "6f2e8f06.6beb6", + "id": "58377091.27285", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, "x": 515.1269454956055, - "y": 372.00386905670166, - "z": "3dfa2ee1.d9eb62", + "y": 359.99996280670166, + "z": "757466fd.415308", "wires": [ [ - "f6a1b10b.feba7", - "3f65fa89.adee86", - "78d7b0ce.bc9f4" + "8b902f30.1edc8", + "b3b7e1bd.bb3c3", + "92ad4991.dcb358" ] ] }, { - "id": "f6a1b10b.feba7", + "id": "8b902f30.1edc8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, "x": 742.126953125, - "y": 300.00386810302734, - "z": "3dfa2ee1.d9eb62", + "y": 287.99996185302734, + "z": "757466fd.415308", "wires": [ [ - "7f8f918f.20ef" + "59a1f255.7388fc" ] ] }, { - "id": "7f8f918f.20ef", + "id": "59a1f255.7388fc", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", "x": 940.627067565918, - "y": 291.003867149353, - "z": "3dfa2ee1.d9eb62", + "y": 278.999960899353, + "z": "757466fd.415308", "wires": [] }, { - "id": "3f65fa89.adee86", + "id": "b3b7e1bd.bb3c3", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, "x": 744.6178817749023, - "y": 332.577880859375, - "z": "3dfa2ee1.d9eb62", + "y": 320.573974609375, + "z": "757466fd.415308", "wires": [ [ - "d39e70d3.4d393" + "ed08291.4824fd8" ] ] }, { - "id": "d39e70d3.4d393", + "id": "ed08291.4824fd8", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", "x": 921.1893501281738, - "y": 329.86363315582275, - "z": "3dfa2ee1.d9eb62", + "y": 317.85972690582275, + "z": "757466fd.415308", "wires": [] }, { - "id": "78d7b0ce.bc9f4", + "id": "92ad4991.dcb358", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, "x": 736.9508895874023, - "y": 373.91119384765625, - "z": "3dfa2ee1.d9eb62", + "y": 361.90728759765625, + "z": "757466fd.415308", "wires": [ [ - "9d02040e.b8d128" + "67ab99c4.008378" ] ] }, { - "id": "9d02040e.b8d128", + "id": "67ab99c4.008378", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", "x": 924.723445892334, - "y": 369.35038661956787, - "z": "3dfa2ee1.d9eb62", + "y": 357.34648036956787, + "z": "757466fd.415308", "wires": [] }, { - "id": "8a59eab6.8ca808", + "id": "dac79818.50d828", "type": "execute", "name": "execute RestApiCallNode Get token", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, "x": 538.0155982971191, - "y": 438.1150779724121, - "z": "3dfa2ee1.d9eb62", + "y": 426.1111717224121, + "z": "757466fd.415308", "wires": [ [ - "26f9897c.dede86", - "de10be74.3d175" + "4b92ddae.b11014", + "be0fd00e.58fcb" ] ] }, { - "id": "26f9897c.dede86", + "id": "4b92ddae.b11014", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, "x": 773.0155982971191, - "y": 416.1150779724121, - "z": "3dfa2ee1.d9eb62", + "y": 404.1111717224121, + "z": "757466fd.415308", "wires": [ [ - "2cf72494.6f564c" + "3d2c2dc.5e83ed2" ] ] }, { - "id": "de10be74.3d175", + "id": "be0fd00e.58fcb", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, "x": 765.2655982971191, - "y": 469.75796127319336, - "z": "3dfa2ee1.d9eb62", + "y": 457.75405502319336, + "z": "757466fd.415308", "wires": [ [ - "af0aa9cf.0f24c8" + "4aad0852.c2e288" ] ] }, { - "id": "2cf72494.6f564c", + "id": "3d2c2dc.5e83ed2", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", "x": 927.0155982971191, - "y": 417.1150779724121, - "z": "3dfa2ee1.d9eb62", + "y": 405.1111717224121, + "z": "757466fd.415308", "wires": [] }, { - "id": "d3b082c5.69f01", + "id": "6cd389a6.9d2038", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, "x": 874.1268157958984, - "y": 653.1151113510132, - "z": "3dfa2ee1.d9eb62", + "y": 641.1112051010132, + "z": "757466fd.415308", "wires": [ [ - "99768bda.9cb4d8" + "dbb22ce5.43a74" ] ] }, { - "id": "99768bda.9cb4d8", + "id": "dbb22ce5.43a74", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", @@ -317,14 +318,14 @@ "comments": "", "outputs": 1, "x": 1045.2378311157227, - "y": 651.8929319381714, - "z": "3dfa2ee1.d9eb62", + "y": 639.8890256881714, + "z": "757466fd.415308", "wires": [ [] ] }, { - "id": "af0aa9cf.0f24c8", + "id": "4aad0852.c2e288", "type": "block", "name": "block", "xml": "<block>\n", @@ -332,101 +333,101 @@ "comments": "", "outputs": 1, "x": 913.1266403198242, - "y": 466.00391006469727, - "z": "3dfa2ee1.d9eb62", + "y": 454.00000381469727, + "z": "757466fd.415308", "wires": [ [] ] }, { - "id": "2e0a17d4.eed478", + "id": "2c8ab183.9108ce", "type": "comment", "name": "Do Nothing", "info": "", "comments": "", "x": 1048.6822141011553, - "y": 464.89278581407336, - "z": "3dfa2ee1.d9eb62", + "y": 452.88887956407336, + "z": "757466fd.415308", "wires": [] }, { - "id": "333f615c.44144e", + "id": "532a6f26.ee36", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, "x": 870.6823692321777, - "y": 706.4483976364136, - "z": "3dfa2ee1.d9eb62", + "y": 694.4444913864136, + "z": "757466fd.415308", "wires": [ [ - "d0bb3a12.db6658" + "e576dd47.e4d2d" ] ] }, { - "id": "d0bb3a12.db6658", + "id": "e576dd47.e4d2d", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", "x": 1015.6823692321777, - "y": 709.4483976364136, - "z": "3dfa2ee1.d9eb62", + "y": 697.4444913864136, + "z": "757466fd.415308", "wires": [] }, { - "id": "d3422f84.faf5e", + "id": "39a32b24.2df714", "type": "comment", "name": "deviceId need to provide here?", "info": "", "comments": "", - "x": 509.9047050476074, - "y": 504.00390625, - "z": "3dfa2ee1.d9eb62", + "x": 543.9046936035156, + "y": 520.0000066757202, + "z": "757466fd.415308", "wires": [] }, { - "id": "f9274c25.d5eea", + "id": "8d34776a.67e9e8", "type": "comment", "name": "tmp.thirdparty-sdnc-id to be hardcoded here?", "info": "", "comments": "", "x": 563.9047393798828, - "y": 291.0039653778076, - "z": "3dfa2ee1.d9eb62", + "y": 279.0000591278076, + "z": "757466fd.415308", "wires": [] }, { - "id": "4a930baa.676754", + "id": "be71552d.8c5378", "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": 803.904655456543, - "y": 1694.3372421264648, - "z": "3dfa2ee1.d9eb62", + "y": 1682.3333358764648, + "z": "757466fd.415308", "wires": [] }, { - "id": "270267d5.5e26e8", + "id": "499b8fd4.89df6", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, "x": 547.6026229858398, - "y": 220.03515625, - "z": "3dfa2ee1.d9eb62", + "y": 208.03125, + "z": "757466fd.415308", "wires": [ [ - "728ab8ba.7e8bd8" + "fbacdb2a.2187b8" ] ] }, { - "id": "728ab8ba.7e8bd8", + "id": "fbacdb2a.2187b8", "type": "block", "name": "block", "xml": "<block>\n", @@ -434,194 +435,208 @@ "comments": "", "outputs": 1, "x": 795.9522171020508, - "y": 220.5752239227295, - "z": "3dfa2ee1.d9eb62", + "y": 208.5713176727295, + "z": "757466fd.415308", "wires": [ [ - "905ea52f.02efa8" + "14a96fbf.04e25" ] ] }, { - "id": "905ea52f.02efa8", + "id": "14a96fbf.04e25", "type": "switchNode", "name": "switch vnfid found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, "x": 950.0318145751953, - "y": 220.28530597686768, - "z": "3dfa2ee1.d9eb62", + "y": 208.28139972686768, + "z": "757466fd.415308", "wires": [ [ - "7e04ad09.ef3004" + "f8b23c28.656e4" ] ] }, { - "id": "873538e6.7c6cb8", + "id": "decdca7b.a91d08", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 1243.6293258666992, - "y": 221.58561897277832, - "z": "3dfa2ee1.d9eb62", + "y": 209.58171272277832, + "z": "757466fd.415308", "wires": [ [ - "3c1b116b.de0f4e", - "2734bda2.1de7a2", - "79d2ab5b.7f7124" + "fd53ee3f.07fb6", + "d1d20e74.92e38", + "ca9cc0c9.c9a05" ] ] }, { - "id": "7e04ad09.ef3004", + "id": "f8b23c28.656e4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, "x": 1104.9838066101074, - "y": 221.17798519134521, - "z": "3dfa2ee1.d9eb62", + "y": 209.17407894134521, + "z": "757466fd.415308", "wires": [ [ - "873538e6.7c6cb8" + "decdca7b.a91d08" ] ] }, { - "id": "2734bda2.1de7a2", + "id": "d1d20e74.92e38", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n", "comments": "", "x": 1484.9621810913086, - "y": 177.58567905426025, - "z": "3dfa2ee1.d9eb62", + "y": 165.58177280426025, + "z": "757466fd.415308", "wires": [] }, { - "id": "3c1b116b.de0f4e", + "id": "fd53ee3f.07fb6", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n", "comments": "", "x": 1512.5158920288086, - "y": 130.92804336547852, - "z": "3dfa2ee1.d9eb62", + "y": 118.92413711547852, + "z": "757466fd.415308", "wires": [] }, { - "id": "79d2ab5b.7f7124", + "id": "ca9cc0c9.c9a05", "type": "call", "name": "call sdwan-get-device-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-device-param' mode='sync' >\n", "comments": "", "outputs": 1, "x": 1489.6026306152344, - "y": 240.03514957427979, - "z": "3dfa2ee1.d9eb62", + "y": 228.03124332427979, + "z": "757466fd.415308", "wires": [ [] ] }, { - "id": "58a16fad.ea89b", + "id": "60947bb5.977bb4", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, "x": 464.60262298583984, - "y": 262.03515625, - "z": "3dfa2ee1.d9eb62", + "y": 250.03125, + "z": "757466fd.415308", "wires": [ [ - "dde49dff.66ec" + "b9a00e35.ec566" ] ] }, { - "id": "dde49dff.66ec", + "id": "b9a00e35.ec566", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, "x": 612.0312652587891, - "y": 261.6065664291382, - "z": "3dfa2ee1.d9eb62", + "y": 249.60266017913818, + "z": "757466fd.415308", "wires": [ [ - "94b39f5e.140ba" + "32fbaa62.824b86" ] ] }, { - "id": "94b39f5e.140ba", + "id": "32fbaa62.824b86", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", "x": 761.4599914550781, - "y": 262.7494840621948, - "z": "3dfa2ee1.d9eb62", + "y": 250.74557781219482, + "z": "757466fd.415308", "wires": [] }, { - "id": "fd82888d.de41f8", + "id": "744539f4.efb448", "type": "execute", "name": "execute RestApiCallNode delete Devcie Instance", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, "x": 580.6026992797852, - "y": 676.0352630615234, - "z": "3dfa2ee1.d9eb62", + "y": 664.0313568115234, + "z": "757466fd.415308", "wires": [ [ - "d3b082c5.69f01", - "333f615c.44144e" + "6cd389a6.9d2038", + "532a6f26.ee36" ] ] }, { - "id": "90a0a7b1.52f328", + "id": "e2cd50c2.c2f0d", "type": "execute", "name": "execute Properties", "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": 488.60262298583984, - "y": 326.03515625, - "z": "3dfa2ee1.d9eb62", + "y": 314.03125, + "z": "757466fd.415308", "wires": [ [] ] }, { - "id": "f53c993f.c19e48", + "id": "b764369b.fbe158", "type": "set", "name": "set device Id length and deviceId", "xml": "<set>\n<parameter name='prop.devices[0]' value='`$prop.device.deviceId`' />\n\n\n", "comments": "", "x": 520.6026458740234, - "y": 613.0351934432983, - "z": "3dfa2ee1.d9eb62", + "y": 601.0312871932983, + "z": "757466fd.415308", "wires": [] }, { - "id": "30405ea5.d01402", + "id": "5d47732a.38d94c", "type": "set", "name": "set device Id length and deviceId", "xml": "<set>\n<parameter name='prop.devices_length' value='1' />\n\n\n", "comments": "", "x": 524.6026229858398, - "y": 571.03515625, - "z": "3dfa2ee1.d9eb62", + "y": 559.03125, + "z": "757466fd.415308", "wires": [] + }, + { + "id": "d89f363a.ca5158", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 531.00390625, + "y": 476.00390625, + "z": "757466fd.415308", + "wires": [ + [] + ] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json index cc7b1261..af804739 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json @@ -1,20 +1,20 @@ [ { - "id": "426569df.8612f8", + "id": "d3e08805.9611b8", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 120.00390625, - "y": 238.75390625, - "z": "2525d6cd.61f35a", + "x": 83, + "y": 24, + "z": "c5494b7.49969b8", "wires": [ [ - "7d6fafb.3ddd95" + "f7dace5a.d2c9a" ] ] }, { - "id": "7d6fafb.3ddd95", + "id": "f7dace5a.d2c9a", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1571 +22,1586 @@ "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": 268.2895965576172, - "y": 288.99201488494873, - "z": "2525d6cd.61f35a", + "x": 214.2856903076172, + "y": 73.23810863494873, + "z": "c5494b7.49969b8", "wires": [ [ - "7af8806b.3ecd7" + "83935545.c771a8" ] ] }, { - "id": "7af8806b.3ecd7", + "id": "83935545.c771a8", "type": "method", "name": "method sdwan-vnf-topology-operation-wanport-activate", "xml": "<method rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 271.4325256347656, - "y": 373.75393867492676, - "z": "2525d6cd.61f35a", + "x": 217.42861938476562, + "y": 158.00003242492676, + "z": "c5494b7.49969b8", "wires": [ [ - "63259a1d.b752b4" + "5c798a65.20eb74" ] ] }, { - "id": "63259a1d.b752b4", + "id": "5c798a65.20eb74", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 334.67066192626953, - "y": 979.420895576477, - "z": "2525d6cd.61f35a", - "wires": [ - [ - "ff4c2e55.307e9", - "36b7eecd.26eef2", - "236a2d57.6cfe02", - "7b3df5af.3ce7ac", - "21db1d94.b93312", - "b01a2888.afc958", - "8814bd0.a9cd04", - "a3b723.963fa8e", - "eefe56c7.aeba48", - "1d7f590a.25aba7", - "4f9762f1.7b8f7c", - "739bdc62.97be04", - "e93ff52d.80faa8", - "378b7e77.9ee662", - "8569d96f.59e838", - "2af7b981.494176", - "66231f4c.1fe22", - "d3523f5e.150e2", - "ce5ce7ac.be3938", - "a1d99b62.d31458" - ] - ] - }, - { - "id": "ff4c2e55.307e9", + "x": 280.66675567626953, + "y": 763.666989326477, + "z": "c5494b7.49969b8", + "wires": [ + [ + "71d2a775.99ccc8", + "86f28d21.8ff7e", + "1d544933.c7e8c7", + "50fcdc11.a23244", + "a2033bb8.c74a28", + "f2405d05.22028", + "ec56abe8.7b3a98", + "c179291d.00bde8", + "c25408f5.164608", + "7e3b6576.8de5bc", + "e9a4c8c8.051068", + "9ac8f49c.624348", + "20fab8b2.cf42c8", + "833ee131.2bc86", + "37df268d.80523a", + "d3956bf2.5c5588", + "6f1e3f39.5773", + "f462086d.871178", + "47d46647.d7f098", + "24dcefec.86843", + "589c7732.243f08" + ] + ] + }, + { + "id": "71d2a775.99ccc8", "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": 659.3384132385254, - "y": 1777.088438987732, - "z": "2525d6cd.61f35a", + "x": 605.3345069885254, + "y": 1561.334532737732, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "1d7f590a.25aba7", + "id": "7e3b6576.8de5bc", "type": "execute", "name": "execute RestApiCallNode device port create", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 749.3380165100098, - "y": 974.643404006958, - "z": "2525d6cd.61f35a", + "x": 695.3341102600098, + "y": 758.889497756958, + "z": "c5494b7.49969b8", "wires": [ [ - "53451b0.d0c27e4", - "d2d2e81c.454428" + "68948952.c50068", + "b1429997.066598" ] ] }, { - "id": "53451b0.d0c27e4", + "id": "68948952.c50068", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 998.3380756378174, - "y": 988.6436100006104, - "z": "2525d6cd.61f35a", + "x": 944.3341693878174, + "y": 772.8897037506104, + "z": "c5494b7.49969b8", "wires": [ [ - "eca1c460.e76228" + "4a0bff89.5f70e" ] ] }, { - "id": "d2d2e81c.454428", + "id": "b1429997.066598", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 998.3380756378174, - "y": 950.6434454917908, - "z": "2525d6cd.61f35a", + "x": 944.3341693878174, + "y": 734.8895392417908, + "z": "c5494b7.49969b8", "wires": [ [ - "104d6c7d.be4024" + "3a88421d.260dee" ] ] }, { - "id": "104d6c7d.be4024", + "id": "3a88421d.260dee", "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=\"Error executing Create device port rest api\" />\n", "comments": "", - "x": 1142.3384094238281, - "y": 949.6434450149536, - "z": "2525d6cd.61f35a", + "x": 1088.3345031738281, + "y": 733.8895387649536, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "eca1c460.e76228", + "id": "4a0bff89.5f70e", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1145.3380870819092, - "y": 989.6434488296509, - "z": "2525d6cd.61f35a", + "x": 1091.3341808319092, + "y": 773.8895425796509, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "4f9762f1.7b8f7c", + "id": "e9a4c8c8.051068", "type": "execute", "name": "execute RestApiCallNode get transport network info", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"transportNetworksResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 772.0043678283691, - "y": 1153.7545094490051, - "z": "2525d6cd.61f35a", + "x": 718.0004615783691, + "y": 938.0006031990051, + "z": "c5494b7.49969b8", "wires": [ [ - "af3e9c1f.7be91", - "394b70c0.ac6f" + "2354042c.5855cc", + "d065ad9e.5a092" ] ] }, { - "id": "e93ff52d.80faa8", + "id": "20fab8b2.cf42c8", "type": "execute", "name": "execute RestApiCallNode wan port create", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 745.0044593811035, - "y": 1390.754557609558, - "z": "2525d6cd.61f35a", + "x": 691.0005531311035, + "y": 1175.000651359558, + "z": "c5494b7.49969b8", "wires": [ [ - "727c41a7.9551b", - "51280d82.cd5cc4" + "55b035dc.e280bc", + "317ef84d.a3fa48" ] ] }, { - "id": "36b7eecd.26eef2", + "id": "86f28d21.8ff7e", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 731.0248413085938, - "y": 317.77481842041016, - "z": "2525d6cd.61f35a", + "x": 677.0209350585938, + "y": 102.02091217041016, + "z": "c5494b7.49969b8", "wires": [ [ - "7f1fbca4.9489e4", - "5c724185.8e516", - "5b28fd04.e48584" + "63db3e02.79edb", + "4a9b0d37.8bb004", + "a6fa95c8.c66c58" ] ] }, { - "id": "7f1fbca4.9489e4", + "id": "63db3e02.79edb", "type": "other", "name": "Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 983.0248756408691, - "y": 318.77489948272705, - "z": "2525d6cd.61f35a", + "x": 929.0209693908691, + "y": 103.02099323272705, + "z": "c5494b7.49969b8", "wires": [ [ - "9ce50f4e.b2fc8" + "9de50dea.b6dd6" ] ] }, { - "id": "9ce50f4e.b2fc8", + "id": "9de50dea.b6dd6", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1144.8026237487793, - "y": 298.66384649276733, - "z": "2525d6cd.61f35a", + "x": 1090.7987174987793, + "y": 82.90994024276733, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "5c724185.8e516", + "id": "4a9b0d37.8bb004", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 976.0252838134766, - "y": 351.7749032974243, - "z": "2525d6cd.61f35a", + "x": 922.0213775634766, + "y": 136.02099704742432, + "z": "c5494b7.49969b8", "wires": [ [ - "85017b74.ea3478" + "debc8f64.af94a" ] ] }, { - "id": "85017b74.ea3478", + "id": "debc8f64.af94a", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 994.2947769165039, - "y": 514.3294858932495, - "z": "2525d6cd.61f35a", + "x": 945.2908935546875, + "y": 234.57559204101562, + "z": "c5494b7.49969b8", "wires": [ [ - "6e42e95a.0ecb68", - "f672c022.be35c", - "59c48b6.04c5c74", - "5cf9118c.68854", - "388b05e0.8ee79a" + "7c8738b1.877ca8", + "943a7232.2883e", + "b75d8380.35bfa", + "13bc1f79.03e581", + "53d7471c.3e1cc8" ] ] }, { - "id": "6e42e95a.0ecb68", + "id": "7c8738b1.877ca8", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1279.3109436035156, - "y": 344.20346450805664, - "z": "2525d6cd.61f35a", + "x": 1225.3070373535156, + "y": 128.44955825805664, + "z": "c5494b7.49969b8", "wires": [ [ - "7f2ca034.081d2" + "c2d9f7f0.e01aa8" ] ] }, { - "id": "f672c022.be35c", + "id": "943a7232.2883e", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1205.612247467041, - "y": 490.18669986724854, - "z": "2525d6cd.61f35a", + "x": 1151.608341217041, + "y": 274.43279361724854, + "z": "c5494b7.49969b8", "wires": [ [ - "40c5bcb3.8f3694" + "ea056417.1dc458" ] ] }, { - "id": "40c5bcb3.8f3694", + "id": "ea056417.1dc458", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1353.0408897399902, - "y": 489.7581100463867, - "z": "2525d6cd.61f35a", + "x": 1299.0369834899902, + "y": 274.0042037963867, + "z": "c5494b7.49969b8", "wires": [ [ - "8c183b0a.c20d58" + "b740de23.ab078" ] ] }, { - "id": "52d419f2.072bd8", + "id": "8f939166.1a702", "type": "switchNode", "name": "switch vnfid found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1652.7401733398438, - "y": 343.45362663269043, - "z": "2525d6cd.61f35a", + "x": 1598.7362670898438, + "y": 127.69972038269043, + "z": "c5494b7.49969b8", "wires": [ [ - "7d43258f.b6dc1c" + "32b14615.3ef46a" ] ] }, { - "id": "8c183b0a.c20d58", + "id": "b740de23.ab078", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1502.4696159362793, - "y": 490.90102767944336, - "z": "2525d6cd.61f35a", + "x": 1448.4657096862793, + "y": 275.14712142944336, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "7d43258f.b6dc1c", + "id": "32b14615.3ef46a", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1807.6921653747559, - "y": 344.34630584716797, - "z": "2525d6cd.61f35a", + "x": 1753.6882591247559, + "y": 128.59239959716797, + "z": "c5494b7.49969b8", "wires": [ [ - "7b4fae02.aca0c" + "d8c80e8.07446f" ] ] }, { - "id": "5f826b27.adc144", + "id": "bf24dea8.ee4f4", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n", "comments": "", - "x": 2215.224250793457, - "y": 254.09636402130127, - "z": "2525d6cd.61f35a", + "x": 2161.220344543457, + "y": 38.34245777130127, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "5b28fd04.e48584", + "id": "a6fa95c8.c66c58", "type": "outcome", "name": "0", "xml": "<outcome value='0'>\n", "comments": "", "outputs": 1, - "x": 984.9936256408691, - "y": 282.74358558654785, - "z": "2525d6cd.61f35a", + "x": 930.9897193908691, + "y": 66.98967933654785, + "z": "c5494b7.49969b8", "wires": [ [ - "9ce50f4e.b2fc8" + "9de50dea.b6dd6" ] ] }, { - "id": "378b7e77.9ee662", + "id": "833ee131.2bc86", "type": "set", "name": "set device PortId to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n", "comments": "", - "x": 711.9948043823242, - "y": 1513.744936466217, - "z": "2525d6cd.61f35a", + "x": 657.9908981323242, + "y": 1297.991030216217, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "b1043d5b.c9816", + "id": "3f244f2b.bb62c", "type": "comment", "name": "Get siteId from site resource created for this service", "info": "", "comments": "", - "x": 756.9938888549805, - "y": 503.07712268829346, - "z": "2525d6cd.61f35a", + "x": 702.9899826049805, + "y": 287.32321643829346, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "7f2ca034.081d2", + "id": "c2d9f7f0.e01aa8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1498.6605758666992, - "y": 343.74354457855225, - "z": "2525d6cd.61f35a", + "x": 1444.6566696166992, + "y": 127.98963832855225, + "z": "c5494b7.49969b8", "wires": [ [ - "52d419f2.072bd8" + "8f939166.1a702" ] ] }, { - "id": "236a2d57.6cfe02", + "id": "1d544933.c7e8c7", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", - "x": 692.5501174926758, - "y": 1655.9668502807617, - "z": "2525d6cd.61f35a", + "x": 638.5462112426758, + "y": 1440.2129440307617, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "7b3df5af.3ce7ac", + "id": "50fcdc11.a23244", "type": "set", "name": "set vnf-level-oper-status to Active", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 709.9945793151855, - "y": 1695.744686126709, - "z": "2525d6cd.61f35a", + "x": 655.9906730651855, + "y": 1479.990779876709, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "a1d99b62.d31458", + "id": "24dcefec.86843", "type": "update", - "name": "save SDWAN wan port instance configuration in AAI", + "name": "update SDWAN wan port instance configuration in AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n", "comments": "", "outputs": 1, - "x": 772.6575050354004, - "y": 1734.8921480178833, - "z": "2525d6cd.61f35a", + "x": 718.6535987854004, + "y": 1519.1382417678833, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "44786d4c.78c0b4", + "id": "d2796204.52637", "type": "set", "name": "set prop.wan.transportNetworkId", "xml": "<set>\n<parameter name='prop.wan.transportNetworkId' value='`$transportNetworksResp.data.transportNetworks[$tidx].id`' />\n", "comments": "", - "x": 1526.995449066162, - "y": 1230.7445812225342, - "z": "2525d6cd.61f35a", + "x": 1472.991542816162, + "y": 1014.9906749725342, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "ce5ce7ac.be3938", + "id": "47d46647.d7f098", "type": "for", "name": "for loop sidx - Get siteId from servicedata", "xml": "<for index=\"sidx\" start=\"0\" end=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 736.9939117431641, - "y": 653.7437791824341, - "z": "2525d6cd.61f35a", + "x": 682.9900054931641, + "y": 437.9898729324341, + "z": "c5494b7.49969b8", "wires": [ [ - "4aaf0dac.f4bd44" + "76cf61ce.029d7" ] ] }, { - "id": "3237e366.c0b81c", + "id": "86accd11.8f202", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n", "comments": "", "outputs": 1, - "x": 1167.994239807129, - "y": 654.7439098358154, - "z": "2525d6cd.61f35a", + "x": 1113.990333557129, + "y": 438.99000358581543, + "z": "c5494b7.49969b8", "wires": [ [ - "c0bb2f42.b3aaf" + "381535ee.b503aa" ] ] }, { - "id": "c0bb2f42.b3aaf", + "id": "381535ee.b503aa", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1305.9946975708008, - "y": 652.7438945770264, - "z": "2525d6cd.61f35a", + "x": 1251.9907913208008, + "y": 436.98998832702637, + "z": "c5494b7.49969b8", "wires": [ [ - "1433eee.8c0de11" + "c7f6c6b6.dd3458" ] ] }, { - "id": "1433eee.8c0de11", + "id": "c7f6c6b6.dd3458", "type": "set", "name": "set prop.wan.siteId", "xml": "<set>\n<parameter name='prop.wan.siteId' value='`$ctx.site.vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n\n\n", "comments": "", - "x": 1469.9947319030762, - "y": 654.3437480926514, - "z": "2525d6cd.61f35a", + "x": 1415.9908256530762, + "y": 438.58984184265137, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "739bdc62.97be04", + "id": "9ac8f49c.624348", "type": "execute", "name": "execute split ip and mask", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.wan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n", "comments": "", "outputs": 1, - "x": 695.9942359924316, - "y": 1299.0775499343872, - "z": "2525d6cd.61f35a", + "x": 641.9903297424316, + "y": 1083.3236436843872, + "z": "c5494b7.49969b8", "wires": [ [ - "fdf45f99.54463", - "bde78d5d.e4b42" + "341a4e7a.2ecb22", + "9814af82.14df1" ] ] }, { - "id": "bde78d5d.e4b42", + "id": "9814af82.14df1", "type": "failure", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 896.994255065918, - "y": 1277.0775413513184, - "z": "2525d6cd.61f35a", + "x": 842.990348815918, + "y": 1061.3236351013184, + "z": "c5494b7.49969b8", "wires": [ [ - "b4f4511b.838b7" + "5982d587.5c09fc" ] ] }, { - "id": "fdf45f99.54463", + "id": "341a4e7a.2ecb22", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 896.9942588806152, - "y": 1318.0775451660156, - "z": "2525d6cd.61f35a", + "x": 842.9903526306152, + "y": 1102.3236389160156, + "z": "c5494b7.49969b8", "wires": [ [ - "284d3324.0f7a9c" + "4b6a103e.cf1d" ] ] }, { - "id": "b4f4511b.838b7", + "id": "5982d587.5c09fc", "type": "set", "name": "set ipAddress prefixLength", "xml": "<set>\n<parameter name='prop.wan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.wan.prefixLength' value='`$ipandMask[1]`' />", "comments": "", - "x": 1093.9942741394043, - "y": 1275.0775413513184, - "z": "2525d6cd.61f35a", + "x": 1039.9903678894043, + "y": 1059.3236351013184, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "284d3324.0f7a9c", + "id": "4b6a103e.cf1d", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments": "", - "x": 1051.9942665100098, - "y": 1315.0775442123413, - "z": "2525d6cd.61f35a", + "x": 997.9903602600098, + "y": 1099.3236379623413, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "a3b723.963fa8e", + "id": "c179291d.00bde8", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 730.4940643310547, - "y": 753.7438306808472, - "z": "2525d6cd.61f35a", + "x": 657.4901733398438, + "y": 535.9899291992188, + "z": "c5494b7.49969b8", "wires": [ [ - "e9572be2.73ae58", - "29c0457e.12142a", - "d78bfaf1.6dc7f8" + "53c5bb3d.7c4004", + "c92ee85c.183de8", + "7eccd819.0a52e8" ] ] }, { - "id": "e9572be2.73ae58", + "id": "53c5bb3d.7c4004", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 943.4941635131836, - "y": 715.7438583374023, - "z": "2525d6cd.61f35a", + "x": 889.4902572631836, + "y": 499.98995208740234, + "z": "c5494b7.49969b8", "wires": [ [ - "b45f540f.db5988" + "2956fb6f.87c064" ] ] }, { - "id": "29c0457e.12142a", + "id": "c92ee85c.183de8", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 945.9850463867188, - "y": 751.3178949356079, - "z": "2525d6cd.61f35a", + "x": 891.9811401367188, + "y": 535.5639886856079, + "z": "c5494b7.49969b8", "wires": [ [ - "5afb7116.97e19" + "a9b78a3a.3499a8" ] ] }, { - "id": "d78bfaf1.6dc7f8", + "id": "7eccd819.0a52e8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 941.3180541992188, - "y": 787.6512537002563, - "z": "2525d6cd.61f35a", + "x": 887.3141479492188, + "y": 571.8973474502563, + "z": "c5494b7.49969b8", "wires": [ [ - "aca4c3f3.f6f79" + "47394338.72386c" ] ] }, { - "id": "aca4c3f3.f6f79", + "id": "47394338.72386c", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1095.0905456542969, - "y": 785.0903406143188, - "z": "2525d6cd.61f35a", + "x": 1041.0866394042969, + "y": 569.3364343643188, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "5afb7116.97e19", + "id": "a9b78a3a.3499a8", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1091.5564422607422, - "y": 749.6035823822021, - "z": "2525d6cd.61f35a", + "x": 1037.5525360107422, + "y": 533.8496761322021, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "b45f540f.db5988", + "id": "2956fb6f.87c064", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1103.9942741394043, - "y": 713.7437982559204, - "z": "2525d6cd.61f35a", + "x": 1049.9903678894043, + "y": 497.9898920059204, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "21db1d94.b93312", + "id": "a2033bb8.c74a28", "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=\"sdwan-wanport-vnf-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n", "comments": "", "outputs": 1, - "x": 649.0040016174316, - "y": 373.75393629074097, - "z": "2525d6cd.61f35a", + "x": 595.0000953674316, + "y": 158.00003004074097, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "b01a2888.afc958", + "id": "f2405d05.22028", "type": "execute", "name": "execute Properties", "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": 685.3061256408691, - "y": 408.7539801597595, - "z": "2525d6cd.61f35a", + "x": 631.3022193908691, + "y": 193.00007390975952, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "eefe56c7.aeba48", + "id": "c25408f5.164608", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 733.004207611084, - "y": 843.4208326339722, - "z": "2525d6cd.61f35a", + "x": 672.0003051757812, + "y": 623.6669311523438, + "z": "c5494b7.49969b8", "wires": [ [ - "f0beb476.3438c8", - "bfd1c15b.d1a6c" + "5b62dba.23a6724", + "b4713e29.c43a8" ] ] }, { - "id": "f0beb476.3438c8", + "id": "5b62dba.23a6724", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 961.004337310791, - "y": 825.420825958252, - "z": "2525d6cd.61f35a", + "x": 907.000431060791, + "y": 609.666919708252, + "z": "c5494b7.49969b8", "wires": [ [ - "7978fb11.837754" + "c924c712.8a8378" ] ] }, { - "id": "7978fb11.837754", + "id": "c924c712.8a8378", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1103.0043449401855, - "y": 824.4208269119263, - "z": "2525d6cd.61f35a", + "x": 1049.0004386901855, + "y": 608.6669206619263, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "518fd324.836c3c", + "id": "8c376d8d.f2769", "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=\"Error executing get token rest api\" />\n", "comments": "", - "x": 1109.0043449401855, - "y": 861.8138151168823, - "z": "2525d6cd.61f35a", + "x": 1055.0004386901855, + "y": 646.0599088668823, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "bfd1c15b.d1a6c", + "id": "b4713e29.c43a8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 960.254337310791, - "y": 861.0637331008911, - "z": "2525d6cd.61f35a", + "x": 906.250431060791, + "y": 645.3098268508911, + "z": "c5494b7.49969b8", "wires": [ [ - "518fd324.836c3c" + "8c376d8d.f2769" ] ] }, { - "id": "e5fec542.f96808", + "id": "332a8bf5.782ff4", "type": "switchNode", "name": "switch transportNetworkName same", "xml": "<switch test=\"`$transportNetworksResp.data.transportNetworks[$tidx].name == $prop.wan.transportNetworkName`\">\n\n", "comments": "", "outputs": 1, - "x": 1166.0050621032715, - "y": 1188.420979499817, - "z": "2525d6cd.61f35a", + "x": 1112.0011558532715, + "y": 972.6670732498169, + "z": "c5494b7.49969b8", "wires": [ [ - "5378ee5d.02dde" + "e5f6f7b4.354b98" ] ] }, { - "id": "5378ee5d.02dde", + "id": "e5f6f7b4.354b98", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1379.0045127868652, - "y": 1188.4208974838257, - "z": "2525d6cd.61f35a", + "x": 1325.0006065368652, + "y": 972.6669912338257, + "z": "c5494b7.49969b8", "wires": [ [ - "44786d4c.78c0b4" + "d2796204.52637" ] ] }, { - "id": "a080fa5f.ddeb88", + "id": "7105dd86.af6c34", "type": "switchNode", "name": "switch ActivateSDWANDeviceInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 1593.3375091552734, - "y": 420.753963470459, - "z": "2525d6cd.61f35a", + "x": 1539.3336029052734, + "y": 205.00005722045898, + "z": "c5494b7.49969b8", "wires": [ [ - "6c3d1f35.43a16" + "dd40279f.8eeea8" ] ] }, { - "id": "6c3d1f35.43a16", + "id": "dd40279f.8eeea8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1816.3375186920166, - "y": 420.753963470459, - "z": "2525d6cd.61f35a", + "x": 1762.3336124420166, + "y": 205.00005722045898, + "z": "c5494b7.49969b8", "wires": [ [ - "4f891fe5.5f59b" + "12149667.72f80a" ] ] }, { - "id": "57757525.a0de7c", + "id": "c1942dca.f90c1", "type": "set", "name": "set tmp.devicevidx", "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$vidx`' />\n\n", "comments": "", - "x": 2781.3368530273438, - "y": 851.7539882659912, - "z": "2525d6cd.61f35a", + "x": 2727.3329467773438, + "y": 636.0000820159912, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "388b05e0.8ee79a", + "id": "53d7471c.3e1cc8", "type": "switchNode", "name": "switch tmp.devicevidx", "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1246.3374366760254, - "y": 578.7540259361267, - "z": "2525d6cd.61f35a", + "x": 1192.3335304260254, + "y": 363.0001196861267, + "z": "c5494b7.49969b8", "wires": [ [ - "44f27715.04a478" + "4602555f.435cec" ] ] }, { - "id": "44f27715.04a478", + "id": "4602555f.435cec", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1430.7660026550293, - "y": 579.3254628181458, - "z": "2525d6cd.61f35a", + "x": 1376.7620964050293, + "y": 363.57155656814575, + "z": "c5494b7.49969b8", "wires": [ [ - "143c0c16.156cc4" + "5520e03f.96b18" ] ] }, { - "id": "143c0c16.156cc4", + "id": "5520e03f.96b18", "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=\"ActivateSDWANDeviceInstance not found in service-data\" />\n", "comments": "", - "x": 1571.1947441101074, - "y": 579.4683423042297, - "z": "2525d6cd.61f35a", + "x": 1517.1908378601074, + "y": 363.71443605422974, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "fd72d81.72be228", + "id": "6f8cf23f.0209dc", "type": "comment", "name": "Get deviceId from device resource created for this service", "info": "", "comments": "", - "x": 2230.6707916259766, - "y": 518.0872421264648, - "z": "2525d6cd.61f35a", + "x": 2176.6668853759766, + "y": 302.33333587646484, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "d06cae4f.399ba", + "id": "489eb82a.f952c8", "type": "for", "name": "for loop didx - Get deviceId from servicedata", "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2216.671001434326, - "y": 441.75388622283936, - "z": "2525d6cd.61f35a", + "x": 2162.667095184326, + "y": 225.99997997283936, + "z": "c5494b7.49969b8", "wires": [ [ - "cc06f146.51f0f" + "a840f568.e72fe8" ] ] }, { - "id": "fc2a7486.890a38", + "id": "b3441b30.aa4ab8", "type": "switchNode", "name": "switch name (DeviceName)", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'name'`\">\n", "comments": "", "outputs": 1, - "x": 2234.671600341797, - "y": 579.7541313171387, - "z": "2525d6cd.61f35a", + "x": 2180.667694091797, + "y": 364.0002250671387, + "z": "c5494b7.49969b8", "wires": [ [ - "e011449c.868068" + "fc0b9b1d.28c708" ] ] }, { - "id": "e011449c.868068", + "id": "fc0b9b1d.28c708", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2436.672092437744, - "y": 573.7541913986206, - "z": "2525d6cd.61f35a", + "x": 2382.668186187744, + "y": 358.0002851486206, + "z": "c5494b7.49969b8", "wires": [ [ - "4999ecb0.3d8164" + "b4f179c9.a214f8" ] ] }, { - "id": "4aaf0dac.f4bd44", + "id": "76cf61ce.029d7", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 999.0041046142578, - "y": 654.4206037521362, - "z": "2525d6cd.61f35a", + "x": 945.0001983642578, + "y": 438.66669750213623, + "z": "c5494b7.49969b8", "wires": [ [ - "3237e366.c0b81c" + "86accd11.8f202" ] ] }, { - "id": "cc06f146.51f0f", + "id": "a840f568.e72fe8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2009.003890991211, - "y": 578.4206323623657, - "z": "2525d6cd.61f35a", + "x": 1954.999984741211, + "y": 362.6667261123657, + "z": "c5494b7.49969b8", "wires": [ [ - "fc2a7486.890a38" + "b3441b30.aa4ab8" ] ] }, { - "id": "1d887fbe.2fb47", + "id": "556d9445.4f2e4c", "type": "switchNode", "name": "switch deviceId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n", "comments": "", "outputs": 1, - "x": 3080.0050506591797, - "y": 792.4209289550781, - "z": "2525d6cd.61f35a", + "x": 3026.0011444091797, + "y": 576.6670227050781, + "z": "c5494b7.49969b8", "wires": [ [ - "e9c4ed3a.99165" + "4439d129.bb0b6" ] ] }, { - "id": "e9c4ed3a.99165", + "id": "4439d129.bb0b6", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3233.0054206848145, - "y": 793.4210062026978, - "z": "2525d6cd.61f35a", + "x": 3179.0015144348145, + "y": 577.6670999526978, + "z": "c5494b7.49969b8", "wires": [ [ - "49a9daf2.48f304" + "8f56b9b3.9c5728" ] ] }, { - "id": "49a9daf2.48f304", + "id": "8f56b9b3.9c5728", "type": "set", "name": "set prop.wan.deviceId", "xml": "<set>\n<parameter name='prop.wan.deviceId' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n", "comments": "", - "x": 3402.0060272216797, - "y": 792.0210409164429, - "z": "2525d6cd.61f35a", + "x": 3348.0021209716797, + "y": 576.2671346664429, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "4f891fe5.5f59b", + "id": "12149667.72f80a", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1957.6708374023438, - "y": 442.75398349761963, - "z": "2525d6cd.61f35a", + "x": 1903.6669311523438, + "y": 227.00007724761963, + "z": "c5494b7.49969b8", "wires": [ [ - "d06cae4f.399ba" + "489eb82a.f952c8" ] ] }, { - "id": "4999ecb0.3d8164", + "id": "b4f179c9.a214f8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2255.0051345825195, - "y": 656.7541608810425, - "z": "2525d6cd.61f35a", + "x": 2201.0012283325195, + "y": 441.0002546310425, + "z": "c5494b7.49969b8", "wires": [ [ - "46a841ba.4af92" + "41b636f7.4605d8" ] ] }, { - "id": "c5bcabb0.9f3978", + "id": "3c83342b.bff06c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2644.0058403015137, - "y": 659.7542858123779, - "z": "2525d6cd.61f35a", + "x": 2590.0019340515137, + "y": 444.00037956237793, + "z": "c5494b7.49969b8", "wires": [ [ - "512e7a73.c439f4" + "d216e689.2df0f8" ] ] }, { - "id": "7b4fae02.aca0c", + "id": "d8c80e8.07446f", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1946.3376846313477, - "y": 344.7539396286011, - "z": "2525d6cd.61f35a", + "x": 1892.3337783813477, + "y": 129.00003337860107, + "z": "c5494b7.49969b8", "wires": [ [ - "5f826b27.adc144", - "3b7b404e.14ae9", - "11bb0a8f.c8a415", - "207a1eb2.66eaf2" + "bf24dea8.ee4f4", + "b88755ee.f99b38", + "be26bd6d.b6d6a", + "d34abb03.648a78" ] ] }, { - "id": "66231f4c.1fe22", + "id": "6f1e3f39.5773", "type": "set", "name": "set prop.wan.wanPortId", "xml": "<set>\n<parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />\n", "comments": "", - "x": 693.3285293579102, - "y": 1455.4113006591797, - "z": "2525d6cd.61f35a", + "x": 639.3246231079102, + "y": 1239.6573944091797, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "8569d96f.59e838", + "id": "37df268d.80523a", "type": "set", "name": "set prop.wan.devicePortId", "xml": "<set>\n<parameter name='prop.wan.devicePortId' value='`$portResp.success[0].id`' />\n", "comments": "", - "x": 703.9952239990234, - "y": 1036.7445602416992, - "z": "2525d6cd.61f35a", + "x": 649.9913177490234, + "y": 820.9906539916992, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "f2d45048.04d33", + "id": "99c82c97.d67a7", "type": "comment", "name": "Create port", "info": "", "comments": "", - "x": 651.0039558410645, - "y": 941.0874280929565, - "z": "2525d6cd.61f35a", + "x": 597.0000495910645, + "y": 725.3335218429565, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "f7f10711.f1f2c8", + "id": "5cfea39.096ff5c", "type": "comment", "name": "Get network id", "info": "", "comments": "", - "x": 702.0040283203125, - "y": 1119.0873865485191, - "z": "2525d6cd.61f35a", + "x": 648.0001220703125, + "y": 903.3334802985191, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "8a3200f.80e49", + "id": "d44c9330.7b098", "type": "comment", "name": "Create wan port", "info": "", "comments": "", - "x": 669.0041122436523, - "y": 1252.0875997543335, - "z": "2525d6cd.61f35a", + "x": 615.0002059936523, + "y": 1036.3336935043335, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "51280d82.cd5cc4", + "id": "317ef84d.a3fa48", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1031.0040283203125, - "y": 1350.7541456222534, - "z": "2525d6cd.61f35a", + "x": 977.0001220703125, + "y": 1135.0002393722534, + "z": "c5494b7.49969b8", "wires": [ [ - "7e3eadf1.9f0d14" + "12534eac.cdc831" ] ] }, { - "id": "727c41a7.9551b", + "id": "55b035dc.e280bc", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1031.0040245056152, - "y": 1390.7543106079102, - "z": "2525d6cd.61f35a", + "x": 977.0001182556152, + "y": 1175.0004043579102, + "z": "c5494b7.49969b8", "wires": [ [ - "e2be8d7c.bac7d" + "9238f861.a33ef8" ] ] }, { - "id": "e2be8d7c.bac7d", + "id": "9238f861.a33ef8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1175.0040397644043, - "y": 1389.754147529602, - "z": "2525d6cd.61f35a", + "x": 1121.0001335144043, + "y": 1174.000241279602, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "7e3eadf1.9f0d14", + "id": "12534eac.cdc831", "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=\"Error executing Create wan port rest api\" />\n", "comments": "", - "x": 1173.0043601989746, - "y": 1349.7541456222534, - "z": "2525d6cd.61f35a", + "x": 1119.0004539489746, + "y": 1134.0002393722534, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "394b70c0.ac6f", + "id": "d065ad9e.5a092", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1078.0039558410645, - "y": 1101.7540845870972, - "z": "2525d6cd.61f35a", + "x": 1024.0000495910645, + "y": 886.0001783370972, + "z": "c5494b7.49969b8", "wires": [ [ - "7a566c5c.f46854" + "1b98a4a8.664bdb" ] ] }, { - "id": "af3e9c1f.7be91", + "id": "2354042c.5855cc", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1078.0039520263672, - "y": 1141.754249572754, - "z": "2525d6cd.61f35a", + "x": 1024.0000457763672, + "y": 926.0003433227539, + "z": "c5494b7.49969b8", "wires": [ [ - "1ebcd5ee.10112a" + "8ba4e30f.14b38" ] ] }, { - "id": "1ebcd5ee.10112a", + "id": "8ba4e30f.14b38", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1222.0039672851562, - "y": 1140.7540864944458, - "z": "2525d6cd.61f35a", + "x": 1168.0000610351562, + "y": 925.0001802444458, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "7a566c5c.f46854", + "id": "1b98a4a8.664bdb", "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=\"Error executing Get transport network info rest api\" />\n", "comments": "", - "x": 1220.0042877197266, - "y": 1100.7540845870972, - "z": "2525d6cd.61f35a", + "x": 1166.0003814697266, + "y": 885.0001783370972, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "11bb0a8f.c8a415", + "id": "be26bd6d.b6d6a", "type": "call", "name": "call sdwan-get-wan-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2218.670539855957, - "y": 350.7539825439453, - "z": "2525d6cd.61f35a", + "x": 2164.666633605957, + "y": 135.0000762939453, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "3b7b404e.14ae9", + "id": "b88755ee.f99b38", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n", "comments": "", - "x": 2187.670539855957, - "y": 300.753999710083, - "z": "2525d6cd.61f35a", + "x": 2133.666633605957, + "y": 85.00009346008301, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "5738aa95.6c6dc4", + "id": "bb494b87.830e28", "type": "comment", "name": "This is also required for template parameters update", "info": "", "comments": "", - "x": 2583.0043029785156, - "y": 396.753942489624, - "z": "2525d6cd.61f35a", + "x": 2529.0003967285156, + "y": 181.00003623962402, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "f74da2b3.1326d", + "id": "c939644e.f0b858", "type": "switchNode", "name": "switch ActivateSiteInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 1556.0043487548828, - "y": 385.75395584106445, - "z": "2525d6cd.61f35a", + "x": 1502.0004425048828, + "y": 170.00004959106445, + "z": "c5494b7.49969b8", "wires": [ [ - "3fa03eb7.c59572" + "89f80af3.346938" ] ] }, { - "id": "3fa03eb7.c59572", + "id": "89f80af3.346938", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1752.0045318603516, - "y": 386.75395584106445, - "z": "2525d6cd.61f35a", + "x": 1698.0006256103516, + "y": 171.00004959106445, + "z": "c5494b7.49969b8", "wires": [ [ - "5e72f4d2.b107fc" + "5dd3893f.4a7ea8" ] ] }, { - "id": "5e72f4d2.b107fc", + "id": "5dd3893f.4a7ea8", "type": "set", "name": "set tmp.siteVidx", "xml": "<set>\n<parameter name='tmp.siteVidx' value='`$vidx`' />\n<parameter name='ctx.site.' value='`$service-data.vnfs.vnf[$vidx].`' />\n\n", "comments": "", - "x": 1938.0038299560547, - "y": 383.7539596557617, - "z": "2525d6cd.61f35a", + "x": 1883.9999237060547, + "y": 168.00005340576172, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "5cf9118c.68854", + "id": "13bc1f79.03e581", "type": "switchNode", "name": "switch tmp.siteVidx", "xml": "<switch test=\"`$tmp.siteVidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1229.6706581115723, - "y": 527.7539763450623, - "z": "2525d6cd.61f35a", + "x": 1175.6667518615723, + "y": 312.00007009506226, + "z": "c5494b7.49969b8", "wires": [ [ - "9765105d.6b72d" + "e4930b56.8a59f8" ] ] }, { - "id": "9765105d.6b72d", + "id": "e4930b56.8a59f8", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1404.0993690490723, - "y": 528.3254280090332, - "z": "2525d6cd.61f35a", + "x": 1350.0954627990723, + "y": 312.5715217590332, + "z": "c5494b7.49969b8", "wires": [ [ - "3a85e200.dcaaae" + "a5febd63.c2db7" ] ] }, { - "id": "3a85e200.dcaaae", + "id": "a5febd63.c2db7", "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=\"ActivateSiteInstance not found in service-data\" />\n", "comments": "", - "x": 1546.5280876159668, - "y": 527.4682908058167, - "z": "2525d6cd.61f35a", + "x": 1492.5241813659668, + "y": 311.71438455581665, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "46a841ba.4af92", + "id": "41b636f7.4605d8", "type": "switchNode", "name": "switch deviceName match", "xml": "<switch test=\"`$prop.wan.deviceName == $service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`\">\n\n\n", "comments": "", "outputs": 1, - "x": 2460.671859741211, - "y": 657.7542247772217, - "z": "2525d6cd.61f35a", + "x": 2406.667953491211, + "y": 442.0003185272217, + "z": "c5494b7.49969b8", "wires": [ [ - "c5bcabb0.9f3978" + "3c83342b.bff06c" ] ] }, { - "id": "512e7a73.c439f4", + "id": "d216e689.2df0f8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2543.3377990722656, - "y": 731.7540683746338, - "z": "2525d6cd.61f35a", + "x": 2489.3338928222656, + "y": 516.0001621246338, + "z": "c5494b7.49969b8", "wires": [ [ - "4c673d0.8ff4ac4", - "57757525.a0de7c" + "93f36ff6.faafe", + "c1942dca.f90c1" ] ] }, { - "id": "4c673d0.8ff4ac4", + "id": "93f36ff6.faafe", "type": "for", "name": "for loop deviceidx - Get deviceId from servicedata", "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2823.5349502563477, - "y": 726.7852573394775, - "z": "2525d6cd.61f35a", + "x": 2769.5310440063477, + "y": 511.03135108947754, + "z": "c5494b7.49969b8", "wires": [ [ - "536e54bd.8b3bec" + "e2b7f439.b0d4b8" ] ] }, { - "id": "536e54bd.8b3bec", + "id": "e2b7f439.b0d4b8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2900.5356826782227, - "y": 790.7853565216064, - "z": "2525d6cd.61f35a", + "x": 2846.5317764282227, + "y": 575.0314502716064, + "z": "c5494b7.49969b8", "wires": [ [ - "1d887fbe.2fb47" + "556d9445.4f2e4c" ] ] }, { - "id": "207a1eb2.66eaf2", + "id": "d34abb03.648a78", "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=\".....\"/>\n<parameter name=\"field3\" value=\"prop.wan.deviceName\"/>\n<parameter name=\"field4\" value='`$prop.wan.deviceName`'/>\n", "comments": "", "outputs": 1, - "x": 2146.535285949707, - "y": 398.7851734161377, - "z": "2525d6cd.61f35a", + "x": 2092.531379699707, + "y": 183.0312671661377, + "z": "c5494b7.49969b8", "wires": [ [] ] }, { - "id": "59c48b6.04c5c74", + "id": "b75d8380.35bfa", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1272.003978729248, - "y": 421.7539234161377, - "z": "2525d6cd.61f35a", + "x": 1218.000072479248, + "y": 206.0000171661377, + "z": "c5494b7.49969b8", "wires": [ [ - "a080fa5f.ddeb88", - "f74da2b3.1326d" + "7105dd86.af6c34", + "c939644e.f0b858" ] ] }, { - "id": "8814bd0.a9cd04", + "id": "ec56abe8.7b3a98", "type": "set", "name": "copy input data to service data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />", "comments": "", - "x": 705.0351715087891, - "y": 1610.2851600646973, - "z": "2525d6cd.61f35a", + "x": 651.0312652587891, + "y": 1394.5312538146973, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "eac4599c.f1e908", + "id": "fdc70d4e.6c354", "type": "comment", "name": "TODO: split ip/mask", "info": "", "comments": "", - "x": 1093.00390625, - "y": 1237.2578134536743, - "z": "2525d6cd.61f35a", + "x": 1039, + "y": 1021.5039072036743, + "z": "c5494b7.49969b8", "wires": [] }, { - "id": "aa148c7f.0d986", + "id": "cb21e48e.93ff78", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 945.0047798156738, - "y": 1190.0876731872559, - "z": "2525d6cd.61f35a", + "x": 891.0008735656738, + "y": 974.3337669372559, + "z": "c5494b7.49969b8", "wires": [ [ - "e5fec542.f96808" + "332a8bf5.782ff4" ] ] }, { - "id": "2af7b981.494176", + "id": "d3956bf2.5c5588", "type": "for", "name": "for loop tidx - Get transportNetwork ID", "xml": "<for index=\"tidx\" start=\"0\" end=\"`$transportNetworksResp.data.transportNetworks_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 729.0043983459473, - "y": 1189.0874290466309, - "z": "2525d6cd.61f35a", + "x": 675.0004920959473, + "y": 973.3335227966309, + "z": "c5494b7.49969b8", "wires": [ [ - "aa148c7f.0d986" + "cb21e48e.93ff78" ] ] }, { - "id": "d3523f5e.150e2", + "id": "f462086d.871178", "type": "set", "name": "set wan portId to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='wanPortId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.wanPortId`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n", "comments": "", - "x": 706.0038986206055, - "y": 1560.0040016174316, - "z": "2525d6cd.61f35a", + "x": 651.9999923706055, + "y": 1344.2500953674316, + "z": "c5494b7.49969b8", "wires": [] + }, + { + "id": "589c7732.243f08", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 647, + "y": 679, + "z": "c5494b7.49969b8", + "wires": [ + [] + ] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json index 7eb486a5..5bbf0a49 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json @@ -1,20 +1,20 @@ [ { - "id": "469452cb.bb081c", + "id": "58d8ca80.754ee4", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 110.00390625, - "y": 47.00390625, - "z": "fb90012b.616c1", + "x": 86, + "y": 38, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "c7697d03.d4e67" + "9b331136.66aea" ] ] }, { - "id": "c7697d03.d4e67", + "id": "9b331136.66aea", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,422 +22,422 @@ "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": 209.28960418701172, - "y": 121.24201414268464, - "z": "fb90012b.616c1", + "x": 185.28569793701172, + "y": 112.23810789268464, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "1e04cec3.e58791" + "ec9fe349.f9372" ] ] }, { - "id": "1e04cec3.e58791", + "id": "ec9fe349.f9372", "type": "method", "name": "method sdwan-vnf-topology-operation-wanport-create", "xml": "<method rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 233.43252563476562, - "y": 210.0039258003235, - "z": "fb90012b.616c1", + "x": 209.42861938476562, + "y": 201.0000195503235, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "415535ab.ee3b9c" + "87efdcb1.d6671" ] ] }, { - "id": "415535ab.ee3b9c", + "id": "87efdcb1.d6671", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 341.6706085205078, - "y": 417.67058992385864, - "z": "fb90012b.616c1", + "x": 317.6667022705078, + "y": 408.66668367385864, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "d5db9f82.a9caa", - "105b56f8.ca1c29", - "e1b2d352.980df", - "5e7b33b7.c9f95c", - "1e1b598f.ff6d76", - "24d8ed6f.1c08a2", - "76af4df6.0affe4", - "8d749358.a9898", - "a234fc68.a7971", - "f1475869.e78fd8", - "a35f1e97.dfac6", - "788b5a8e.cd86b4", - "17c0b4a9.0b865b" + "daaa1789.61ed38", + "40e846a4.f63368", + "b8f54335.fcb32", + "4e193e5a.f6bb9", + "83c99a9.e9d4868", + "c7efce39.0f90c", + "596fe131.2f016", + "ee0f7cd9.73819", + "618cf28.a3bd10c", + "2794c131.0510ce", + "4dbd7ea2.8473c", + "a279f8fb.0934f8", + "4f31f3dc.48bbdc" ] ] }, { - "id": "d5db9f82.a9caa", + "id": "daaa1789.61ed38", "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": 631.3375396728516, - "y": 869.3377075195312, - "z": "fb90012b.616c1", + "x": 607.3336334228516, + "y": 860.3338012695312, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "105b56f8.ca1c29", + "id": "40e846a4.f63368", "type": "save", "name": "save sdwan device port configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n key='wan-port-config.wan-port-config-id = $prop.vnf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAdddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n key='wan-port-config.wan-port-config-id = $prop.vnf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />\n", "comments": "", "outputs": 1, - "x": 718.0042953491211, - "y": 776.5599503517151, - "z": "fb90012b.616c1", + "x": 694.0003890991211, + "y": 767.5560441017151, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "e1b2d352.980df", + "id": "b8f54335.fcb32", "type": "for", "name": "for loop idx - VNF input parameters", "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n", "comments": "", "outputs": 1, - "x": 696.0043640136719, - "y": 443.67932987213135, - "z": "fb90012b.616c1", + "x": 672.0004577636719, + "y": 434.67542362213135, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "971e9894.559198" + "acd8d091.0d71d" ] ] }, { - "id": "971e9894.559198", + "id": "acd8d091.0d71d", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 910.7827072143555, - "y": 441.23491382598877, - "z": "fb90012b.616c1", + "x": 886.7788009643555, + "y": 432.23100757598877, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "5db5d5cb.e3665c", - "137642b5.af1c4d" + "828392b5.41563", + "a73faa8e.c89ba8" ] ] }, { - "id": "54f3a8ba.c8c8f8", + "id": "cf40793a.a6d2e8", "type": "comment", "name": "set input parameters", "info": "", "comments": "", - "x": 914.6775550842285, - "y": 569.6009178161621, - "z": "fb90012b.616c1", + "x": 890.6736488342285, + "y": 560.5970115661621, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "5e7b33b7.c9f95c", + "id": "4e193e5a.f6bb9", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 706.9937286376953, - "y": 140.60080528259277, - "z": "fb90012b.616c1", + "x": 682.9898223876953, + "y": 131.59689903259277, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "58cb915c.e63fb", - "61229cc4.7e2a84" + "54b6d1d2.416d5", + "503b3e94.4de07" ] ] }, { - "id": "58cb915c.e63fb", + "id": "54b6d1d2.416d5", "type": "other", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 943.7079563140869, - "y": 130.7436351776123, - "z": "fb90012b.616c1", + "x": 919.7040500640869, + "y": 121.7397289276123, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "2a580441.a1df1c" + "b3cfe846.219ca8" ] ] }, { - "id": "61229cc4.7e2a84", + "id": "503b3e94.4de07", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 939.1366729736328, - "y": 169.02948570251465, - "z": "fb90012b.616c1", + "x": 915.1327667236328, + "y": 160.02557945251465, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "ea6697cb.65e638" + "f27d7807.d35938" ] ] }, { - "id": "ea6697cb.65e638", + "id": "f27d7807.d35938", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1071.8508682250977, - "y": 174.02942562103271, - "z": "fb90012b.616c1", + "x": 1047.8469619750977, + "y": 165.02551937103271, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "1f8d31b6.15942e", - "3f14ea6e.335126" + "7ed2d1b2.320ec", + "e6e34bc5.a44238" ] ] }, { - "id": "2a580441.a1df1c", + "id": "b3cfe846.219ca8", "type": "set", "name": "set vnf-index=0", "xml": "<set>\n<parameter name='vnf-index' value='0' />\n", "comments": "", - "x": 1099.9937705993652, - "y": 129.74371528625488, - "z": "fb90012b.616c1", + "x": 1075.9898643493652, + "y": 120.73980903625488, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "1f8d31b6.15942e", + "id": "7ed2d1b2.320ec", "type": "set", "name": "set vnf-index = vnf_length", "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n", "comments": "", - "x": 1300.993782043457, - "y": 146.31512928009033, - "z": "fb90012b.616c1", + "x": 1276.989875793457, + "y": 137.31122303009033, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "3f14ea6e.335126", + "id": "e6e34bc5.a44238", "type": "for", "name": "for each existing VNF", "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1283.422248840332, - "y": 186.31509113311768, - "z": "fb90012b.616c1", + "x": 1259.418342590332, + "y": 177.31118488311768, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "5dff7a8c.9711b4" + "e6e708fd.086418" ] ] }, { - "id": "5dff7a8c.9711b4", + "id": "e6e708fd.086418", "type": "switchNode", "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id", "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n", "comments": "", "outputs": 1, - "x": 1641.7080307006836, - "y": 185.88659477233887, - "z": "fb90012b.616c1", + "x": 1617.7041244506836, + "y": 176.88268852233887, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "b200b751.6600d8" + "f6e0def3.d2f88" ] ] }, { - "id": "5634d26b.2c620c", + "id": "55da435b.f5309c", "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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n", "comments": "", - "x": 2084.5650024414062, - "y": 186.4580249786377, - "z": "fb90012b.616c1", + "x": 2060.5610961914062, + "y": 177.4541187286377, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "b200b751.6600d8", + "id": "f6e0def3.d2f88", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1946.9936714172363, - "y": 185.45802116394043, - "z": "fb90012b.616c1", + "x": 1922.9897651672363, + "y": 176.45411491394043, + "z": "5ff8bbe7.b04e84", "wires": [ [ - "5634d26b.2c620c" + "55da435b.f5309c" ] ] }, { - "id": "24d8ed6f.1c08a2", + "id": "c7efce39.0f90c", "type": "execute", "name": "execute generate-vnf-index", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n", "comments": "", "outputs": 1, - "x": 685.9936218261719, - "y": 272.60077476501465, - "z": "fb90012b.616c1", + "x": 661.9897155761719, + "y": 263.59686851501465, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "1e1b598f.ff6d76", + "id": "83c99a9.e9d4868", "type": "set", "name": "set new vnf_length", "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n", "comments": "", - "x": 659.9936065673828, - "y": 237.60078287124634, - "z": "fb90012b.616c1", + "x": 635.9897003173828, + "y": 228.59687662124634, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "8d749358.a9898", + "id": "ee0f7cd9.73819", "type": "set", "name": "set vnf-level-oper-status to Created", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 704.9936981201172, - "y": 688.6010332107544, - "z": "fb90012b.616c1", + "x": 680.9897918701172, + "y": 679.5971269607544, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "76af4df6.0affe4", + "id": "596fe131.2f016", "type": "set", "name": "copy input data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n", "comments": "", - "x": 638.8468208312988, - "y": 642.5972957611084, - "z": "fb90012b.616c1", + "x": 614.8429145812988, + "y": 633.5933895111084, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "a234fc68.a7971", + "id": "618cf28.a3bd10c", "type": "save", "name": "save service relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"wan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/wan-port-configs/wan-port-config/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"wan-port-config.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"wan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/wan-port-configs/wan-port-config/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"wan-port-config.wan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />", "comments": "", "outputs": 1, - "x": 688.9936981201172, - "y": 824.6011228561401, - "z": "fb90012b.616c1", + "x": 664.9897918701172, + "y": 815.5972166061401, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "f1475869.e78fd8", + "id": "2794c131.0510ce", "type": "set", "name": "set vnf-index and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />", "comments": "", - "x": 691.9936294555664, - "y": 732.601044178009, - "z": "fb90012b.616c1", + "x": 667.9897232055664, + "y": 723.597137928009, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "a35f1e97.dfac6", + "id": "4dbd7ea2.8473c", "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=\"sdwan-wanport-vnf-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SDWAN-Config\"/>\n", "comments": "", "outputs": 1, - "x": 624.0039329528809, - "y": 325.0039367675781, - "z": "fb90012b.616c1", + "x": 600.0000267028809, + "y": 316.0000305175781, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "e6a6ec15.a72f5", + "id": "93da82db.2cdc9", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 804.0042266845703, - "y": 413.0039920806885, - "z": "fb90012b.616c1", + "x": 780.0003204345703, + "y": 404.0000858306885, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "5db5d5cb.e3665c", + "id": "828392b5.41563", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1124.038818359375, - "y": 391.9830369949341, - "z": "fb90012b.616c1", + "x": 1100.034912109375, + "y": 382.9791307449341, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "137642b5.af1c4d", + "id": "a73faa8e.c89ba8", "type": "set", "name": "set parameterName", "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1092.4833221435547, - "y": 460.98312282562256, - "z": "fb90012b.616c1", + "x": 1068.4794158935547, + "y": 451.97921657562256, + "z": "5ff8bbe7.b04e84", "wires": [] }, { - "id": "788b5a8e.cd86b4", + "id": "a279f8fb.0934f8", "type": "call", "name": "call sdwan-get-wan-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 669.0043525695801, - "y": 574.0043067932129, - "z": "fb90012b.616c1", + "x": 645.0004463195801, + "y": 565.0004005432129, + "z": "5ff8bbe7.b04e84", "wires": [ [] ] }, { - "id": "17c0b4a9.0b865b", + "id": "4f31f3dc.48bbdc", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n", "comments": "", - "x": 650.0039367675781, - "y": 541.004054069519, - "z": "fb90012b.616c1", + "x": 626.0000305175781, + "y": 532.000147819519, + "z": "5ff8bbe7.b04e84", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json index c941eb14..b6ff38b7 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json @@ -1,20 +1,20 @@ [ { - "id": "7b8cbc85.2da064", + "id": "160bd41b.750adc", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 100.00390625, - "y": 55.99999871850014, - "z": "b1933fd7.45eec", + "x": 97, + "y": 50, + "z": "60265787.2327c8", "wires": [ [ - "e9b1afb9.5ff99" + "7010ff28.09428" ] ] }, { - "id": "e9b1afb9.5ff99", + "id": "7010ff28.09428", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,701 +22,713 @@ "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": 248.2895965576172, - "y": 106.23810735344887, - "z": "b1933fd7.45eec", + "x": 245.2856903076172, + "y": 100.23810863494873, + "z": "60265787.2327c8", "wires": [ [ - "4b2b7cbd.d36844" + "f412ee4c.d62e7" ] ] }, { - "id": "4b2b7cbd.d36844", + "id": "f412ee4c.d62e7", "type": "method", "name": "method sdwan-vnf-topology-operation-wanport-deactivate", "xml": "<method rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 282.4325180053711, - "y": 190.00001588463783, - "z": "b1933fd7.45eec", + "x": 279.4286117553711, + "y": 184.0000171661377, + "z": "60265787.2327c8", "wires": [ [ - "5407681f.e8b5e8" + "cc23525.50310b" ] ] }, { - "id": "5407681f.e8b5e8", + "id": "cc23525.50310b", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 257.6706123352051, - "y": 574.6666819155216, - "z": "b1933fd7.45eec", + "x": 254.66670608520508, + "y": 568.6666831970215, + "z": "60265787.2327c8", "wires": [ [ - "df156b9b.893498", - "be3201ef.467c4", - "860b5ecf.dd7b5", - "16992179.73e94f", - "98f2142f.e861f8", - "d04b477e.b0b688", - "873153fb.ad4f6", - "104270ca.7ed57f", - "e4cc3ba0.aaef78", - "8c780213.0f5d9", - "a5d33dff.966b" + "8af94d5d.882d", + "db706027.a79c1", + "a0bc8740.7ee818", + "13704b55.ddb7b5", + "f6e2bea8.930d7", + "1d165946.98b807", + "e263e9f9.47b878", + "ec6fef57.1d937", + "f2ee43ab.85fef" ] ] }, { - "id": "df156b9b.893498", + "id": "8af94d5d.882d", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 763.0248603820801, - "y": 99.02095222473145, - "z": "b1933fd7.45eec", + "x": 760.0209541320801, + "y": 93.02095350623131, + "z": "60265787.2327c8", "wires": [ [ - "cd5b067d.e6ac48", - "8805239b.f3949", - "b1447a06.d6b6b8" + "80fd0bfd.39f738", + "7b7c3289.46689c", + "eedac48f.477958" ] ] }, { - "id": "cd5b067d.e6ac48", + "id": "80fd0bfd.39f738", "type": "other", "name": "Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1006.024787902832, - "y": 124.02103519439697, - "z": "b1933fd7.45eec", + "x": 1003.020881652832, + "y": 118.02103647589684, + "z": "60265787.2327c8", "wires": [ [ - "e50203dd.f1638" + "bd8e7274.c99a" ] ] }, { - "id": "e50203dd.f1638", + "id": "bd8e7274.c99a", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1154.8022994995117, - "y": 103.9099702835083, - "z": "b1933fd7.45eec", + "x": 1151.7983932495117, + "y": 97.90997156500816, + "z": "60265787.2327c8", "wires": [] }, { - "id": "8805239b.f3949", + "id": "7b7c3289.46689c", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1007.0251121520996, - "y": 157.02105808258057, - "z": "b1933fd7.45eec", + "x": 1004.0212059020996, + "y": 151.02105936408043, + "z": "60265787.2327c8", "wires": [ [ - "ec39454c.89fad8" + "fc040973.03bed8" ] ] }, { - "id": "ec39454c.89fad8", + "id": "fc040973.03bed8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1154.2948150634766, - "y": 146.57558059692383, - "z": "b1933fd7.45eec", + "x": 1151.2909088134766, + "y": 140.5755818784237, + "z": "60265787.2327c8", "wires": [ [ - "581f3be0.95f264", - "9ccafa3a.a3a8e8" + "41b2ec7a.c9fac4", + "ed9b9aab.53af18" ] ] }, { - "id": "581f3be0.95f264", + "id": "41b2ec7a.c9fac4", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1399.310775756836, - "y": 98.44958019256592, - "z": "b1933fd7.45eec", + "x": 1396.306869506836, + "y": 92.44958147406578, + "z": "60265787.2327c8", "wires": [ [ - "66dc1ec4.8151c" + "da4ef740.d83fa8" ] ] }, { - "id": "9ccafa3a.a3a8e8", + "id": "ed9b9aab.53af18", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1330.6121292114258, - "y": 146.43275928497314, - "z": "b1933fd7.45eec", + "x": 1327.6082229614258, + "y": 140.432760566473, + "z": "60265787.2327c8", "wires": [ [ - "4834ec00.0aabb4" + "742d2b6f.de3234" ] ] }, { - "id": "4834ec00.0aabb4", + "id": "742d2b6f.de3234", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1484.0407676696777, - "y": 145.00417232513428, - "z": "b1933fd7.45eec", + "x": 1481.0368614196777, + "y": 139.00417360663414, + "z": "60265787.2327c8", "wires": [ [ - "fddc1ade.282818" + "373d4940.5a03b6" ] ] }, { - "id": "5b23a76a.488d28", + "id": "cf1a968e.65c658", "type": "switchNode", "name": "switch vnfid found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1770.739356994629, - "y": 95.69969272613525, - "z": "b1933fd7.45eec", + "x": 1767.735450744629, + "y": 89.69969400763512, + "z": "60265787.2327c8", "wires": [ [ - "acf51a78.0a9178" + "6d3e9e16.89bfe" ] ] }, { - "id": "fddc1ade.282818", + "id": "373d4940.5a03b6", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1620.4691619873047, - "y": 144.14703464508057, - "z": "b1933fd7.45eec", + "x": 1617.4652557373047, + "y": 138.14703592658043, + "z": "60265787.2327c8", "wires": [] }, { - "id": "acf51a78.0a9178", + "id": "6d3e9e16.89bfe", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1809.691505432129, - "y": 150.59241199493408, - "z": "b1933fd7.45eec", + "x": 1806.687599182129, + "y": 144.59241327643394, + "z": "60265787.2327c8", "wires": [ [ - "4a7918ac.67fac8" + "c733e74a.c143c8" ] ] }, { - "id": "b1447a06.d6b6b8", + "id": "eedac48f.477958", "type": "outcome", "name": "0", "xml": "<outcome value='0'>\n", "comments": "", "outputs": 1, - "x": 1002.9935340881348, - "y": 91.98973083496094, - "z": "b1933fd7.45eec", + "x": 999.9896278381348, + "y": 85.9897321164608, + "z": "60265787.2327c8", "wires": [ [ - "e50203dd.f1638" + "bd8e7274.c99a" ] ] }, { - "id": "66dc1ec4.8151c", + "id": "da4ef740.d83fa8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1618.6604080200195, - "y": 97.9896411895752, - "z": "b1933fd7.45eec", + "x": 1615.6565017700195, + "y": 91.98964247107506, + "z": "60265787.2327c8", "wires": [ [ - "5b23a76a.488d28" + "cf1a968e.65c658" ] ] }, { - "id": "be3201ef.467c4", + "id": "db706027.a79c1", "type": "set", "name": "set vnf in service-data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n\n", "comments": "", - "x": 718.338077545166, - "y": 747.6668863296509, - "z": "b1933fd7.45eec", + "x": 715.334171295166, + "y": 741.6668876111507, + "z": "60265787.2327c8", "wires": [] }, { - "id": "860b5ecf.dd7b5", + "id": "a0bc8740.7ee818", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", - "x": 730.8937187194824, - "y": 804.889181137085, - "z": "b1933fd7.45eec", + "x": 727.8898124694824, + "y": 798.8891824185848, + "z": "60265787.2327c8", "wires": [] }, { - "id": "16992179.73e94f", + "id": "13704b55.ddb7b5", "type": "set", "name": "set vnf-level-oper-status to PendingDelete", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 773.3380928039551, - "y": 839.6670169830322, - "z": "b1933fd7.45eec", + "x": 770.3341865539551, + "y": 833.6670182645321, + "z": "60265787.2327c8", "wires": [] }, { - "id": "98f2142f.e861f8", + "id": "f6e2bea8.930d7", "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": 683.6714630126953, - "y": 928.4448499679565, - "z": "b1933fd7.45eec", + "x": 680.6675567626953, + "y": 922.4448512494564, + "z": "60265787.2327c8", "wires": [] }, { - "id": "873153fb.ad4f6", + "id": "e263e9f9.47b878", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 743.5042667388916, - "y": 267.00012239813805, - "z": "b1933fd7.45eec", + "x": 740.5003604888916, + "y": 261.0001236796379, + "z": "60265787.2327c8", "wires": [ [ - "5df9a8e2.afb138", - "e0b2bff0.163f1", - "a120de42.8cdeb" + "553a8d46.b43834", + "4956fcb2.4927a4", + "b5f5e61a.4229a8" ] ] }, { - "id": "5df9a8e2.afb138", + "id": "553a8d46.b43834", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 962.5042362213135, - "y": 226.00011897087097, - "z": "b1933fd7.45eec", + "x": 959.5003299713135, + "y": 220.00012025237083, + "z": "60265787.2327c8", "wires": [ [ - "c101e40a.a37c18" + "f8d39c98.f3e5a" ] ] }, { - "id": "e0b2bff0.163f1", + "id": "4956fcb2.4927a4", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 965.9952030181885, - "y": 273.5741546154022, - "z": "b1933fd7.45eec", + "x": 962.9912967681885, + "y": 267.5741558969021, + "z": "60265787.2327c8", "wires": [ [ - "1f1c50e3.e0332f" + "60e56df6.080ca4" ] ] }, { - "id": "a120de42.8cdeb", + "id": "b5f5e61a.4229a8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 961.3282108306885, - "y": 314.9074676036835, - "z": "b1933fd7.45eec", + "x": 958.3243045806885, + "y": 308.90746888518333, + "z": "60265787.2327c8", "wires": [ [ - "4fef696b.8e5e98" + "15107992.3c8136" ] ] }, { - "id": "4fef696b.8e5e98", + "id": "15107992.3c8136", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1149.1007671356201, - "y": 310.3466603755951, - "z": "b1933fd7.45eec", + "x": 1146.0968608856201, + "y": 304.34666165709496, + "z": "60265787.2327c8", "wires": [] }, { - "id": "1f1c50e3.e0332f", + "id": "60e56df6.080ca4", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1142.566614151001, - "y": 261.8598906993866, - "z": "b1933fd7.45eec", + "x": 1139.562707901001, + "y": 255.85989198088646, + "z": "60265787.2327c8", "wires": [] }, { - "id": "c101e40a.a37c18", + "id": "f8d39c98.f3e5a", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1143.0043392181396, - "y": 220.00015768408775, - "z": "b1933fd7.45eec", + "x": 1140.0004329681396, + "y": 214.00015896558762, + "z": "60265787.2327c8", "wires": [] }, { - "id": "8c780213.0f5d9", + "id": "1d346910.f82317", "type": "execute", "name": "execute RestApiCallNode device port delete", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device-port-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 776.0044193267822, - "y": 642.666867017746, - "z": "b1933fd7.45eec", + "x": 773.0005130767822, + "y": 636.6668682992458, + "z": "60265787.2327c8", "wires": [ [ - "a8a639cc.af8fc8", - "b547a1c8.93a66" + "42db533e.b56eac", + "3455c58f.b562ea" ] ] }, { - "id": "a8a639cc.af8fc8", + "id": "42db533e.b56eac", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1022.0044040679932, - "y": 680.6669557094574, - "z": "b1933fd7.45eec", + "x": 1019.0004978179932, + "y": 674.6669569909573, + "z": "60265787.2327c8", "wires": [ [ - "da37396d.3af718" + "77804da4.2bade4" ] ] }, { - "id": "b547a1c8.93a66", + "id": "3455c58f.b562ea", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1018.0044841766357, - "y": 634.6668708324432, - "z": "b1933fd7.45eec", + "x": 1015.0005779266357, + "y": 628.6668721139431, + "z": "60265787.2327c8", "wires": [ [ - "bf4f49a8.2593f8" + "7c085513.57701c" ] ] }, { - "id": "bf4f49a8.2593f8", + "id": "7c085513.57701c", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1159.0045757293701, - "y": 634.6668717861176, - "z": "b1933fd7.45eec", + "x": 1156.0006694793701, + "y": 628.6668730676174, + "z": "60265787.2327c8", "wires": [] }, { - "id": "da37396d.3af718", + "id": "77804da4.2bade4", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1166.0042705535889, - "y": 678.6668746471405, - "z": "b1933fd7.45eec", + "x": 1163.0003643035889, + "y": 672.6668759286404, + "z": "60265787.2327c8", "wires": [ [] ] }, { - "id": "e4cc3ba0.aaef78", + "id": "b1683370.08944", "type": "execute", "name": "execute RestApiCallNode wan port delete", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 767.0045871734619, - "y": 535.666864156723, - "z": "b1933fd7.45eec", + "x": 764.0006809234619, + "y": 529.6668654382229, + "z": "60265787.2327c8", "wires": [ [ - "456c9aa6.bae384", - "c9572446.4deba8" + "25b510d9.36284", + "3a348892.4f4ad8" ] ] }, { - "id": "456c9aa6.bae384", + "id": "25b510d9.36284", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1000.0046825408936, - "y": 568.6668565273285, - "z": "b1933fd7.45eec", + "x": 997.0007762908936, + "y": 562.6668578088284, + "z": "60265787.2327c8", "wires": [ [ - "3ae835e7.d94c3a" + "cc96ff80.a3e57" ] ] }, { - "id": "c9572446.4deba8", + "id": "3a348892.4f4ad8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1004.0047626495361, - "y": 504.66693472862244, - "z": "b1933fd7.45eec", + "x": 1001.0008563995361, + "y": 498.6669360101223, + "z": "60265787.2327c8", "wires": [ [ - "2bd63ac3.ca30f6" + "ce0c3d97.4bdf8" ] ] }, { - "id": "2bd63ac3.ca30f6", + "id": "ce0c3d97.4bdf8", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1149.004934310913, - "y": 506.66693472862244, - "z": "b1933fd7.45eec", + "x": 1146.001028060913, + "y": 500.6669360101223, + "z": "60265787.2327c8", "wires": [] }, { - "id": "3ae835e7.d94c3a", + "id": "cc96ff80.a3e57", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1156.0045261383057, - "y": 566.6668565273285, - "z": "b1933fd7.45eec", + "x": 1153.0006198883057, + "y": 560.6668578088284, + "z": "60265787.2327c8", "wires": [ [] ] }, { - "id": "d04b477e.b0b688", + "id": "1d165946.98b807", "type": "execute", "name": "execute Properties", "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": 711.0038948059082, - "y": 142.0000295639038, - "z": "b1933fd7.45eec", + "x": 707.9999885559082, + "y": 136.00003084540367, + "z": "60265787.2327c8", "wires": [ [] ] }, { - "id": "104270ca.7ed57f", + "id": "ec6fef57.1d937", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 760.0041751861572, - "y": 405.66669368743896, - "z": "b1933fd7.45eec", + "x": 757.0002689361572, + "y": 399.6666949689388, + "z": "60265787.2327c8", "wires": [ [ - "4437f7fc.652918", - "1c05902b.92524" + "4f27175.40c29e8", + "50a6cd99.43e804" ] ] }, { - "id": "4437f7fc.652918", + "id": "4f27175.40c29e8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 994.0042133331299, - "y": 391.6667184829712, - "z": "b1933fd7.45eec", + "x": 991.0003070831299, + "y": 385.66671976447105, + "z": "60265787.2327c8", "wires": [ [ - "a3e2158c.084138" + "ba76090.b8b84f8" ] ] }, { - "id": "1c05902b.92524", + "id": "50a6cd99.43e804", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 987.2541751861572, - "y": 437.3095769882202, - "z": "b1933fd7.45eec", + "x": 984.2502689361572, + "y": 431.3095782697201, + "z": "60265787.2327c8", "wires": [ [ - "7ff91448.c6f30c" + "a32d5aa2.e0b408" ] ] }, { - "id": "7ff91448.c6f30c", + "id": "a32d5aa2.e0b408", "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=\"Error executing get token rest api\" />\n", "comments": "", - "x": 1140.0041751861572, - "y": 437.05963802337646, - "z": "b1933fd7.45eec", + "x": 1137.0002689361572, + "y": 431.0596393048763, + "z": "60265787.2327c8", "wires": [] }, { - "id": "a3e2158c.084138", + "id": "ba76090.b8b84f8", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1148.0042133331299, - "y": 392.6667184829712, - "z": "b1933fd7.45eec", + "x": 1145.0003070831299, + "y": 386.66671976447105, + "z": "60265787.2327c8", "wires": [] }, { - "id": "4a7918ac.67fac8", + "id": "c733e74a.c143c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1950.0040168762207, - "y": 151.00004482269287, - "z": "b1933fd7.45eec", + "x": 1947.0001106262207, + "y": 145.00004610419273, + "z": "60265787.2327c8", "wires": [ [ - "bb491f3b.31d3b", - "af8f15c9.eb4d58", - "df2693ee.5beea" + "2115f98.c329d06", + "5f1edf6a.5abca", + "e126aeff.fd3f4" ] ] }, { - "id": "a5d33dff.966b", + "id": "f2ee43ab.85fef", "type": "update", - "name": "save SDWAN wan port instance configuration in AAI", + "name": "update SDWAN wan port instance configuration in AAI", "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='wan-port-config-id' value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n", "comments": "", "outputs": 1, - "x": 796.0041923522949, - "y": 881.0004291534424, - "z": "b1933fd7.45eec", + "x": 793.0002861022949, + "y": 875.0004304349422, + "z": "60265787.2327c8", "wires": [ [] ] }, { - "id": "bb491f3b.31d3b", + "id": "2115f98.c329d06", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n", "comments": "", - "x": 2200.0352516174316, - "y": 102.03129148483276, - "z": "b1933fd7.45eec", + "x": 2197.0313453674316, + "y": 96.03129276633263, + "z": "60265787.2327c8", "wires": [] }, { - "id": "af8f15c9.eb4d58", + "id": "5f1edf6a.5abca", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n", "comments": "", - "x": 2172.4815406799316, - "y": 148.6889271736145, - "z": "b1933fd7.45eec", + "x": 2169.4776344299316, + "y": 142.68892845511436, + "z": "60265787.2327c8", "wires": [] }, { - "id": "df2693ee.5beea", + "id": "e126aeff.fd3f4", "type": "call", "name": "call sdwan-get-wan-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2196.481491088867, - "y": 198.68891525268555, - "z": "b1933fd7.45eec", + "x": 2193.477584838867, + "y": 192.6889165341854, + "z": "60265787.2327c8", + "wires": [ + [] + ] + }, + { + "id": "e35c5cc.ba705a", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 727, + "y": 462, + "z": "60265787.2327c8", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json index ad151409..d90a5ccb 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json @@ -1,20 +1,20 @@ [ { - "id": "acaf9f12.dd321", + "id": "8722df6b.da333", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 119.00390625, - "y": 52.00390625, - "z": "816d5e60.eba45", + "x": 118, + "y": 57, + "z": "afa42c56.2fe06", "wires": [ [ - "9e7830e2.084e3" + "5f0a72e7.8810fc" ] ] }, { - "id": "9e7830e2.084e3", + "id": "5f0a72e7.8810fc", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,3990 +22,4038 @@ "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": 235.2895965576172, - "y": 103.24201393127441, - "z": "816d5e60.eba45", + "x": 234.2856903076172, + "y": 108.23810768127441, + "z": "afa42c56.2fe06", "wires": [ [ - "b00ec17b.44975" + "a6501208.be07a" ] ] }, { - "id": "b00ec17b.44975", + "id": "a6501208.be07a", "type": "method", "name": "method sdwan-wanport-vnf-topology-operation-underlay", "xml": "<method rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 238.43252563476562, - "y": 188.00393772125244, - "z": "816d5e60.eba45", + "x": 237.42861938476562, + "y": 193.00003147125244, + "z": "afa42c56.2fe06", "wires": [ [ - "2452d404.5dd7bc" + "fbe9ed1f.31b14" ] ] }, { - "id": "2452d404.5dd7bc", + "id": "fbe9ed1f.31b14", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 170.67059326171875, - "y": 296.67063903808594, - "z": "816d5e60.eba45", + "x": 169.66668701171875, + "y": 301.66673278808594, + "z": "afa42c56.2fe06", "wires": [ [ - "74620ff1.b94be", - "e68f1fae.052f", - "18ea4160.5b97af", - "84666856.592818", - "f80aa612.1d1cd8" + "ba308345.6a0be", + "723ddf07.218d1", + "431fc2f2.17609c", + "38f6b67d.380b9a", + "32bd7569.5de31a" ] ] }, { - "id": "74620ff1.b94be", + "id": "ba308345.6a0be", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 605.004337310791, - "y": 435.6707601547241, - "z": "816d5e60.eba45", + "x": 604.000431060791, + "y": 440.6668539047241, + "z": "afa42c56.2fe06", "wires": [ [ - "89904125.f9c2d" + "88f8bb94.113e88" ] ] }, { - "id": "f587f945.9668c8", + "id": "2cdd7d19.2083a2", "type": "set", "name": "set prop.ar.allotted-resource-id", "xml": "<set>\n<parameter name='prop.ar.allotted-resource-id' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id`' />\n", "comments": "", - "x": 1395.0052490234375, - "y": 124.97268486022949, - "z": "816d5e60.eba45", + "x": 1394.0013427734375, + "y": 129.9687786102295, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "7103c5d5.4c730c", + "id": "f2739d06.3f82a", "type": "comment", "name": "Query MDSAL for AR", "info": "", "comments": "", - "x": 1720.3379211425781, - "y": 148.97255420684814, - "z": "816d5e60.eba45", + "x": 1719.3340148925781, + "y": 153.96864795684814, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "95a2de04.a237b", + "id": "4600defb.d9dc1", "type": "comment", "name": "Query MDSAL to get parent service based on service instance id from AR", "info": "", "comments": "", - "x": 2190.338779449463, - "y": 167.97253322601318, - "z": "816d5e60.eba45", + "x": 2189.334873199463, + "y": 172.96862697601318, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "4d085fb4.7bdbe", + "id": "2398fd5d.dbac12", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1969.67232131958, - "y": 203.63917350769043, - "z": "816d5e60.eba45", + "x": 1968.66841506958, + "y": 208.63526725769043, + "z": "afa42c56.2fe06", "wires": [ [ - "6619fa96.9e1c44" + "179e1db5.4a8f02" ] ] }, { - "id": "6619fa96.9e1c44", + "id": "179e1db5.4a8f02", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2124.672161102295, - "y": 203.13900661468506, - "z": "816d5e60.eba45", + "x": 2123.668254852295, + "y": 208.13510036468506, + "z": "afa42c56.2fe06", "wires": [ [ - "65302594.0054ec" + "35d0f2e8.ed82ae" ] ] }, { - "id": "33787bc7.0b4834", + "id": "f8dd83a.151c88", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 2448.3626976013184, - "y": 199.75814723968506, - "z": "816d5e60.eba45", + "x": 2447.3587913513184, + "y": 204.75424098968506, + "z": "afa42c56.2fe06", "wires": [ [ - "545b3871.7610f8" + "2218a177.4e456e" ] ] }, { - "id": "17a34962.7bafd7", + "id": "7900e8ec.0ba228", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n \n", "comments": "", - "x": 2594.1314735412598, - "y": 239.20513534545898, - "z": "816d5e60.eba45", + "x": 2593.1275672912598, + "y": 244.20122909545898, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "60f770e5.3c645", + "id": "7edde1df.f81a4", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1962.5240478515625, - "y": 250.70518016815186, - "z": "816d5e60.eba45", + "x": 1961.5201416015625, + "y": 255.70127391815186, + "z": "afa42c56.2fe06", "wires": [ [ - "a69f2107.3bfff" + "ae127aa8.bf8958" ] ] }, { - "id": "a69f2107.3bfff", + "id": "ae127aa8.bf8958", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2112.5238914489746, - "y": 251.37173557281494, - "z": "816d5e60.eba45", + "x": 2111.5199851989746, + "y": 256.36782932281494, + "z": "afa42c56.2fe06", "wires": [ [ - "48f1dbd9.82eaf4" + "c86b6674.f9da58" ] ] }, { - "id": "3677d240.46bcee", + "id": "735fee8b.f10fd", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2436.6906509399414, - "y": 237.03850746154785, - "z": "816d5e60.eba45", + "x": 2435.6867446899414, + "y": 242.03460121154785, + "z": "afa42c56.2fe06", "wires": [ [ - "17a34962.7bafd7" + "7900e8ec.0ba228" ] ] }, { - "id": "65302594.0054ec", + "id": "35d0f2e8.ed82ae", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 2288.672336578369, - "y": 203.6391897201538, - "z": "816d5e60.eba45", + "x": 2287.668430328369, + "y": 208.6352834701538, + "z": "afa42c56.2fe06", "wires": [ [ - "33787bc7.0b4834", - "3677d240.46bcee" + "f8dd83a.151c88", + "735fee8b.f10fd" ] ] }, { - "id": "f2c93863.974c98", + "id": "99f51e24.95bbd", "type": "set", "name": "set parent-service-instance-id", "xml": "<set>\n<parameter name='prop.parent-service-instance-id' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id`' />\n\n", "comments": "", - "x": 2844.0059356689453, - "y": 200.63917064666748, - "z": "816d5e60.eba45", + "x": 2843.0020294189453, + "y": 205.63526439666748, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "545b3871.7610f8", + "id": "2218a177.4e456e", "type": "block", "name": "block: atomic", "xml": "<block atomic='true'>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2598.4817276000977, - "y": 199.80570697784424, - "z": "816d5e60.eba45", + "x": 2597.4778213500977, + "y": 204.80180072784424, + "z": "afa42c56.2fe06", "wires": [ [ - "f2c93863.974c98", - "c4ef0618.a01ef8" + "99f51e24.95bbd", + "87284033.76d89" ] ] }, { - "id": "48f1dbd9.82eaf4", + "id": "c86b6674.f9da58", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Connection attachement resource not found\" />\n \n", "comments": "", - "x": 2280.005344390869, - "y": 249.63911151885986, - "z": "816d5e60.eba45", + "x": 2279.001438140869, + "y": 254.63520526885986, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "3af4c28.a27653e", + "id": "3ba72ba0.13a9f4", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2067.307460784912, - "y": 521.7748374938965, - "z": "816d5e60.eba45", + "x": 2066.303554534912, + "y": 526.7709312438965, + "z": "afa42c56.2fe06", "wires": [ [ - "29090a88.41c1f6" + "3c18f953.7698e6" ] ] }, { - "id": "b8d8640d.13eac8", + "id": "b947c854.e35438", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2059.15926361084, - "y": 556.8409223556519, - "z": "816d5e60.eba45", + "x": 2058.15535736084, + "y": 561.8370161056519, + "z": "afa42c56.2fe06", "wires": [ [ - "bda3efcf.89dfe" + "5f7ffb48.00ef54" ] ] }, { - "id": "bda3efcf.89dfe", + "id": "5f7ffb48.00ef54", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 2205.308036804199, - "y": 557.1084184646606, - "z": "816d5e60.eba45", + "x": 2204.304130554199, + "y": 562.1045122146606, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "29090a88.41c1f6", + "id": "3c18f953.7698e6", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2187.3077087402344, - "y": 521.774920463562, - "z": "816d5e60.eba45", + "x": 2186.3038024902344, + "y": 526.771014213562, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "c548252d.342ee8", + "id": "9ef76182.7b173", "type": "for", "name": "for pnidx.. mdsal-psd.networks.network_length[]", "xml": "<for index='pnidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n", "comments": "", "outputs": 1, - "x": 1750.6722564697266, - "y": 621.3067955970764, - "z": "816d5e60.eba45", + "x": 1749.6683502197266, + "y": 626.3028893470764, + "z": "afa42c56.2fe06", "wires": [ [ - "e621a712.c02488" + "e38b67ea.4c8758" ] ] }, { - "id": "4d2b2a60.5a15c4", + "id": "348ba1e1.19e85e", "type": "switchNode", "name": "switch ActivateSDWANConnectivityInstance", "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2280.3388900756836, - "y": 590.3067970275879, - "z": "816d5e60.eba45", + "x": 2279.3349838256836, + "y": 595.3028907775879, + "z": "afa42c56.2fe06", "wires": [ [ - "eff7a2d.680436" + "27c81bce.91e324" ] ] }, { - "id": "eff7a2d.680436", + "id": "27c81bce.91e324", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2532.338424682617, - "y": 591.3067345619202, - "z": "816d5e60.eba45", + "x": 2531.334518432617, + "y": 596.3028283119202, + "z": "afa42c56.2fe06", "wires": [ [ - "b41985de.5559e8" + "917509ae.cf1bf8" ] ] }, { - "id": "b41985de.5559e8", + "id": "917509ae.cf1bf8", "type": "set", "name": "set tmp.pnidx ", "xml": "<set>\n<parameter name='tmp.pnidx' value='`$pnidx`' />\n\n", "comments": "", - "x": 2688.3381118774414, - "y": 591.3067345619202, - "z": "816d5e60.eba45", + "x": 2687.3342056274414, + "y": 596.3028283119202, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "2eff9ba0.ecf354", + "id": "1fd45985.393f26", "type": "for", "name": "for loop paramidx - Get topology from servicedata", "xml": "<for index=\"paramidx\" start=\"0\" end=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 1682.3390655517578, - "y": 706.3064250946045, - "z": "816d5e60.eba45", + "x": 1681.3351593017578, + "y": 711.3025188446045, + "z": "afa42c56.2fe06", "wires": [ [ - "f3cef2f6.2a146" + "4ebf01e5.37d06" ] ] }, { - "id": "482a4c29.31cfa4", + "id": "8d7971fd.c23e3", "type": "switchNode", "name": "switch topology", "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`\">\n", "comments": "", "outputs": 1, - "x": 2134.339157104492, - "y": 685.3063306808472, - "z": "816d5e60.eba45", + "x": 2133.335250854492, + "y": 690.3024244308472, + "z": "afa42c56.2fe06", "wires": [ [ - "65d66991.892e68" + "e336f6e8.a1adc8" ] ] }, { - "id": "65d66991.892e68", + "id": "e336f6e8.a1adc8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2285.339168548584, - "y": 683.3063726425171, - "z": "816d5e60.eba45", + "x": 2284.335262298584, + "y": 688.3024663925171, + "z": "afa42c56.2fe06", "wires": [ [ - "1a0e340c.b9591c" + "f2813d3e.d5ec3" ] ] }, { - "id": "1a0e340c.b9591c", + "id": "f2813d3e.d5ec3", "type": "set", "name": "set topology", "xml": "<set>\n<parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2426.338897705078, - "y": 682.9063062667847, - "z": "816d5e60.eba45", + "x": 2425.334991455078, + "y": 687.9024000167847, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "8b82943e.e37978", + "id": "4a7f65c3.11a50c", "type": "switchNode", "name": "switch tmp.pnidx ", "xml": "<switch test=\"`$tmp.pnidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1653.338882446289, - "y": 665.9729976654053, - "z": "816d5e60.eba45", + "x": 1652.334976196289, + "y": 670.9690914154053, + "z": "afa42c56.2fe06", "wires": [ [ - "6c46e25f.8ffa9c" + "42c35e07.6414a" ] ] }, { - "id": "6c46e25f.8ffa9c", + "id": "42c35e07.6414a", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1808.7675552368164, - "y": 664.5443773269653, - "z": "816d5e60.eba45", + "x": 1807.7636489868164, + "y": 669.5404710769653, + "z": "afa42c56.2fe06", "wires": [ [ - "7abaa33.8b7355c" + "79c31704.e1ea48" ] ] }, { - "id": "7abaa33.8b7355c", + "id": "79c31704.e1ea48", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1949.1961784362793, - "y": 665.6874666213989, - "z": "816d5e60.eba45", + "x": 1948.1922721862793, + "y": 670.6835603713989, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "f3550d2c.724f9", + "id": "d058b4fc.a3d908", "type": "switchNode", "name": "switch topology hub-spoke", "xml": "<switch test=\"`$prop.topology == 'hub-spoke'`\">\n", "comments": "", "outputs": 1, - "x": 1561.3387489318848, - "y": 768.3062467575073, - "z": "816d5e60.eba45", + "x": 1560.3348426818848, + "y": 773.3023405075073, + "z": "afa42c56.2fe06", "wires": [ [ - "ab080c7a.92d5", - "3d04ef10.4ea32" + "80132a76.17bcc8", + "f4211b87.94b798" ] ] }, { - "id": "ab080c7a.92d5", + "id": "80132a76.17bcc8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1751.338436126709, - "y": 793.3067321777344, - "z": "816d5e60.eba45", + "x": 1750.334529876709, + "y": 798.3028259277344, + "z": "afa42c56.2fe06", "wires": [ [ - "8abbeb7b.b004e8" + "7df004fc.b974bc" ] ] }, { - "id": "3d04ef10.4ea32", + "id": "f4211b87.94b798", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1745.3393630981445, - "y": 754.3063945770264, - "z": "816d5e60.eba45", + "x": 1744.3354568481445, + "y": 759.3024883270264, + "z": "afa42c56.2fe06", "wires": [ [ - "86771426.4b32c8" + "f043ab05.abcb68" ] ] }, { - "id": "86771426.4b32c8", + "id": "f043ab05.abcb68", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1881.3393669128418, - "y": 754.3063335418701, - "z": "816d5e60.eba45", + "x": 1880.3354606628418, + "y": 759.3024272918701, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "8abbeb7b.b004e8", + "id": "7df004fc.b974bc", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1756.67138671875, - "y": 861.3059663772583, - "z": "816d5e60.eba45", + "x": 1755.66748046875, + "y": 866.3020601272583, + "z": "afa42c56.2fe06", "wires": [ [ - "aa63c4ce.dcdf88" + "f2cfe93e.7237b8" ] ] }, { - "id": "aa63c4ce.dcdf88", + "id": "f2cfe93e.7237b8", "type": "for", "name": "for ppidx.. mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='ppidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 2164.004638671875, - "y": 861.6395845413208, - "z": "816d5e60.eba45", + "x": 2163.000732421875, + "y": 866.6356782913208, + "z": "afa42c56.2fe06", "wires": [ [ - "db34806a.eb197" + "de6797a2.586c78" ] ] }, { - "id": "a12ec2fd.fe008", + "id": "ffb0cb19.6bd078", "type": "set", "name": "set prop.ar.provided-allotted-resource-id", "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$ppidx].allotted-resource-id`' />\n\n", "comments": "", - "x": 2255.0057525634766, - "y": 939.6398825645447, - "z": "816d5e60.eba45", + "x": 2254.0018463134766, + "y": 944.6359763145447, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "48c0bc5c.016e84", + "id": "7d29151f.aff58c", "type": "for", "name": "for loop aridx - Get role from allotted resource", "xml": "<for index=\"aridx\" start=\"0\" end=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2273.0064544677734, - "y": 1050.306674003601, - "z": "816d5e60.eba45", + "x": 2272.0025482177734, + "y": 1055.302767753601, + "z": "afa42c56.2fe06", "wires": [ [ - "6e2c1efa.030fd" + "99b001da.0efb4" ] ] }, { - "id": "d87f1462.94a148", + "id": "175772d7.f9d53d", "type": "switchNode", "name": "switch Role", "xml": "<switch test=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].name == 'Role'`\">\n", "comments": "", "outputs": 1, - "x": 2682.006565093994, - "y": 1053.3067607879639, - "z": "816d5e60.eba45", + "x": 2681.002658843994, + "y": 1058.3028545379639, + "z": "afa42c56.2fe06", "wires": [ [ - "8902bff0.b993a" + "d13f62a9.a25bd" ] ] }, { - "id": "8902bff0.b993a", + "id": "d13f62a9.a25bd", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2823.0068969726562, - "y": 1052.3067598342896, - "z": "816d5e60.eba45", + "x": 2822.0029907226562, + "y": 1057.3028535842896, + "z": "afa42c56.2fe06", "wires": [ [ - "d0dace3e.a4044" + "63261a78.0b6344" ] ] }, { - "id": "d0dace3e.a4044", + "id": "63261a78.0b6344", "type": "set", "name": "set prop.role", "xml": "<set>\n<parameter name='prop.role' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$aridx].value`' />\n", "comments": "", - "x": 2964.0069313049316, - "y": 1053.9066514968872, - "z": "816d5e60.eba45", + "x": 2963.0030250549316, + "y": 1058.9027452468872, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "a56e979.94c4668", + "id": "63613798.d70908", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2759.0059509277344, - "y": 956.973176240921, - "z": "816d5e60.eba45", + "x": 2758.0020446777344, + "y": 961.969269990921, + "z": "afa42c56.2fe06", "wires": [ [ - "5e3a3525.ed601c" + "18ba51e1.01a3be" ] ] }, { - "id": "36ee87ff.edcc88", + "id": "9fe7ff8.35548", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2755.8576736450195, - "y": 1011.0392594337463, - "z": "816d5e60.eba45", + "x": 2754.8537673950195, + "y": 1016.0353531837463, + "z": "afa42c56.2fe06", "wires": [ [ - "61955a75.34d004" + "2fd2f3c1.09b97c" ] ] }, { - "id": "1dae6147.4a990f", + "id": "8ad9ee53.6aa87", "type": "switchNode", "name": "switch role hub", "xml": "<switch test=\"`$prop.role == hub`\">\n", "comments": "", "outputs": 1, - "x": 2139.3390884399414, - "y": 1115.6397142410278, - "z": "816d5e60.eba45", + "x": 2138.3351821899414, + "y": 1120.6358079910278, + "z": "afa42c56.2fe06", "wires": [ [ - "918c56f9.c83968", - "c6d12fe7.97792" + "6011fd41.335614", + "472beb8.34ca814" ] ] }, { - "id": "f44852b5.87cbc", + "id": "890f782e.076f68", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2455.3384742736816, - "y": 1091.6393175125122, - "z": "816d5e60.eba45", + "x": 2454.3345680236816, + "y": 1096.6354112625122, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "b92c0442.b0f838", + "id": "aa2b8cd4.2f9ae", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2865.3081092834473, - "y": 1187.1084241867065, - "z": "816d5e60.eba45", + "x": 2864.3042030334473, + "y": 1192.1045179367065, + "z": "afa42c56.2fe06", "wires": [ [ - "c83cb2fc.e107f" + "4765f05a.45c5e" ] ] }, { - "id": "3638a6d7.49015a", + "id": "1bed61f6.90e36e", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2867.159679412842, - "y": 1247.174506187439, - "z": "816d5e60.eba45", + "x": 2866.155773162842, + "y": 1252.170599937439, + "z": "afa42c56.2fe06", "wires": [ [ - "7e0afffe.3838d" + "151f6728.afe339" ] ] }, { - "id": "7e0afffe.3838d", + "id": "151f6728.afe339", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SDWAN service-data not found\" />\n \n", "comments": "", - "x": 3011.308452606201, - "y": 1209.4419202804565, - "z": "816d5e60.eba45", + "x": 3010.304546356201, + "y": 1214.4380140304565, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "c83cb2fc.e107f", + "id": "4765f05a.45c5e", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2995.3081283569336, - "y": 1176.1085844039917, - "z": "816d5e60.eba45", + "x": 2994.3042221069336, + "y": 1181.1046781539917, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "f6606352.8ce6f", + "id": "f7f9e60d.d46178", "type": "set", "name": "set prop.ar-service-instance-id", "xml": "<set>\n<parameter name='prop.ar-service-instance-id' value='`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n", "comments": "", - "x": 2467.3395080566406, - "y": 1175.6399170160294, - "z": "816d5e60.eba45", + "x": 2466.3356018066406, + "y": 1180.6360107660294, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "5ea29b9f.be4264", + "id": "f464743.4983e88", "type": "for", "name": "for arvidx.. mdsal-arsd.service-data.vnfs.vnf_length[]", "xml": "<for index='arvidx' start='0' end='`$mdsal-arsd.service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 2511.0059814453125, - "y": 1297.6397066116333, - "z": "816d5e60.eba45", + "x": 2510.0020751953125, + "y": 1302.6358003616333, + "z": "afa42c56.2fe06", "wires": [ [ - "4d51cabb.29bdd4" + "535fb492.abce2c" ] ] }, { - "id": "4d51cabb.29bdd4", + "id": "535fb492.abce2c", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2857.6723022460938, - "y": 1287.6396827697754, - "z": "816d5e60.eba45", + "x": 2856.6683959960938, + "y": 1292.6357765197754, + "z": "afa42c56.2fe06", "wires": [ [ - "d3ef4c0.e5881b8", - "6e60b7ca.332018", - "a1284f22.c1dd1" + "b26020e0.3a846", + "5e2a4404.59208c", + "858743af.15464" ] ] }, { - "id": "d3ef4c0.e5881b8", + "id": "b26020e0.3a846", "type": "switchNode", "name": "switch ActivateSDWANPortInstance", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n \n\n", "comments": "", "outputs": 1, - "x": 3119.672410964966, - "y": 1258.6406421661377, - "z": "816d5e60.eba45", + "x": 3118.668504714966, + "y": 1263.6367359161377, + "z": "afa42c56.2fe06", "wires": [ [ - "bf3a29ae.d2e8a8" + "6b78409.f5b87c" ] ] }, { - "id": "5fa744b7.80a78c", + "id": "dde2f6f9.3c1848", "type": "switchNode", "name": "switch tmp.portvidx ", "xml": "<switch test=\"`$tmp.portvidx`\">\n\n", "comments": "", "outputs": 1, - "x": 2592.672119140625, - "y": 1342.3063516616821, - "z": "816d5e60.eba45", + "x": 2591.668212890625, + "y": 1347.3024454116821, + "z": "afa42c56.2fe06", "wires": [ [ - "72b9c858.12ec88" + "58f23c0f.4a7544" ] ] }, { - "id": "15f5118.456cfef", + "id": "3d280456.864e3c", "type": "for", "name": "for loop wportidx - Get wan port ID from servicedata", "xml": "<for index=\"wportidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2517.6727294921875, - "y": 1497.6406106948853, - "z": "816d5e60.eba45", + "x": 2516.6688232421875, + "y": 1502.6367044448853, + "z": "afa42c56.2fe06", "wires": [ [ - "b2e9e931.6800c8" + "3b6a88cf.f649b8" ] ] }, { - "id": "72b9c858.12ec88", + "id": "58f23c0f.4a7544", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2753.1005840301514, - "y": 1341.8778715133667, - "z": "816d5e60.eba45", + "x": 2752.0966777801514, + "y": 1346.8739652633667, + "z": "afa42c56.2fe06", "wires": [ [ - "f81f5327.8ee49" + "6637a392.65819c" ] ] }, { - "id": "f81f5327.8ee49", + "id": "6637a392.65819c", "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.vnf-request-input.vnf-id (port) not found in service-data\" />\n", "comments": "", - "x": 2890.529541015625, - "y": 1342.0212831497192, - "z": "816d5e60.eba45", + "x": 2889.525634765625, + "y": 1347.0173768997192, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "bf3a29ae.d2e8a8", + "id": "6b78409.f5b87c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3347.67209815979, - "y": 1256.640643119812, - "z": "816d5e60.eba45", + "x": 3346.66819190979, + "y": 1261.636736869812, + "z": "afa42c56.2fe06", "wires": [ [ - "2e9dbb2.cfc4c44" + "11f23b34.c014d5" ] ] }, { - "id": "b2e9e931.6800c8", + "id": "3b6a88cf.f649b8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2860.673713684082, - "y": 1500.6408605575562, - "z": "816d5e60.eba45", + "x": 2859.669807434082, + "y": 1505.6369543075562, + "z": "afa42c56.2fe06", "wires": [ [ - "948d8437.e73248", - "89e2b91a.b2d6b8", - "18165b60.a7ba85", - "ccf6624c.26897" + "9eb62557.123aa8", + "6f944994.65d2c8", + "b81eb9e0.1976f8", + "3235095c.ee2c06" ] ] }, { - "id": "948d8437.e73248", + "id": "9eb62557.123aa8", "type": "switchNode", "name": "switch transportNetworkName", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`\">\n", "comments": "", "outputs": 1, - "x": 3155.674663543701, - "y": 1439.6413974761963, - "z": "816d5e60.eba45", + "x": 3154.670757293701, + "y": 1444.6374912261963, + "z": "afa42c56.2fe06", "wires": [ [ - "cfc84538.b28318" + "a7e30f58.58c4" ] ] }, { - "id": "2e9dbb2.cfc4c44", + "id": "11f23b34.c014d5", "type": "set", "name": "set tmp.portvidx ", "xml": "<set>\n<parameter name='tmp.portvidx' value='`$arvidx`' />\n\n", "comments": "", - "x": 3502.671781539917, - "y": 1256.6406421661377, - "z": "816d5e60.eba45", + "x": 3501.667875289917, + "y": 1261.6367359161377, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "cfc84538.b28318", + "id": "a7e30f58.58c4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3348.6746788024902, - "y": 1439.64155960083, - "z": "816d5e60.eba45", + "x": 3347.6707725524902, + "y": 1444.63765335083, + "z": "afa42c56.2fe06", "wires": [ [ - "cb06aff7.fe992" + "9cf2c3d4.0b4b5" ] ] }, { - "id": "cb06aff7.fe992", + "id": "9cf2c3d4.0b4b5", "type": "set", "name": "set prop.hub.transportNetworkName", "xml": "<set>\n<parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n", "comments": "", - "x": 3566.6746864318848, - "y": 1438.24214553833, - "z": "816d5e60.eba45", + "x": 3565.6707801818848, + "y": 1443.23823928833, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "89e2b91a.b2d6b8", + "id": "6f944994.65d2c8", "type": "switchNode", "name": "switch wanPortId", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`\">\n", "comments": "", "outputs": 1, - "x": 3117.007396697998, - "y": 1473.6410064697266, - "z": "816d5e60.eba45", + "x": 3116.003490447998, + "y": 1478.6371002197266, + "z": "afa42c56.2fe06", "wires": [ [ - "c1169dfe.4c65a" + "b31bd9b2.46c7d8" ] ] }, { - "id": "c1169dfe.4c65a", + "id": "b31bd9b2.46c7d8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3278.007724761963, - "y": 1474.6410865783691, - "z": "816d5e60.eba45", + "x": 3277.003818511963, + "y": 1479.6371803283691, + "z": "afa42c56.2fe06", "wires": [ [ - "6fd3807f.bc967" + "d3357919.f54078" ] ] }, { - "id": "6fd3807f.bc967", + "id": "d3357919.f54078", "type": "set", "name": "set prop.hub.wanPortId", "xml": "<set>\n<parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n", "comments": "", - "x": 3468.008186340332, - "y": 1474.2413625717163, - "z": "816d5e60.eba45", + "x": 3467.004280090332, + "y": 1479.2374563217163, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "2d5b2f06.016de", + "id": "2c43f3c.460060c", "type": "switchNode", "name": "switch prop.hub.transportNetworkName==prop.spoke.transportNetworkName", "xml": "<switch test=\"`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`\">\n", "comments": "", "outputs": 1, - "x": 2595.008056640625, - "y": 1600.308346748352, - "z": "816d5e60.eba45", + "x": 2594.004150390625, + "y": 1605.304440498352, + "z": "afa42c56.2fe06", "wires": [ [ - "336fdae9.175cb6", - "1f1ba045.97a09" + "cf49239.d51bfe", + "c6577e7a.d8dfd" ] ] }, { - "id": "336fdae9.175cb6", + "id": "cf49239.d51bfe", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2941.0075874328613, - "y": 1637.3084206581116, - "z": "816d5e60.eba45", + "x": 2940.0036811828613, + "y": 1642.3045144081116, + "z": "afa42c56.2fe06", "wires": [ [ - "4f105ce1.5af714" + "c20a45c1.991ea8" ] ] }, { - "id": "1f1ba045.97a09", + "id": "c6577e7a.d8dfd", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 2945.0080757141113, - "y": 1572.3080530166626, - "z": "816d5e60.eba45", + "x": 2944.0041694641113, + "y": 1577.3041467666626, + "z": "afa42c56.2fe06", "wires": [ [ - "5909586.22baea8" + "7523e16b.4849a" ] ] }, { - "id": "5909586.22baea8", + "id": "7523e16b.4849a", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3085.0080032348633, - "y": 1600.308177947998, - "z": "816d5e60.eba45", + "x": 3084.0040969848633, + "y": 1605.304271697998, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "db34806a.eb197", + "id": "de6797a2.586c78", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1906.0361328125, - "y": 970.8372163772583, - "z": "816d5e60.eba45", + "x": 1905.0322265625, + "y": 975.8333101272583, + "z": "afa42c56.2fe06", "wires": [ [ - "a12ec2fd.fe008", - "7504b3dc.db15fc", - "28b961ad.bfb2de", - "1dae6147.4a990f", - "48c0bc5c.016e84" + "ffb0cb19.6bd078", + "9b080888.c9b298", + "1ff59188.ff36ae", + "8ad9ee53.6aa87", + "7d29151f.aff58c" ] ] }, { - "id": "3b80b5a9.9770ba", + "id": "524b783f.8c1128", "type": "switchNode", "name": "switch vpnId", - "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`\">\n", + "xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`\">\n", "comments": "", "outputs": 1, - "x": 2124.005172729492, - "y": 729.6393413543701, - "z": "816d5e60.eba45", + "x": 2123.001266479492, + "y": 734.6354351043701, + "z": "afa42c56.2fe06", "wires": [ [ - "c6514d30.77c24" + "6c47f41b.3d3cac" ] ] }, { - "id": "c6514d30.77c24", + "id": "6c47f41b.3d3cac", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2268.005184173584, - "y": 729.6393823623657, - "z": "816d5e60.eba45", + "x": 2267.001277923584, + "y": 734.6354761123657, + "z": "afa42c56.2fe06", "wires": [ [ - "777a9029.320d4" + "9b1a7d07.58406" ] ] }, { - "id": "777a9029.320d4", + "id": "9b1a7d07.58406", "type": "set", "name": "set prop.vpnId", "xml": "<set>\n<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />\n", "comments": "", - "x": 2426.0049057006836, - "y": 728.2393169403076, - "z": "816d5e60.eba45", + "x": 2425.0009994506836, + "y": 733.2354106903076, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "772df895.4e43b8", + "id": "c93e7e34.eb504", "type": "set", "name": "Set prop.hubTnpId", "xml": "<set>\n<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />\n\n", "comments": "", - "x": 2632.340461730957, - "y": 1726.6402111053467, - "z": "816d5e60.eba45", + "x": 2631.336555480957, + "y": 1731.6363048553467, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "32021f5a.688fc", + "id": "33961398.8b885c", "type": "execute", "name": "execute RestApiCallNode underlay route", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 3461.3399982452393, - "y": 2412.9747483730316, - "z": "816d5e60.eba45", + "x": 3463.33624458313, + "y": 2602.9708592891693, + "z": "afa42c56.2fe06", "wires": [ [ - "dd81b865.bfe928", - "b6ee17f7.b3f2b8" + "54355641.66e388", + "a6852c79.79538" ] ] }, { - "id": "b6ee17f7.b3f2b8", + "id": "a6852c79.79538", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 3728.339906692505, - "y": 2440.9747779369354, - "z": "816d5e60.eba45", + "x": 3730.3361530303955, + "y": 2630.970888853073, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "dd81b865.bfe928", + "id": "54355641.66e388", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 3726.3395862579346, - "y": 2396.9747684001923, - "z": "816d5e60.eba45", + "x": 3728.335832595825, + "y": 2586.97087931633, + "z": "afa42c56.2fe06", "wires": [ [ - "5f5cdc8d.3e29c4" + "e784c17f.677b5" ] ] }, { - "id": "5f5cdc8d.3e29c4", + "id": "e784c17f.677b5", "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=\"Error executing sdwan hub route underlay rest api\" />\n", "comments": "", - "x": 3868.3402729034424, - "y": 2394.974851369858, - "z": "816d5e60.eba45", + "x": 3870.336519241333, + "y": 2584.9709622859955, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "ae46a29e.f97e3", + "id": "45a08ea1.9e3d3", "type": "set", "name": "Add prop.hub.route", "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.hubRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n", "comments": "", - "x": 3405.6733779907227, - "y": 2369.6412563323975, - "z": "816d5e60.eba45", + "x": 3407.6696243286133, + "y": 2559.637367248535, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "6c422db5.5ce744", + "id": "5e2b5a00.fe4964", "type": "execute", "name": "execute RestApiCallNode underlay route", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 3480.6733779907227, - "y": 2511.6417214870453, - "z": "816d5e60.eba45", + "x": 3482.6696243286133, + "y": 2701.637832403183, + "z": "afa42c56.2fe06", "wires": [ [ - "911061e0.d1dd4", - "f999921.375d37" + "e568918e.3bed", + "6ef02e4e.06cc1" ] ] }, { - "id": "f999921.375d37", + "id": "6ef02e4e.06cc1", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 3732.6735248565674, - "y": 2540.6420180797577, - "z": "816d5e60.eba45", + "x": 3734.669771194458, + "y": 2730.6381289958954, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "911061e0.d1dd4", + "id": "e568918e.3bed", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 3730.673204421997, - "y": 2496.6420085430145, - "z": "816d5e60.eba45", + "x": 3732.6694507598877, + "y": 2686.638119459152, + "z": "afa42c56.2fe06", "wires": [ [ - "98292650.e96428" + "43fb9f64.6e794" ] ] }, { - "id": "98292650.e96428", + "id": "43fb9f64.6e794", "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=\"Error executing sdwan spoke route underlay rest api\" />\n", "comments": "", - "x": 3872.673891067505, - "y": 2494.64209151268, - "z": "816d5e60.eba45", + "x": 3874.6701374053955, + "y": 2684.6382024288177, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "6e60b7ca.332018", + "id": "5e2a4404.59208c", "type": "switchNode", "name": "switch ActivateSDWANDeviceInstance", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 3130.535987854004, - "y": 1291.8376007080078, - "z": "816d5e60.eba45", + "x": 3129.532081604004, + "y": 1296.8336944580078, + "z": "afa42c56.2fe06", "wires": [ [ - "8aedc456.2f7ae8" + "355d1cb7.8466e4" ] ] }, { - "id": "ae09c3af.7e2b1", + "id": "85c67b27.be5eb8", "type": "switchNode", "name": "switch tmp.devicevidx ", "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n", "comments": "", "outputs": 1, - "x": 2598.5355377197266, - "y": 1384.5038328170776, - "z": "816d5e60.eba45", + "x": 2597.5316314697266, + "y": 1389.4999265670776, + "z": "afa42c56.2fe06", "wires": [ [ - "250b22bf.a152be" + "188473e9.fdf33c" ] ] }, { - "id": "250b22bf.a152be", + "id": "188473e9.fdf33c", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2764.9639739990234, - "y": 1384.0753660202026, - "z": "816d5e60.eba45", + "x": 2763.9600677490234, + "y": 1389.0714597702026, + "z": "afa42c56.2fe06", "wires": [ [ - "923c6659.234fb8" + "ec42dab0.d633d8" ] ] }, { - "id": "923c6659.234fb8", + "id": "ec42dab0.d633d8", "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.vnf-request-input.vnf-id (device) not found in service-data\" />\n", "comments": "", - "x": 2905.392906188965, - "y": 1386.2183408737183, - "z": "816d5e60.eba45", + "x": 2904.388999938965, + "y": 1391.2144346237183, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "8aedc456.2f7ae8", + "id": "355d1cb7.8466e4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3358.535675048828, - "y": 1289.8376016616821, - "z": "816d5e60.eba45", + "x": 3357.531768798828, + "y": 1294.8336954116821, + "z": "afa42c56.2fe06", "wires": [ [ - "bd37a285.897b2" + "73270e6c.070f4" ] ] }, { - "id": "bd37a285.897b2", + "id": "73270e6c.070f4", "type": "set", "name": "set tmp.devicevidx ", "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$arvidx`' />\n\n", "comments": "", - "x": 3513.535358428955, - "y": 1289.8376007080078, - "z": "816d5e60.eba45", + "x": 3512.531452178955, + "y": 1294.8336944580078, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "a1284f22.c1dd1", + "id": "858743af.15464", "type": "switchNode", "name": "switch ActivateSiteInstance", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 3093.5360584259033, - "y": 1325.837664604187, - "z": "816d5e60.eba45", + "x": 3092.5321521759033, + "y": 1330.833758354187, + "z": "afa42c56.2fe06", "wires": [ [ - "b05e575a.27f578" + "f6939cb3.d0942" ] ] }, { - "id": "3739eed6.72baf2", + "id": "1e774611.be647a", "type": "switchNode", "name": "switch tmp.sitevidx ", "xml": "<switch test=\"`$tmp.sitevidx`\">\n\n", "comments": "", "outputs": 1, - "x": 2597.5354080200195, - "y": 1422.5037107467651, - "z": "816d5e60.eba45", + "x": 2596.5315017700195, + "y": 1427.4998044967651, + "z": "afa42c56.2fe06", "wires": [ [ - "3396efac.e6fa3" + "bc02814a.d7499" ] ] }, { - "id": "3396efac.e6fa3", + "id": "bc02814a.d7499", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 2757.963872909546, - "y": 1422.0752305984497, - "z": "816d5e60.eba45", + "x": 2756.959966659546, + "y": 1427.0713243484497, + "z": "afa42c56.2fe06", "wires": [ [ - "35fde04d.b7b7a" + "d392366e.9150d8" ] ] }, { - "id": "35fde04d.b7b7a", + "id": "d392366e.9150d8", "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.vnf-request-input.vnf-id (site) not found in service-data\" />\n", "comments": "", - "x": 2906.392827987671, - "y": 1424.2182369232178, - "z": "816d5e60.eba45", + "x": 2905.388921737671, + "y": 1429.2143306732178, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "b05e575a.27f578", + "id": "f6939cb3.d0942", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3281.535623550415, - "y": 1325.837830543518, - "z": "816d5e60.eba45", + "x": 3280.531717300415, + "y": 1330.833924293518, + "z": "afa42c56.2fe06", "wires": [ [ - "18980fd.036c1f" + "ab570b08.b1c7a8" ] ] }, { - "id": "18980fd.036c1f", + "id": "ab570b08.b1c7a8", "type": "set", "name": "set tmp.sitevidx ", "xml": "<set>\n<parameter name='tmp.sitevidx' value='`$arvidx`' />\n\n", "comments": "", - "x": 3436.535306930542, - "y": 1325.8378295898438, - "z": "816d5e60.eba45", + "x": 3435.531400680542, + "y": 1330.8339233398438, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "5b475dee.c12664", + "id": "37339d04.d0e692", "type": "for", "name": "for loop deviceidx - Get wan port ID from servicedata", "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2729.5370559692383, - "y": 1762.837965965271, - "z": "816d5e60.eba45", + "x": 2728.5331497192383, + "y": 1767.834059715271, + "z": "afa42c56.2fe06", "wires": [ [ - "42885256.de226c" + "fc5d79c.538d088" ] ] }, { - "id": "a3360f10.ddde5", + "id": "29161345.19c04c", "type": "switchNode", "name": "switch deviceId", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n", "comments": "", "outputs": 1, - "x": 3190.5384101867676, - "y": 1676.838833808899, - "z": "816d5e60.eba45", + "x": 3189.5345039367676, + "y": 1681.834927558899, + "z": "afa42c56.2fe06", "wires": [ [ - "ecee3f37.bc6a5" + "cded98bd.ccea58" ] ] }, { - "id": "ecee3f37.bc6a5", + "id": "cded98bd.ccea58", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3341.5387840270996, - "y": 1673.839077949524, - "z": "816d5e60.eba45", + "x": 3340.5348777770996, + "y": 1678.835171699524, + "z": "afa42c56.2fe06", "wires": [ [ - "1f5be2a4.d6905d" + "d9cc984d.9f9d28" ] ] }, { - "id": "1f5be2a4.d6905d", + "id": "d9cc984d.9f9d28", "type": "set", "name": "set prop.hub.deviceId", "xml": "<set>\n<parameter name='prop.hub.deviceId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.devicevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n", "comments": "", - "x": 3516.539031982422, - "y": 1673.4396028518677, - "z": "816d5e60.eba45", + "x": 3515.535125732422, + "y": 1678.4356966018677, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "4b7a9b51.8c06a4", + "id": "125c1fec.50ea4", "type": "for", "name": "for loop siteidx - Get site ID from servicedata", "xml": "<for index=\"siteidx\" start=\"0\" end=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2704.0369415283203, - "y": 1819.83798122406, - "z": "816d5e60.eba45", + "x": 2703.0330352783203, + "y": 1824.83407497406, + "z": "afa42c56.2fe06", "wires": [ [ - "48cb425f.55b89c" + "d543abbf.21d958" ] ] }, { - "id": "d000ff03.568cc", + "id": "e6b24865.170e78", "type": "comment", "name": "Add route src->dst, dst->src", "info": "", "comments": "", - "x": 2920.6726989746094, - "y": 1867.6398572921753, - "z": "816d5e60.eba45", + "x": 2919.6687927246094, + "y": 1872.6359510421753, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "29f55e34.5e8332", + "id": "79cfeb5f.61b2e4", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2142.338134765625, - "y": 1247.972653388977, - "z": "816d5e60.eba45", + "x": 2141.334228515625, + "y": 1252.968747138977, + "z": "afa42c56.2fe06", "wires": [ [ - "5ea29b9f.be4264", - "15f5118.456cfef", - "2d5b2f06.016de", - "e6f50ce2.c15fa", - "f6606352.8ce6f", - "ed12d667.ce10c8", - "bae059eb.7d03c8" + "f464743.4983e88", + "3d280456.864e3c", + "2c43f3c.460060c", + "18153066.3dcbc", + "f7f9e60d.d46178", + "a780d837.5bb548", + "fcb5aaf7.a56738" ] ] }, { - "id": "e6f50ce2.c15fa", + "id": "18153066.3dcbc", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2397.337890625, - "y": 1384.3060274124146, - "z": "816d5e60.eba45", + "x": 2396.333984375, + "y": 1389.3021211624146, + "z": "afa42c56.2fe06", "wires": [ [ - "5fa744b7.80a78c", - "ae09c3af.7e2b1", - "3739eed6.72baf2" + "dde2f6f9.3c1848", + "85c67b27.be5eb8", + "1e774611.be647a" ] ] }, { - "id": "4f105ce1.5af714", + "id": "c20a45c1.991ea8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2417.3389282226562, - "y": 1756.639549255371, - "z": "816d5e60.eba45", + "x": 2416.3350219726562, + "y": 1761.635643005371, + "z": "afa42c56.2fe06", "wires": [ [ - "772df895.4e43b8", - "5b475dee.c12664", - "4b7a9b51.8c06a4", - "4ae4f054.fa7eb" + "c93e7e34.eb504", + "37339d04.d0e692", + "125c1fec.50ea4", + "f1944c46.f8a7e" ] ] }, { - "id": "18165b60.a7ba85", + "id": "b81eb9e0.1976f8", "type": "switchNode", "name": "switch providerIpAddress", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`\">\n", "comments": "", "outputs": 1, - "x": 3138.5358810424805, - "y": 1510.8373112678528, - "z": "816d5e60.eba45", + "x": 3137.5319747924805, + "y": 1515.8334050178528, + "z": "afa42c56.2fe06", "wires": [ [ - "547ceb11.0ca1f4" + "9a3783d0.0d525" ] ] }, { - "id": "547ceb11.0ca1f4", + "id": "9a3783d0.0d525", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3314.536865234375, - "y": 1510.8374338150024, - "z": "816d5e60.eba45", + "x": 3313.532958984375, + "y": 1515.8335275650024, + "z": "afa42c56.2fe06", "wires": [ [ - "79cc0282.5e8e0c" + "87437b42.24d3e8" ] ] }, { - "id": "79cc0282.5e8e0c", + "id": "87437b42.24d3e8", "type": "set", "name": "set prop.hub.providerIpAddress", "xml": "<set>\n<parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n", "comments": "", - "x": 3516.5369033813477, - "y": 1511.4373540878296, - "z": "816d5e60.eba45", + "x": 3515.5329971313477, + "y": 1516.4334478378296, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "ccf6624c.26897", + "id": "3235095c.ee2c06", "type": "switchNode", "name": "switch ipAddress", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`\">\n", "comments": "", "outputs": 1, - "x": 3111.0359630584717, - "y": 1548.337396621704, - "z": "816d5e60.eba45", + "x": 3110.0320568084717, + "y": 1553.333490371704, + "z": "afa42c56.2fe06", "wires": [ [ - "11581651.226caa" + "901583b2.3d45c" ] ] }, { - "id": "11581651.226caa", + "id": "901583b2.3d45c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3315.0369033813477, - "y": 1548.3373484611511, - "z": "816d5e60.eba45", + "x": 3314.0329971313477, + "y": 1553.3334422111511, + "z": "afa42c56.2fe06", "wires": [ [ - "4b6a5df1.4c4ce4" + "3c3cbc3f.366104" ] ] }, { - "id": "4b6a5df1.4c4ce4", + "id": "3c3cbc3f.366104", "type": "set", "name": "set prop.hub.ipAddress", "xml": "<set>\n<parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />\n", "comments": "", - "x": 3510.036907196045, - "y": 1547.9373240470886, - "z": "816d5e60.eba45", + "x": 3509.033000946045, + "y": 1552.9334177970886, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "162bc63c.6a40ba", + "id": "3208baf8.6aed86", "type": "set", "name": "Add prop.spoke.route", "xml": "<set>\n<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n\n\n", "comments": "", - "x": 3415.5373935699463, - "y": 2480.338482618332, - "z": "816d5e60.eba45", + "x": 3417.533639907837, + "y": 2670.3345935344696, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "e68f1fae.052f", + "id": "723ddf07.218d1", "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": 367.3382110595703, - "y": 1122.3382453918457, - "z": "816d5e60.eba45", + "x": 366.3343048095703, + "y": 1127.3343391418457, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "20ecb75b.a622b8", + "id": "428d17cf.9d4528", "type": "execute", "name": "generate connection attachment AR url ", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 1416.6711120605469, - "y": 184.30574321746826, - "z": "816d5e60.eba45", + "x": 1415.6672058105469, + "y": 189.30183696746826, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "f4ac6977.3d92e8", + "id": "31785cb6.7e6854", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 1543.671142578125, - "y": 232.3057336807251, - "z": "816d5e60.eba45", + "x": 1542.667236328125, + "y": 237.3018274307251, + "z": "afa42c56.2fe06", "wires": [ [ - "4d085fb4.7bdbe", - "60f770e5.3c645" + "2398fd5d.dbac12", + "7edde1df.f81a4" ] ] }, { - "id": "e17df7dc.7298b8", + "id": "8a7f6cb5.ac077", "type": "execute", "name": "execute RestApiCallNode - get parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-parent-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 1768.0052947998047, - "y": 566.3060474395752, - "z": "816d5e60.eba45", + "x": 1767.0013885498047, + "y": 571.3021411895752, + "z": "afa42c56.2fe06", "wires": [ [ - "3af4c28.a27653e", - "b8d8640d.13eac8" + "3ba72ba0.13a9f4", + "b947c854.e35438" ] ] }, { - "id": "496b2343.92811c", + "id": "39b9e240.c55f5e", "type": "execute", "name": "generate connection attachment parent url ", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-parent-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 1745.0049438476562, - "y": 512.3059749603271, - "z": "816d5e60.eba45", + "x": 1744.0010375976562, + "y": 517.3020687103271, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "de20210d.6ba26", + "id": "e2c10566.d14818", "type": "comment", "name": "full mesh do nothing", "info": "", "comments": "", - "x": 1579.671745300293, - "y": 723.3060131072998, - "z": "816d5e60.eba45", + "x": 1578.667839050293, + "y": 728.3021068572998, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "688e61c6.6ef82", + "id": "3ed45cd4.e3df94", "type": "comment", "name": "hub-spoke", "info": "", "comments": "", - "x": 2580.6711463928223, - "y": 820.3059029579163, - "z": "816d5e60.eba45", + "x": 2579.6672401428223, + "y": 825.3019967079163, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "7504b3dc.db15fc", + "id": "9b080888.c9b298", "type": "execute", "name": "generate connection attachment AR url ", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar.provided-allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 2253.0042991638184, - "y": 971.3058981895447, - "z": "816d5e60.eba45", + "x": 2252.0003929138184, + "y": 976.3019919395447, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "28b961ad.bfb2de", + "id": "1ff59188.ff36ae", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n\n", "comments": "", "outputs": 1, - "x": 2384.004379272461, - "y": 1010.9725279808044, - "z": "816d5e60.eba45", + "x": 2383.000473022461, + "y": 1015.9686217308044, + "z": "afa42c56.2fe06", "wires": [ [ - "a56e979.94c4668", - "36ee87ff.edcc88" + "63613798.d70908", + "9fe7ff8.35548" ] ] }, { - "id": "ed12d667.ce10c8", + "id": "a780d837.5bb548", "type": "execute", "name": "generate service data url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$prop.ar-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 2434.508274078369, - "y": 1212.3097982406616, - "z": "816d5e60.eba45", + "x": 2433.504367828369, + "y": 1217.3058919906616, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "bae059eb.7d03c8", + "id": "fcb5aaf7.a56738", "type": "execute", "name": "execute RestApiCallNode - get service data of allotted resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-arsd\" />\n\n", "comments": "", "outputs": 1, - "x": 2550.5084075927734, - "y": 1249.3096895217896, - "z": "816d5e60.eba45", + "x": 2549.5045013427734, + "y": 1254.3057832717896, + "z": "afa42c56.2fe06", "wires": [ [ - "b92c0442.b0f838", - "3638a6d7.49015a" + "aa2b8cd4.2f9ae", + "1bed61f6.90e36e" ] ] }, { - "id": "c6d12fe7.97792", + "id": "472beb8.34ca814", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2314.5039710998535, - "y": 1134.8057622909546, - "z": "816d5e60.eba45", + "x": 2313.5000648498535, + "y": 1139.8018560409546, + "z": "afa42c56.2fe06", "wires": [ [ - "29f55e34.5e8332" + "79cfeb5f.61b2e4" ] ] }, { - "id": "918c56f9.c83968", + "id": "6011fd41.335614", "type": "outcomeFalse", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 2320.504219055176, - "y": 1091.805853843689, - "z": "816d5e60.eba45", + "x": 2319.500312805176, + "y": 1096.801947593689, + "z": "afa42c56.2fe06", "wires": [ [ - "f44852b5.87cbc" + "890f782e.076f68" ] ] }, { - "id": "c4ef0618.a01ef8", + "id": "87284033.76d89", "type": "for", "name": "for loop roleidx - Get role from allotted resource", "xml": "<for index=\"roleidx\" start=\"0\" end=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2895.5047760009766, - "y": 239.30567932128906, - "z": "816d5e60.eba45", + "x": 2894.5008697509766, + "y": 244.30177307128906, + "z": "afa42c56.2fe06", "wires": [ [ - "67fa3697.488778" + "73b90990.d19928" ] ] }, { - "id": "67fa3697.488778", + "id": "73b90990.d19928", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3154.5050888061523, - "y": 238.3059949874878, - "z": "816d5e60.eba45", + "x": 3153.5011825561523, + "y": 243.3020887374878, + "z": "afa42c56.2fe06", "wires": [ [ - "907c7650.cad4a8" + "8cac5932.b8b208" ] ] }, { - "id": "907c7650.cad4a8", + "id": "8cac5932.b8b208", "type": "switchNode", "name": "switch Role", "xml": "<switch test=\"`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].name == 'role'`\">\n", "comments": "", "outputs": 1, - "x": 3303.505100250244, - "y": 239.3058319091797, - "z": "816d5e60.eba45", + "x": 3302.501194000244, + "y": 244.3019256591797, + "z": "afa42c56.2fe06", "wires": [ [ - "d808a0cf.f074f" + "bf369f65.c443d" ] ] }, { - "id": "d539825b.12e92", + "id": "9b7f20f8.db3b3", "type": "set", "name": "set prop.spoke.role", "xml": "<set>\n<parameter name='prop.spoke.role' value='`$mdsal-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$roleidx].value`' />\n", "comments": "", - "x": 3608.505661010742, - "y": 236.90573978424072, - "z": "816d5e60.eba45", + "x": 3607.501754760742, + "y": 241.90183353424072, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "d808a0cf.f074f", + "id": "bf369f65.c443d", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3439.00492477417, - "y": 236.30567169189453, - "z": "816d5e60.eba45", + "x": 3438.00101852417, + "y": 241.30176544189453, + "z": "afa42c56.2fe06", "wires": [ [ - "d539825b.12e92" + "9b7f20f8.db3b3" ] ] }, { - "id": "5d0ffac5.1d4814", + "id": "8baae43.65cdc18", "type": "switchNode", "name": "switch spoke", "xml": "<switch test=\"`$prop.spoke.role == 'spoke'`\">\n", "comments": "", "outputs": 1, - "x": 1331.004280090332, - "y": 383.305606842041, - "z": "816d5e60.eba45", + "x": 1330.000373840332, + "y": 388.301700592041, + "z": "afa42c56.2fe06", "wires": [ [ - "d39c2ae1.e3a298" + "b158c146.c1f85" ] ] }, { - "id": "d39c2ae1.e3a298", + "id": "b158c146.c1f85", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1472.004035949707, - "y": 384.30564403533936, - "z": "816d5e60.eba45", + "x": 1471.000129699707, + "y": 389.30173778533936, + "z": "afa42c56.2fe06", "wires": [ [ - "401953e4.0343fc" + "67d378cf.68e458" ] ] }, { - "id": "3b2ee77e.0ad758", + "id": "b0c4da2c.234108", "type": "for", "name": "for i.. service-data.vnfs.vnf_length[]", "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1744.5045623779297, - "y": 438.3056392669678, - "z": "816d5e60.eba45", + "x": 1743.5006561279297, + "y": 443.3017330169678, + "z": "afa42c56.2fe06", "wires": [ [ - "847bf9c5.b5b848" + "63ff4ec5.ab647" ] ] }, { - "id": "847bf9c5.b5b848", + "id": "63ff4ec5.ab647", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2078.170753479004, - "y": 382.3055696487427, - "z": "816d5e60.eba45", + "x": 2077.166847229004, + "y": 387.3016633987427, + "z": "afa42c56.2fe06", "wires": [ [ - "7d9b7d9a.b8ca74", - "6a3836f9.009c38", - "55c5f84e.24eae8" + "84784063.67ffb", + "341080b7.07512", + "ed155104.c2191" ] ] }, { - "id": "7d9b7d9a.b8ca74", + "id": "84784063.67ffb", "type": "switchNode", "name": "switch ActivateSDWANPortInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2349.1707916259766, - "y": 328.3064560890198, - "z": "816d5e60.eba45", + "x": 2348.1668853759766, + "y": 333.3025498390198, + "z": "afa42c56.2fe06", "wires": [ [ - "5b0d5f1.e72d3a" + "126e021b.594fce" ] ] }, { - "id": "5b0d5f1.e72d3a", + "id": "126e021b.594fce", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2562.170555114746, - "y": 329.3064589500427, - "z": "816d5e60.eba45", + "x": 2561.166648864746, + "y": 334.3025527000427, + "z": "afa42c56.2fe06", "wires": [ [ - "2bd1babe.4be726" + "c1a0895d.a44898" ] ] }, { - "id": "2bd1babe.4be726", + "id": "c1a0895d.a44898", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2711.0042991638184, - "y": 331.3056483268738, - "z": "816d5e60.eba45", + "x": 2710.0003929138184, + "y": 336.3017420768738, + "z": "afa42c56.2fe06", "wires": [ [ - "5b294f75.d92f3" + "cad8cdd9.d6465" ] ] }, { - "id": "5b294f75.d92f3", + "id": "cad8cdd9.d6465", "type": "for", "name": "for loop widx - Get wan port ID from servicedata", "xml": "<for index=\"widx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2984.004249572754, - "y": 329.6728663444519, - "z": "816d5e60.eba45", + "x": 2983.000343322754, + "y": 334.6689600944519, + "z": "afa42c56.2fe06", "wires": [ [ - "32cc5203.15e8fe" + "e45e8fbc.86968" ] ] }, { - "id": "32cc5203.15e8fe", + "id": "e45e8fbc.86968", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3253.0051765441895, - "y": 328.67311239242554, - "z": "816d5e60.eba45", + "x": 3252.0012702941895, + "y": 333.66920614242554, + "z": "afa42c56.2fe06", "wires": [ [ - "2831a4a1.42336c", - "8813fbf3.259e18", - "c11e3914.922088", - "5141e407.34b3cc" + "bc53f544.71b638", + "25d65cd3.81eaf4", + "af8fabf7.c19df8", + "97c92085.94f67" ] ] }, { - "id": "2831a4a1.42336c", + "id": "bc53f544.71b638", "type": "switchNode", "name": "switch transportNetworkName", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'transportNetworkName'`\">\n", "comments": "", "outputs": 1, - "x": 3496.0062103271484, - "y": 283.6736855506897, - "z": "816d5e60.eba45", + "x": 3495.0023040771484, + "y": 288.6697793006897, + "z": "afa42c56.2fe06", "wires": [ [ - "2a15c273.32ab0e" + "de0d2806.856438" ] ] }, { - "id": "2a15c273.32ab0e", + "id": "de0d2806.856438", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3696.0059852600098, - "y": 283.6738476753235, - "z": "816d5e60.eba45", + "x": 3695.0020790100098, + "y": 288.6699414253235, + "z": "afa42c56.2fe06", "wires": [ [ - "5b3ec893.cb96e8" + "9a3c947a.1c5d88" ] ] }, { - "id": "5b3ec893.cb96e8", + "id": "9a3c947a.1c5d88", "type": "set", "name": "set prop.spoke.transportNetworkName", "xml": "<set>\n<parameter name='prop.spoke.transportNetworkName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n", "comments": "", - "x": 3923.006721496582, - "y": 285.2744297981262, - "z": "816d5e60.eba45", + "x": 3922.002815246582, + "y": 290.2705235481262, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "401953e4.0343fc", + "id": "67d378cf.68e458", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1224.9733276367188, - "y": 694.2745552062988, - "z": "816d5e60.eba45", + "x": 1223.9694213867188, + "y": 699.2706489562988, + "z": "afa42c56.2fe06", "wires": [ [ - "3b2ee77e.0ad758", - "496b2343.92811c", - "e17df7dc.7298b8", - "c548252d.342ee8", - "2eff9ba0.ecf354", - "f3550d2c.724f9", - "8b82943e.e37978", - "7fba3a52.cfca64" + "b0c4da2c.234108", + "39b9e240.c55f5e", + "8a7f6cb5.ac077", + "9ef76182.7b173", + "1fd45985.393f26", + "d058b4fc.a3d908", + "4a7f65c3.11a50c", + "86cead5c.3dd72" ] ] }, { - "id": "6a3836f9.009c38", + "id": "341080b7.07512", "type": "switchNode", "name": "switch ActivateSDWANDeviceInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2341.5042266845703, - "y": 402.3056607246399, - "z": "816d5e60.eba45", + "x": 2340.5003204345703, + "y": 407.3017544746399, + "z": "afa42c56.2fe06", "wires": [ [ - "7c4ac4a1.4747bc" + "b16c0723.99d848" ] ] }, { - "id": "7c4ac4a1.4747bc", + "id": "b16c0723.99d848", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2560.5039768218994, - "y": 403.30564546585083, - "z": "816d5e60.eba45", + "x": 2559.5000705718994, + "y": 408.30173921585083, + "z": "afa42c56.2fe06", "wires": [ [ - "f4aa9e41.b53e5" + "6b12cdd6.190a84" ] ] }, { - "id": "f4aa9e41.b53e5", + "id": "6b12cdd6.190a84", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2711.3379669189453, - "y": 409.3048367500305, - "z": "816d5e60.eba45", + "x": 2710.3340606689453, + "y": 414.3009305000305, + "z": "afa42c56.2fe06", "wires": [ [ - "82e0fc37.26ed9" + "c142c3ae.d5baf" ] ] }, { - "id": "82e0fc37.26ed9", + "id": "c142c3ae.d5baf", "type": "for", "name": "for loop didx - Get device ID from servicedata", "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2970.338218688965, - "y": 411.67213201522827, - "z": "816d5e60.eba45", + "x": 2969.334312438965, + "y": 416.66822576522827, + "z": "afa42c56.2fe06", "wires": [ [ - "c5f6af8d.43acf" + "6fd86632.b15c78" ] ] }, { - "id": "c5f6af8d.43acf", + "id": "6fd86632.b15c78", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3256.338726043701, - "y": 444.67231702804565, - "z": "816d5e60.eba45", + "x": 3255.334819793701, + "y": 449.66841077804565, + "z": "afa42c56.2fe06", "wires": [ [ - "eb564ac9.966e08" + "4c164cba.1f51b4" ] ] }, { - "id": "eb564ac9.966e08", + "id": "4c164cba.1f51b4", "type": "switchNode", "name": "switch deviceId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].name == 'deviceId'`\">\n", "comments": "", "outputs": 1, - "x": 3439.3396377563477, - "y": 444.67292737960815, - "z": "816d5e60.eba45", + "x": 3438.3357315063477, + "y": 449.66902112960815, + "z": "afa42c56.2fe06", "wires": [ [ - "f15b5da7.6e6af" + "4e22d2eb.17a27c" ] ] }, { - "id": "f15b5da7.6e6af", + "id": "4e22d2eb.17a27c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3639.339412689209, - "y": 444.67308950424194, - "z": "816d5e60.eba45", + "x": 3638.335506439209, + "y": 449.66918325424194, + "z": "afa42c56.2fe06", "wires": [ [ - "24ab8642.92a16a" + "bda2d14d.2382d" ] ] }, { - "id": "24ab8642.92a16a", + "id": "bda2d14d.2382d", "type": "set", "name": "set prop.spoke.deviceId", "xml": "<set>\n<parameter name='prop.spoke.deviceId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$didx].value`' />\n", "comments": "", - "x": 3834.3400955200195, - "y": 441.27367067337036, - "z": "816d5e60.eba45", + "x": 3833.3361892700195, + "y": 446.26976442337036, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "55c5f84e.24eae8", + "id": "ed155104.c2191", "type": "switchNode", "name": "switch ActivateSiteInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSiteInstance'`\">\n \n \n\n", "comments": "", "outputs": 1, - "x": 2320.5043411254883, - "y": 463.30569219589233, - "z": "816d5e60.eba45", + "x": 2319.5004348754883, + "y": 468.30178594589233, + "z": "afa42c56.2fe06", "wires": [ [ - "7ebe3d6.3c123c4" + "3684ce31.756aa2" ] ] }, { - "id": "7ebe3d6.3c123c4", + "id": "3684ce31.756aa2", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2554.503978729248, - "y": 464.3056321144104, - "z": "816d5e60.eba45", + "x": 2553.500072479248, + "y": 469.3017258644104, + "z": "afa42c56.2fe06", "wires": [ [ - "eaa83766.f196c8" + "379dde17.f5f7e2" ] ] }, { - "id": "eaa83766.f196c8", + "id": "379dde17.f5f7e2", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2706.3379669189453, - "y": 486.30486822128296, - "z": "816d5e60.eba45", + "x": 2705.3340606689453, + "y": 491.30096197128296, + "z": "afa42c56.2fe06", "wires": [ [ - "d0b475ec.f63c48", - "3857554a.ced0aa" + "54ff4036.7eef1", + "dc7900f6.c1794" ] ] }, { - "id": "d0b475ec.f63c48", + "id": "54ff4036.7eef1", "type": "for", "name": "for loop widx - Get wan site ID from servicedata", "xml": "<for index=\"sidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2987.3377990722656, - "y": 485.672070980072, - "z": "816d5e60.eba45", + "x": 2986.3338928222656, + "y": 490.668164730072, + "z": "afa42c56.2fe06", "wires": [ [ - "d6950beb.98c1a8" + "53c73c75.c0fe44" ] ] }, { - "id": "d6950beb.98c1a8", + "id": "53c73c75.c0fe44", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3256.338726043701, - "y": 484.67231702804565, - "z": "816d5e60.eba45", + "x": 3255.334819793701, + "y": 489.66841077804565, + "z": "afa42c56.2fe06", "wires": [ [ - "f84a2fdd.ca38", - "8488fc33.1f86c", - "4d409006.b4615" + "1d2d8e3b.d07092", + "812b076f.3b7138", + "8b3ca259.e59f8" ] ] }, { - "id": "f84a2fdd.ca38", + "id": "1d2d8e3b.d07092", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'siteId'`\">\n", "comments": "", "outputs": 1, - "x": 3445.33992767334, - "y": 534.6729888916016, - "z": "816d5e60.eba45", + "x": 3444.33602142334, + "y": 539.6690826416016, + "z": "afa42c56.2fe06", "wires": [ [ - "785cdd27.fd93c4" + "35fdfb9a.5d5ab4" ] ] }, { - "id": "785cdd27.fd93c4", + "id": "35fdfb9a.5d5ab4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3645.3394050598145, - "y": 522.6731033325195, - "z": "816d5e60.eba45", + "x": 3644.3354988098145, + "y": 527.6691970825195, + "z": "afa42c56.2fe06", "wires": [ [ - "5c156f9.fbc869" + "ea9da0a4.eb61c" ] ] }, { - "id": "5c156f9.fbc869", + "id": "ea9da0a4.eb61c", "type": "set", "name": "set prop.spoke.siteId", "xml": "<set>\n<parameter name='prop.spoke.siteId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n", "comments": "", - "x": 3838.340358734131, - "y": 529.2737336158752, - "z": "816d5e60.eba45", + "x": 3837.336452484131, + "y": 534.2698273658752, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "8813fbf3.259e18", + "id": "25d65cd3.81eaf4", "type": "switchNode", "name": "switch wanPortId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'wanPortId'`\">\n", "comments": "", "outputs": 1, - "x": 3469.50390625, - "y": 320.3057417869568, - "z": "816d5e60.eba45", + "x": 3468.5, + "y": 325.3018355369568, + "z": "afa42c56.2fe06", "wires": [ [ - "d0babd8f.c557b" + "70f2426c.7fe2dc" ] ] }, { - "id": "d0babd8f.c557b", + "id": "70f2426c.7fe2dc", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3699.5039100646973, - "y": 320.3058533668518, - "z": "816d5e60.eba45", + "x": 3698.5000038146973, + "y": 325.3019471168518, + "z": "afa42c56.2fe06", "wires": [ [ - "e2b46cce.ea19d" + "2a2fa3c7.e081ac" ] ] }, { - "id": "e2b46cce.ea19d", + "id": "2a2fa3c7.e081ac", "type": "set", "name": "set prop.spoke.wanPortId", "xml": "<set>\n<parameter name='prop.spoke.wanPortId' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n", "comments": "", - "x": 3926.5046463012695, - "y": 321.90643548965454, - "z": "816d5e60.eba45", + "x": 3925.5007400512695, + "y": 326.90252923965454, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "c11e3914.922088", + "id": "af8fabf7.c19df8", "type": "switchNode", "name": "switch providerIpAddress", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'providerIpAddress'`\">\n", "comments": "", "outputs": 1, - "x": 3487.504066467285, - "y": 364.30569219589233, - "z": "816d5e60.eba45", + "x": 3486.500160217285, + "y": 369.30178594589233, + "z": "afa42c56.2fe06", "wires": [ [ - "c0d01537.19ceb8" + "b8a267e9.b9ee48" ] ] }, { - "id": "c0d01537.19ceb8", + "id": "b8a267e9.b9ee48", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3687.5038414001465, - "y": 364.3058543205261, - "z": "816d5e60.eba45", + "x": 3686.4999351501465, + "y": 369.3019480705261, + "z": "afa42c56.2fe06", "wires": [ [ - "6ecb9e8.25b2b6" + "1f49c17b.29132f" ] ] }, { - "id": "6ecb9e8.25b2b6", + "id": "1f49c17b.29132f", "type": "set", "name": "set prop.spoke.providerIpAddress", "xml": "<set>\n<parameter name='prop.spoke.providerIpAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n", "comments": "", - "x": 3914.5045776367188, - "y": 365.90643644332886, - "z": "816d5e60.eba45", + "x": 3913.5006713867188, + "y": 370.90253019332886, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "5141e407.34b3cc", + "id": "97c92085.94f67", "type": "switchNode", "name": "switch ipAddress", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].name == 'ipAddress'`\">\n", "comments": "", "outputs": 1, - "x": 3467.503894805908, - "y": 403.30572843551636, - "z": "816d5e60.eba45", + "x": 3466.499988555908, + "y": 408.30182218551636, + "z": "afa42c56.2fe06", "wires": [ [ - "f9d0d35c.eced2" + "f16f752f.3e9e18" ] ] }, { - "id": "f9d0d35c.eced2", + "id": "f16f752f.3e9e18", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3691.5037231445312, - "y": 403.3058457374573, - "z": "816d5e60.eba45", + "x": 3690.4998168945312, + "y": 408.3019394874573, + "z": "afa42c56.2fe06", "wires": [ [ - "b1e06d93.e9e08" + "ca30b35f.a1be" ] ] }, { - "id": "b1e06d93.e9e08", + "id": "ca30b35f.a1be", "type": "set", "name": "set prop.spoke.ipAddress", "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$widx].value`' />\n", "comments": "", - "x": 3918.5044593811035, - "y": 404.90642786026, - "z": "816d5e60.eba45", + "x": 3917.5005531311035, + "y": 409.90252161026, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "89904125.f9c2d", + "id": "88f8bb94.113e88", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1035.003807067871, - "y": 262.5039482116699, - "z": "816d5e60.eba45", + "x": 1033.999900817871, + "y": 267.5000419616699, + "z": "afa42c56.2fe06", "wires": [ [ - "f587f945.9668c8", - "20ecb75b.a622b8", - "f4ac6977.3d92e8", - "5d0ffac5.1d4814" + "2cdd7d19.2083a2", + "428d17cf.9d4528", + "31785cb6.7e6854", + "8baae43.65cdc18" ] ] }, { - "id": "26a7429c.87187e", + "id": "47687d06.0a1964", "type": "comment", "name": "get spoke device,site,wanport info", "info": "", "comments": "", - "x": 1791.97265625, - "y": 385.97265338897705, - "z": "816d5e60.eba45", + "x": 1790.96875, + "y": 390.96874713897705, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "be393db5.b2c4b", + "id": "c21c0002.43242", "type": "comment", "name": "Add routes only on activation of spoke Attach site", "info": "", "comments": "", - "x": 1452.5038223266602, - "y": 329.00396728515625, - "z": "816d5e60.eba45", + "x": 1451.4999160766602, + "y": 334.00006103515625, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "3b335da8.075402", + "id": "7b6f0604.c9da18", "type": "comment", "name": "Loop for all the hub allotted resources, get respective service data and get vnfs info", "info": "", "comments": "", - "x": 2208.50390625, - "y": 824.503963470459, - "z": "816d5e60.eba45", + "x": 2207.5, + "y": 829.500057220459, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "48cb425f.55b89c", + "id": "d543abbf.21d958", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2964.5036239624023, - "y": 1806.0038652420044, - "z": "816d5e60.eba45", + "x": 2963.4997177124023, + "y": 1810.9999589920044, + "z": "afa42c56.2fe06", "wires": [ [ - "6735788d.2eda88", - "25ec0b7b.fede14" + "a19625ef.be4768", + "450fbdd4.50bf64" ] ] }, { - "id": "42885256.de226c", + "id": "fc5d79c.538d088", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3014.5036811828613, - "y": 1679.003749847412, - "z": "816d5e60.eba45", + "x": 3013.4997749328613, + "y": 1683.999843597412, + "z": "afa42c56.2fe06", "wires": [ [ - "a3360f10.ddde5" + "29161345.19c04c" ] ] }, { - "id": "6735788d.2eda88", + "id": "a19625ef.be4768", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'siteId'`\">\n", "comments": "", "outputs": 1, - "x": 3149.503547668457, - "y": 1817.0037078857422, - "z": "816d5e60.eba45", + "x": 3148.499641418457, + "y": 1821.9998016357422, + "z": "afa42c56.2fe06", "wires": [ [ - "b824c970.9e9c08" + "fce00f2c.408f7" ] ] }, { - "id": "b824c970.9e9c08", + "id": "fce00f2c.408f7", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3300.503917694092, - "y": 1816.003890991211, - "z": "816d5e60.eba45", + "x": 3299.500011444092, + "y": 1820.999984741211, + "z": "afa42c56.2fe06", "wires": [ [ - "1ab1bd98.e41432" + "a6e04d71.45ffd" ] ] }, { - "id": "1ab1bd98.e41432", + "id": "a6e04d71.45ffd", "type": "set", "name": "set prop.hub.siteId", "xml": "<set>\n<parameter name='prop.hub.siteId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n", "comments": "", - "x": 3472.5039253234863, - "y": 1813.6044597625732, - "z": "816d5e60.eba45", + "x": 3471.5000190734863, + "y": 1818.6005535125732, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "4ae4f054.fa7eb", + "id": "f1944c46.f8a7e", "type": "switchNode", "name": "switch request-action", "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n", "comments": "", "outputs": 1, - "x": 2626.0036544799805, - "y": 2169.0043516159058, - "z": "816d5e60.eba45", + "x": 2624.9997482299805, + "y": 2174.0004453659058, + "z": "afa42c56.2fe06", "wires": [ [ - "a20f0327.bdb75", - "464f548c.98a25c" + "4a7669f9.690ed8", + "9523edcb.d7c9a" ] ] }, { - "id": "a20f0327.bdb75", + "id": "4a7669f9.690ed8", "type": "outcome", "name": "ActivateSDWANAttachmentInstance", "xml": "<outcome value='ActivateSDWANAttachmentInstance'>", "comments": "", "outputs": 1, - "x": 2896.0310592651367, - "y": 1980.0353841781616, - "z": "816d5e60.eba45", + "x": 2895.0271530151367, + "y": 1985.0314779281616, + "z": "afa42c56.2fe06", "wires": [ [ - "3d36ce09.d3a452" + "5392f603.1e5608" ] ] }, { - "id": "cbad3e92.5f2c5", + "id": "ed2e9b23.246118", "type": "execute", "name": "execute RestApiCallNode underlay route", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayHubResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 3485.5039291381836, - "y": 1911.0042324066162, - "z": "816d5e60.eba45", + "x": 3483.500099182129, + "y": 1914.0003824234009, + "z": "afa42c56.2fe06", "wires": [ [ - "4b4ae946.a41e78", - "7402b676.36e648" + "e1bfc10d.7f44e", + "523fbf6b.72c95" ] ] }, { - "id": "7402b676.36e648", + "id": "523fbf6b.72c95", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 3731.503833770752, - "y": 1888.0041208267212, - "z": "816d5e60.eba45", + "x": 3730.499927520752, + "y": 1893.0002145767212, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "4b4ae946.a41e78", + "id": "e1bfc10d.7f44e", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 3729.5035133361816, - "y": 1844.004111289978, - "z": "816d5e60.eba45", + "x": 3728.4996070861816, + "y": 1849.000205039978, + "z": "afa42c56.2fe06", "wires": [ [ - "bae0bb4c.569758" + "5684be77.d184a" ] ] }, { - "id": "bae0bb4c.569758", + "id": "5684be77.d184a", "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=\"Error executing sdwan hub route underlay rest api\" />\n", "comments": "", - "x": 3871.5041999816895, - "y": 1842.0041942596436, - "z": "816d5e60.eba45", + "x": 3870.5002937316895, + "y": 1847.0002880096436, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "c33f2b8.8f859d8", + "id": "fc0a8ce8.4d15f", "type": "set", "name": "Add prop.hub.route", "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.hub.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.spoke.wanPortId`' />\n<parameter name='prop.route.ipAddress' value='`$prop.hub.ipAddress`' />\n\n\n", "comments": "", - "x": 3421.8374042510986, - "y": 1864.6708335876465, - "z": "816d5e60.eba45", + "x": 3418.8337020874023, + "y": 1884.666922569275, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "d88550f2.429ff", + "id": "4be3d8b3.562cb8", "type": "execute", "name": "execute RestApiCallNode underlay route", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-underlay.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/routing-protocol/static'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"underlayspokeResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 3490.837547302246, - "y": 2012.671347618103, - "z": "816d5e60.eba45", + "x": 3500.834144592285, + "y": 2119.6675004959106, + "z": "afa42c56.2fe06", "wires": [ [ - "dc754a4a.149ee8", - "9860dbdc.fb5c78" + "5f8c1bef.56c114", + "a3d1295e.fa6b28" ] ] }, { - "id": "9860dbdc.fb5c78", + "id": "a3d1295e.fa6b28", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 3742.837652206421, - "y": 2000.6713070869446, - "z": "816d5e60.eba45", + "x": 3752.83424949646, + "y": 2107.667459964752, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "dc754a4a.149ee8", + "id": "5f8c1bef.56c114", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 3740.8373317718506, - "y": 1956.6712975502014, - "z": "816d5e60.eba45", + "x": 3750.8339290618896, + "y": 2063.667450428009, + "z": "afa42c56.2fe06", "wires": [ [ - "1b7c78ed.47ac47" + "e475f129.f6d52" ] ] }, { - "id": "1b7c78ed.47ac47", + "id": "e475f129.f6d52", "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=\"Error executing sdwan spoke route underlay rest api\" />\n", "comments": "", - "x": 3882.8380184173584, - "y": 1954.671380519867, - "z": "816d5e60.eba45", + "x": 3892.8346157073975, + "y": 2061.6675333976746, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "abc725a.b5905d8", + "id": "9b5e472e.7046c8", "type": "set", "name": "Add prop.spoke.route", "xml": "<set>\n<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />\n<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />\n<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />\n<parameter name='prop.route.providerIpAddress' value='`$prop.spoke.providerIpAddress`' />\n<parameter name='prop.route.wanportId' value='`$prop.hub.wanPortId`' /> \n<parameter name='prop.route.ipAddress' value='`$prop.spoke.ipAddress`' />\n\n\n", "comments": "", - "x": 3431.7014198303223, - "y": 1975.368059873581, - "z": "816d5e60.eba45", + "x": 3441.6980171203613, + "y": 2082.3642127513885, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "4460a0d6.c4761", + "id": "f4ba3683.379f28", "type": "set", "name": "set prop.underlay.routeIds", "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<!--parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeSiteId' value='`$prop.spoke.siteId`' /-->\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$underlayHubResp.success[0].id`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$underlayspokeResp.success[0].id`' />\n\n\n\n", "comments": "", - "x": 3442.6688232421875, - "y": 2060.034790992737, - "z": "816d5e60.eba45", + "x": 3451.665542602539, + "y": 2242.0309886932373, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "3d36ce09.d3a452", + "id": "5392f603.1e5608", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3132.003578186035, - "y": 1977.5038175582886, - "z": "816d5e60.eba45", + "x": 3130.999671936035, + "y": 1982.4999113082886, + "z": "afa42c56.2fe06", "wires": [ [ - "c33f2b8.8f859d8", - "abc725a.b5905d8", - "4460a0d6.c4761", - "d88550f2.429ff", - "cbad3e92.5f2c5", - "f03bf85a.59ad68", - "6591e05b.5ae5", - "ab6e34c5.6a48d8" + "fc0a8ce8.4d15f", + "9b5e472e.7046c8", + "f4ba3683.379f28", + "4be3d8b3.562cb8", + "ed2e9b23.246118", + "26c99249.a4074e", + "41b2e501.e4cadc", + "805d9d92.cb3bf", + "f41a7058.b220e", + "57accb29.01bb34" ] ] }, { - "id": "50a88f49.37ad4", + "id": "cf3f5a97.bb53e8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3161.0035285949707, - "y": 2434.504150390625, - "z": "816d5e60.eba45", + "x": 3162.9997749328613, + "y": 2624.5002613067627, + "z": "afa42c56.2fe06", "wires": [ [ - "ae46a29e.f97e3", - "162bc63c.6a40ba", - "32021f5a.688fc", - "6c422db5.5ce744", - "74f4468a.192018" + "45a08ea1.9e3d3", + "3208baf8.6aed86", + "33961398.8b885c", + "5e2b5a00.fe4964", + "3396ac88.cb4974", + "a8dab23b.85144", + "3c48a4f4.f048ec" ] ] }, { - "id": "464f548c.98a25c", + "id": "9523edcb.d7c9a", "type": "outcome", "name": "DeactivateSDWANAttachmentInstance", "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>", "comments": "", "outputs": 1, - "x": 2909.5035858154297, - "y": 2428.5039615631104, - "z": "816d5e60.eba45", + "x": 2911.4998321533203, + "y": 2618.500072479248, + "z": "afa42c56.2fe06", "wires": [ [ - "50a88f49.37ad4" + "cf3f5a97.bb53e8" ] ] }, { - "id": "6591e05b.5ae5", + "id": "41b2e501.e4cadc", "type": "set", "name": "Add sites to list and update length", "xml": "<set>\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteName' value='`$prop.hub.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].hubSiteId' value='`$prop.hub.siteId`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteName' value='`$prop.spoke.siteName`' />\n<parameter name='prop.provision.siteIds[$prop.provision.siteIds_length].spokeSiteId' value='`$prop.spoke.siteId`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 3447.035110473633, - "y": 2185.035671234131, - "z": "816d5e60.eba45", + "x": 3456.0318298339844, + "y": 2367.0318689346313, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "d686d76a.66e9d8", + "id": "84283d54.1b30c", "type": "comment", "name": "save hubsiteIds and spoke siteIds for provision", "info": "", "comments": "", - "x": 3479.035484313965, - "y": 2141.035545349121, - "z": "816d5e60.eba45", + "x": 3488.0322036743164, + "y": 2323.0317430496216, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "8488fc33.1f86c", + "id": "812b076f.3b7138", "type": "switchNode", "name": "switch name", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'name'`\">\n", "comments": "", "outputs": 1, - "x": 3446.034912109375, - "y": 484.03515625, - "z": "816d5e60.eba45", + "x": 3445.031005859375, + "y": 489.03125, + "z": "afa42c56.2fe06", "wires": [ [ - "a468bfef.f0d69" + "e2b5302b.c9211" ] ] }, { - "id": "a468bfef.f0d69", + "id": "e2b5302b.c9211", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3646.0346870422363, - "y": 484.0353183746338, - "z": "816d5e60.eba45", + "x": 3645.0307807922363, + "y": 489.0314121246338, + "z": "afa42c56.2fe06", "wires": [ [ - "861bdc8.697e72" + "3a42d854.33d438" ] ] }, { - "id": "861bdc8.697e72", + "id": "3a42d854.33d438", "type": "set", "name": "set prop.spoke.siteName", "xml": "<set>\n<parameter name='prop.spoke.siteName' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n", "comments": "", - "x": 3834.0354919433594, - "y": 482.63593196868896, - "z": "816d5e60.eba45", + "x": 3833.0315856933594, + "y": 487.63202571868896, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "25ec0b7b.fede14", + "id": "450fbdd4.50bf64", "type": "switchNode", "name": "switch name", "xml": "<switch test=\"`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].name == 'name'`\">\n", "comments": "", "outputs": 1, - "x": 3148.0349349975586, - "y": 1783.5350151062012, - "z": "816d5e60.eba45", + "x": 3147.0310287475586, + "y": 1788.5311088562012, + "z": "afa42c56.2fe06", "wires": [ [ - "38461c3f.4e0404" + "7d26f71b.6a9a68" ] ] }, { - "id": "38461c3f.4e0404", + "id": "7d26f71b.6a9a68", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3299.0353050231934, - "y": 1782.53519821167, - "z": "816d5e60.eba45", + "x": 3298.0313987731934, + "y": 1787.53129196167, + "z": "afa42c56.2fe06", "wires": [ [ - "1ccd9e7.6905962" + "570427f3.ac5a28" ] ] }, { - "id": "1ccd9e7.6905962", + "id": "570427f3.ac5a28", "type": "set", "name": "set prop.hub.siteName", "xml": "<set>\n<parameter name='prop.hub.siteName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.sitevidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$siteidx].value`' />\n", "comments": "", - "x": 3471.035312652588, - "y": 1780.1357669830322, - "z": "816d5e60.eba45", + "x": 3470.031406402588, + "y": 1785.1318607330322, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "18ea4160.5b97af", + "id": "431fc2f2.17609c", "type": "set", "name": "set prop.provision.siteIds_length=0", "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='0' />\n\n\n\n", "comments": "", - "x": 471.03517150878906, - "y": 370.0351610183716, - "z": "816d5e60.eba45", + "x": 470.03126525878906, + "y": 375.0312547683716, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "2ccd4dc3.00e152", + "id": "bebb2153.0e2a7", "type": "execute", "name": "execute RestApiCallNode site provision urls", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-provision.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/provision-urls'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"provisionUrlRsp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 823.0352020263672, - "y": 802.0353775024414, - "z": "816d5e60.eba45", + "x": 822.0312957763672, + "y": 807.0314712524414, + "z": "afa42c56.2fe06", "wires": [ [ - "bbd8ad8.5648f5", - "8ff338f4.67b7f8" + "e47835d0.8f5408", + "8e71b3d6.afc8d" ] ] }, { - "id": "8ff338f4.67b7f8", + "id": "8e71b3d6.afc8d", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1087.0354614257812, - "y": 824.0354223251343, - "z": "816d5e60.eba45", + "x": 1086.0315551757812, + "y": 829.0315160751343, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "bbd8ad8.5648f5", + "id": "e47835d0.8f5408", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1088.0352478027344, - "y": 781.0353603363037, - "z": "816d5e60.eba45", + "x": 1087.0313415527344, + "y": 786.0314540863037, + "z": "afa42c56.2fe06", "wires": [ [ - "bb20e181.d535d" + "610d5a0c.9e2794" ] ] }, { - "id": "bb20e181.d535d", + "id": "610d5a0c.9e2794", "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=\"Error executing provision url rest api\" />\n", "comments": "", - "x": 1267.0358047485352, - "y": 779.0354115962982, - "z": "816d5e60.eba45", + "x": 1266.0318984985352, + "y": 784.0315053462982, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "84666856.592818", + "id": "38f6b67d.380b9a", "type": "for", "name": "for providx..prop.provision.siteIds[]", "xml": "<for index='providx' start='0' end='`$prop.provision.siteIds_length`' >\n", "comments": "", "outputs": 1, - "x": 464.0352020263672, - "y": 574.0352010726929, - "z": "816d5e60.eba45", + "x": 463.0312957763672, + "y": 579.0312948226929, + "z": "afa42c56.2fe06", "wires": [ [ - "e0c31833.56f938" + "3da0634c.7d37dc" ] ] }, { - "id": "e0c31833.56f938", + "id": "3da0634c.7d37dc", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 488.0352439880371, - "y": 784.035174369812, - "z": "816d5e60.eba45", + "x": 487.0313377380371, + "y": 789.031268119812, + "z": "afa42c56.2fe06", "wires": [ [ - "14ab7296.d70c4d", - "2ccd4dc3.00e152", - "28a5422.99608be" + "89ba9fe.36f7b6", + "bebb2153.0e2a7", + "ae5d2651.0df3f8" ] ] }, { - "id": "14ab7296.d70c4d", + "id": "89ba9fe.36f7b6", "type": "set", "name": "set prop.spoke.hubSiteId, spokeSiteId", "xml": "<set>\n<parameter name='prop.provision.hubSitename' value='`$prop.provision.siteIds[$providx].hubSiteName`' />\n<parameter name='prop.provision.spokeSitename' value='`$prop.provision.siteIds[$providx].spokeSiteName`' />\n<parameter name='prop.provision.hubspokesite[0]' value='`$prop.provision.siteIds[$providx].hubSiteId`' />\n<parameter name='prop.provision.hubspokesite[1]' value='`$prop.provision.siteIds[$providx].spokeSiteId`' />\n<parameter name='prop.provision.hubspokesite_length' value='2' />\n", "comments": "", - "x": 799.0379028320312, - "y": 660.6368894577026, - "z": "816d5e60.eba45", + "x": 798.0339965820312, + "y": 665.6329832077026, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "28a5422.99608be", + "id": "ae5d2651.0df3f8", "type": "record", "name": "record provision url response to the file", "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"`'/opt/opendaylight/current/data/log/' + 'HUB-' + $prop.provision.hubSitename + '-SPOKE-' + $prop.provision.spokeSitename + '-provisionUrl'`\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$provisionUrlRsp.success[0].url`'/>\n\n", "comments": "", "outputs": 1, - "x": 795.0352783203125, - "y": 896.0352420806885, - "z": "816d5e60.eba45", + "x": 794.0313720703125, + "y": 901.0313358306885, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "6e2c1efa.030fd", + "id": "99b001da.0efb4", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2537.035388946533, - "y": 1051.0352325439453, - "z": "816d5e60.eba45", + "x": 2536.031482696533, + "y": 1056.0313262939453, + "z": "afa42c56.2fe06", "wires": [ [ - "d87f1462.94a148" + "175772d7.f9d53d" ] ] }, { - "id": "e621a712.c02488", + "id": "e38b67ea.4c8758", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2017.0350646972656, - "y": 614.0352153778076, - "z": "816d5e60.eba45", + "x": 2016.0311584472656, + "y": 619.0313091278076, + "z": "afa42c56.2fe06", "wires": [ [ - "4d2b2a60.5a15c4" + "348ba1e1.19e85e" ] ] }, { - "id": "f3cef2f6.2a146", + "id": "4ebf01e5.37d06", "type": "block", "name": "block atmoic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1961.0352325439453, - "y": 705.0351238250732, - "z": "816d5e60.eba45", + "x": 1960.0313262939453, + "y": 710.0312175750732, + "z": "afa42c56.2fe06", "wires": [ [ - "482a4c29.31cfa4", - "3b80b5a9.9770ba" + "8d7971fd.c23e3", + "524b783f.8c1128" ] ] }, { - "id": "f03bf85a.59ad68", + "id": "26c99249.a4074e", "type": "set", "name": "set prop.underlay.routeIds_length++", "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n\n\n\n\n", "comments": "", - "x": 3472.004440307617, - "y": 2096.2538681030273, - "z": "816d5e60.eba45", + "x": 3481.0011596679688, + "y": 2278.250065803528, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "ab6e34c5.6a48d8", + "id": "805d9d92.cb3bf", "type": "set", "name": "Update prop.provision.siteIds_length", "xml": "<set>\n<parameter name='prop.provision.siteIds_length' value='`$prop.provision.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 3455.504180908203, - "y": 2220.253963470459, - "z": "816d5e60.eba45", + "x": 3464.5009002685547, + "y": 2402.2501611709595, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "3857554a.ced0aa", + "id": "dc7900f6.c1794", "type": "set", "name": "set prop.spoke.siteidx", "xml": "<set>\n<parameter name='prop.spoke.siteidx' value='`$i`' />\n\n", "comments": "", - "x": 2905.7540969848633, - "y": 450.0039348602295, - "z": "816d5e60.eba45", + "x": 2904.7501907348633, + "y": 455.0000286102295, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "2ce54718.3d9808", + "id": "54fe9391.9e9afc", "type": "set", "name": "set underlay route ids to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"underlayRouteIds\" />\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$tmp.routeString`' />\n\n\n", "comments": "", - "x": 1928.0045471191406, - "y": 1937.0043048858643, - "z": "816d5e60.eba45", + "x": 1927.0006408691406, + "y": 1942.0003986358643, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "f80aa612.1d1cd8", + "id": "32bd7569.5de31a", "type": "set", "name": "set prop.underlay.routeIds_length=0", "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='0' />\n\n\n\n", "comments": "", - "x": 476.0000305175781, - "y": 322.0000190734863, - "z": "816d5e60.eba45", + "x": 474.9961242675781, + "y": 326.9961128234863, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "74f4468a.192018", + "id": "3396ac88.cb4974", "type": "for", "name": "for loop uidx - Get route Id from prop.underlay.routeIds", "xml": "<for index=\"uidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 3516.6667861938477, - "y": 2307.3333892822266, - "z": "816d5e60.eba45", + "x": 3518.6630325317383, + "y": 2497.3295001983643, + "z": "afa42c56.2fe06", "wires": [ [ - "2f560e9d.06e792" + "48bdd272.66024c" ] ] }, { - "id": "2f560e9d.06e792", + "id": "48bdd272.66024c", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3808.333480834961, - "y": 2307.3333892822266, - "z": "816d5e60.eba45", + "x": 3810.3297271728516, + "y": 2497.3295001983643, + "z": "afa42c56.2fe06", "wires": [ [ - "dbb8a9cb.01e2a8" + "164a1404.cbc8dc" ] ] }, { - "id": "dbb8a9cb.01e2a8", + "id": "164a1404.cbc8dc", "type": "switchNode", "name": "switch prop.hub.siteId", "xml": "<switch test=\"`$prop.underlay.routeIds[$uidx].hubSiteId == $prop.hub.siteId`\">\n", "comments": "", "outputs": 1, - "x": 3997.33349609375, - "y": 2307.3335523605347, - "z": "816d5e60.eba45", + "x": 3999.3297424316406, + "y": 2497.3296632766724, + "z": "afa42c56.2fe06", "wires": [ [ - "4aa46b8.0419394" + "beeec1da.addd9" ] ] }, { - "id": "4aa46b8.0419394", + "id": "beeec1da.addd9", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 4168.332931518555, - "y": 2307.3335514068604, - "z": "816d5e60.eba45", + "x": 4170.329177856445, + "y": 2497.329662322998, + "z": "afa42c56.2fe06", "wires": [ [ - "74eb4369.b3544c" + "8b49993a.fe8e88" ] ] }, { - "id": "74eb4369.b3544c", + "id": "8b49993a.fe8e88", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 4322.332931518555, - "y": 2311.333559036255, - "z": "816d5e60.eba45", + "x": 4324.329177856445, + "y": 2501.3296699523926, + "z": "afa42c56.2fe06", "wires": [ [ - "86900a6.74da6f8" + "ef00b5c0.d59378" ] ] }, { - "id": "86900a6.74da6f8", + "id": "ef00b5c0.d59378", "type": "set", "name": "set prop.hubRouteId prop.spokeRouteId", "xml": "<set>\n<parameter name='prop.hubRouteId' value='`$prop.underlay.routeIds[$uidx].hubRouteId`' />\n<parameter name='prop.spokeRouteId' value='`$prop.underlay.routeIds[$uidx].spokeRouteId`' />\n", "comments": "", - "x": 4408.332939147949, - "y": 2383.333562850952, - "z": "816d5e60.eba45", + "x": 4410.32918548584, + "y": 2573.32967376709, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "4d409006.b4615", + "id": "8b3ca259.e59f8", "type": "switchNode", "name": "switch underlayRouteIds", "xml": "<switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].name == 'underlayRouteIds'`\">\n", "comments": "", "outputs": 1, - "x": 3451, - "y": 588.6666259765625, - "z": "816d5e60.eba45", + "x": 3449.99609375, + "y": 593.6627197265625, + "z": "afa42c56.2fe06", "wires": [ [ - "c14c6f3d.397e6" + "90960264.013bb" ] ] }, { - "id": "c14c6f3d.397e6", + "id": "90960264.013bb", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 3650.9994773864746, - "y": 576.6667404174805, - "z": "816d5e60.eba45", + "x": 3649.9955711364746, + "y": 581.6628341674805, + "z": "afa42c56.2fe06", "wires": [ [ - "b91a3e00.56049" + "dec6d150.266b1" ] ] }, { - "id": "e6b57715.d86fd8", + "id": "f1e8e357.7d127", "type": "set", "name": "set prop.underlay.routeIds", "xml": "<set>\n<parameter name='prop.underlay.routeIdsString' value='`$service-data.vnfs.vnf[$i].vnf-data.vnf-request-input.vnf-input-parameters.param[$sidx].value`' />\n", "comments": "", - "x": 4022.000877380371, - "y": 576.2674503326416, - "z": "816d5e60.eba45", + "x": 4020.996971130371, + "y": 581.2635440826416, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "7fba3a52.cfca64", + "id": "86cead5c.3dd72", "type": "switchNode", "name": "switch request-action", "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n", "comments": "", "outputs": 1, - "x": 1138.0002899169922, - "y": 2028.333535194397, - "z": "816d5e60.eba45", + "x": 1136.9963836669922, + "y": 2033.329628944397, + "z": "afa42c56.2fe06", "wires": [ [ - "6d3232d8.e0205c", - "394f9ac2.7c54d6" + "d86f6d8b.19f1b", + "42a75c7f.9dc134" ] ] }, { - "id": "6d3232d8.e0205c", + "id": "d86f6d8b.19f1b", "type": "outcome", "name": "ActivateSDWANAttachmentInstance", "xml": "<outcome value='ActivateSDWANAttachmentInstance'>", "comments": "", "outputs": 1, - "x": 1402.0003356933594, - "y": 1983.333532333374, - "z": "816d5e60.eba45", + "x": 1400.9964294433594, + "y": 1988.329626083374, + "z": "afa42c56.2fe06", "wires": [ [ - "cc4350b5.e04f4" + "1dbe9d9f.7f9c82" ] ] }, { - "id": "cc4350b5.e04f4", + "id": "1dbe9d9f.7f9c82", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1643.9728469848633, - "y": 1979.8022832870483, - "z": "816d5e60.eba45", + "x": 1642.9689407348633, + "y": 1984.7983770370483, + "z": "afa42c56.2fe06", "wires": [ [ - "2ce54718.3d9808", - "c043509c.599d6", - "af0af852.8614c8", - "879d0a95.c86bf8" + "54fe9391.9e9afc", + "5d55b77d.4fae98", + "59b1613.c1f67a", + "8abe0b00.ec56e8" ] ] }, { - "id": "a489ec70.35a57", + "id": "a9b02dc4.79bbe", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1647.9728355407715, - "y": 2063.8024520874023, - "z": "816d5e60.eba45", + "x": 1646.9689292907715, + "y": 2068.7985458374023, + "z": "afa42c56.2fe06", "wires": [ [ - "f104a03c.3d9ea" + "ae1dbfd0.9ebac" ] ] }, { - "id": "394f9ac2.7c54d6", + "id": "42a75c7f.9dc134", "type": "outcome", "name": "DeactivateSDWANAttachmentInstance", "xml": "<outcome value='DeactivateSDWANAttachmentInstance'>", "comments": "", "outputs": 1, - "x": 1399.4729766845703, - "y": 2065.8022890090942, - "z": "816d5e60.eba45", + "x": 1398.4690704345703, + "y": 2070.7983827590942, + "z": "afa42c56.2fe06", "wires": [ [ - "a489ec70.35a57" + "a9b02dc4.79bbe" ] ] }, { - "id": "f104a03c.3d9ea", + "id": "ae1dbfd0.9ebac", "type": "set", "name": "set input parameter length -1", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length - 1`' />\n\n\n\n\n", "comments": "", - "x": 1876.6665344238281, - "y": 2062.33353805542, - "z": "816d5e60.eba45", + "x": 1875.6626281738281, + "y": 2067.32963180542, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "f8e23d7f.b3d02", + "id": "4d624738.aa86f8", "type": "comment", "name": "Get route routes IDs", "info": "", "comments": "", - "x": 3416.333251953125, - "y": 2268.6666259765625, - "z": "816d5e60.eba45", + "x": 3418.3294982910156, + "y": 2458.6627368927, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "c043509c.599d6", + "id": "5d55b77d.4fae98", "type": "set", "name": "set underlay route ids to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$prop.spoke.siteidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n\n\n\n\n", "comments": "", - "x": 1917.333480834961, - "y": 2011.666579246521, - "z": "816d5e60.eba45", + "x": 1916.329574584961, + "y": 2016.662672996521, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "af0af852.8614c8", + "id": "59b1613.c1f67a", "type": "for", "name": "for jidx paramidx - Get topology from servicedata", "xml": "<for index=\"jidx\" start=\"0\" end=\"`$prop.underlay.routeIds_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 2006.3334045410156, - "y": 1558.333351135254, - "z": "816d5e60.eba45", + "x": 2005.3294982910156, + "y": 1563.329444885254, + "z": "afa42c56.2fe06", "wires": [ [ - "96c0f1e3.46564" + "f4c8ed71.c2698" ] ] }, { - "id": "71e83fcd.3926a", + "id": "3450a2a3.3f3b2e", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$tmp.concat`'/>\n <parameter name=\"outputPath\" value=\"tmp.concat1\"/>\n <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].hubRouteId`'/>\n\n\n", "comments": "", "outputs": 1, - "x": 2190.333740234375, - "y": 1692.0005540847778, - "z": "816d5e60.eba45", + "x": 2189.329833984375, + "y": 1696.9966478347778, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "5b1d10b7.e85ce", + "id": "5db41da3.1856f4", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$prop.underlay.routeIds[$jidx].hubSiteId`'/>\n <parameter name=\"outputPath\" value=\"tmp.concat\"/>\n <parameter name=\"target\" value=\",\"/>\n\n\n", "comments": "", "outputs": 1, - "x": 2200.3337326049805, - "y": 1644.6668920516968, - "z": "816d5e60.eba45", + "x": 2199.3298263549805, + "y": 1649.6629858016968, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "96c0f1e3.46564", + "id": "f4c8ed71.c2698", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1913.333423614502, - "y": 1743.6666812896729, - "z": "816d5e60.eba45", + "x": 1912.329517364502, + "y": 1748.6627750396729, + "z": "afa42c56.2fe06", "wires": [ [ - "5b1d10b7.e85ce", - "71e83fcd.3926a", - "4f918e1e.65c27", - "743189f.b107678", - "a740f981.130cb8", - "7f673568.55d36c" + "5db41da3.1856f4", + "3450a2a3.3f3b2e", + "46517f63.3d70e", + "74bf87c6.f701b8", + "ec44da8a.7837c8", + "f31858ee.e326d8" ] ] }, { - "id": "4f918e1e.65c27", + "id": "46517f63.3d70e", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$tmp.concat1`'/>\n <parameter name=\"outputPath\" value=\"tmp.concat2\"/>\n <parameter name=\"target\" value=\",\"/>\n\n\n", "comments": "", "outputs": 1, - "x": 2197.3334426879883, - "y": 1731.6667852401733, - "z": "816d5e60.eba45", + "x": 2196.3295364379883, + "y": 1736.6628789901733, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "743189f.b107678", + "id": "74bf87c6.f701b8", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$tmp.concat2`'/>\n <parameter name=\"outputPath\" value=\"tmp.concat3\"/>\n <parameter name=\"target\" value='`$prop.underlay.routeIds[$jidx].spokeRouteId`'/>\n\n\n", "comments": "", "outputs": 1, - "x": 2197.3334426879883, - "y": 1767.6667852401733, - "z": "816d5e60.eba45", + "x": 2196.3295364379883, + "y": 1772.6628789901733, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "a740f981.130cb8", + "id": "ec44da8a.7837c8", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$tmp.concat3`'/>\n <parameter name=\"outputPath\" value=\"tmp.concat4\"/>\n <parameter name=\"target\" value=\" | \"/>\n\n\n", "comments": "", "outputs": 1, - "x": 2190.3334426879883, - "y": 1808.0001592636108, - "z": "816d5e60.eba45", + "x": 2189.3295364379883, + "y": 1812.9962530136108, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "7f673568.55d36c", + "id": "f31858ee.e326d8", "type": "execute", "name": "execute concat", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n <parameter name=\"source\" value='`$tmp.routeString`'/>\n <parameter name=\"outputPath\" value=\"tmp.routeString\"/>\n <parameter name=\"target\" value='`$tmp.concat4`'/>\n\n\n", "comments": "", "outputs": 1, - "x": 2193.333381652832, - "y": 1862.6666984558105, - "z": "816d5e60.eba45", + "x": 2192.329475402832, + "y": 1867.6627922058105, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "879d0a95.c86bf8", + "id": "8abe0b00.ec56e8", "type": "set", "name": "Set tmp.routeString", "xml": "<set>\n<parameter name='tmp.routeString' value=\"\" />\n\n", "comments": "", - "x": 1910.3334045410156, - "y": 1499.6666822433472, - "z": "816d5e60.eba45", + "x": 1909.3294982910156, + "y": 1504.6627759933472, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "b91a3e00.56049", + "id": "dec6d150.266b1", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3799.0002250671387, - "y": 623.0000381469727, - "z": "816d5e60.eba45", + "x": 3797.9963188171387, + "y": 627.9961318969727, + "z": "afa42c56.2fe06", "wires": [ [ - "e6b57715.d86fd8", - "4cfad752.b82ab8" + "f1e8e357.7d127", + "38377ec9.53b982" ] ] }, { - "id": "4cfad752.b82ab8", + "id": "38377ec9.53b982", "type": "execute", "name": "execute split |", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsString`'/>\n<parameter name=\"regex\" value=\" | \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValue\"/>\n", "comments": "", "outputs": 1, - "x": 3977.0002365112305, - "y": 643.0000381469727, - "z": "816d5e60.eba45", + "x": 3975.9963302612305, + "y": 647.9961318969727, + "z": "afa42c56.2fe06", "wires": [ [ - "18dab504.682e9b", - "e6713c9a.ccf4e" + "3268a5b9.fb215a", + "c3ab3d57.d9ba" ] ] }, { - "id": "e6713c9a.ccf4e", + "id": "c3ab3d57.d9ba", "type": "failure", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 4154.0002517700195, - "y": 624.0000371932983, - "z": "816d5e60.eba45", + "x": 4152.9963455200195, + "y": 628.9961309432983, + "z": "afa42c56.2fe06", "wires": [ [ - "f6d503b7.ca422" + "d7617cb0.7601e" ] ] }, { - "id": "18dab504.682e9b", + "id": "3268a5b9.fb215a", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 4143.0002517700195, - "y": 672.000039100647, - "z": "816d5e60.eba45", + "x": 4141.9963455200195, + "y": 676.996132850647, + "z": "afa42c56.2fe06", "wires": [ [ - "24d2d870.cadd68" + "d317db0c.b51f88" ] ] }, { - "id": "a99b2248.b5ad4", + "id": "82fa522b.8f097", "type": "set", "name": "set ipAddress prefixLength", "xml": "<set>\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.underlay.routeIdsValues[0]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubRouteId' value='`$prop.underlay.routeIdsValues[1]`' />\n<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].spokeRouteId' value='`$prop.underlay.routeIdsValues[2]`' />", "comments": "", - "x": 5340.001117706299, - "y": 558.0002794265747, - "z": "816d5e60.eba45", + "x": 5338.997211456299, + "y": 562.9963731765747, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "24d2d870.cadd68", + "id": "d317db0c.b51f88", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 4273.000255584717, - "y": 672.000039100647, - "z": "816d5e60.eba45", + "x": 4271.996349334717, + "y": 676.996132850647, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "f6d503b7.ca422", + "id": "d7617cb0.7601e", "type": "for", "name": "for loop ridx ", "xml": "<for index=\"ridx\" start=\"0\" end=\"`$prop.underlay.routeIdsValue_length`\">\n \n \n", "comments": "", "outputs": 1, - "x": 4299.999938964844, - "y": 622.0000371932983, - "z": "816d5e60.eba45", + "x": 4298.996032714844, + "y": 626.9961309432983, + "z": "afa42c56.2fe06", "wires": [ [ - "d316c9fd.2bfac8" + "bae53b24.86f3f8" ] ] }, { - "id": "d316c9fd.2bfac8", + "id": "bae53b24.86f3f8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 4478.332950592041, - "y": 619.0000381469727, - "z": "816d5e60.eba45", + "x": 4477.329044342041, + "y": 623.9961318969727, + "z": "afa42c56.2fe06", "wires": [ [ - "cc212d5d.4ecc7" + "95e8ce94.9a6d1" ] ] }, { - "id": "cc212d5d.4ecc7", + "id": "95e8ce94.9a6d1", "type": "execute", "name": "execute split ,", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.underlay.routeIdsValue[$ridx]`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.underlay.routeIdsValues\"/>\n", "comments": "", "outputs": 1, - "x": 4653.332962036133, - "y": 618.000036239624, - "z": "816d5e60.eba45", + "x": 4652.329055786133, + "y": 622.996129989624, + "z": "afa42c56.2fe06", "wires": [ [ - "a41a70c9.992e7", - "4e196c9a.1ec4e4" + "17ee1f73.6ce3e1", + "32bb2edf.2bc022" ] ] }, { - "id": "a41a70c9.992e7", + "id": "17ee1f73.6ce3e1", "type": "failure", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 4810.33296585083, - "y": 595.0000438690186, - "z": "816d5e60.eba45", + "x": 4809.32905960083, + "y": 599.9961376190186, + "z": "afa42c56.2fe06", "wires": [ [ - "29342783.705ee8" + "25d53393.ccdc7c" ] ] }, { - "id": "4e196c9a.1ec4e4", + "id": "32bb2edf.2bc022", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 4799.33296585083, - "y": 643.0000457763672, - "z": "816d5e60.eba45", + "x": 4798.32905960083, + "y": 647.9961395263672, + "z": "afa42c56.2fe06", "wires": [ [ - "31dadcd0.9c88f4" + "e299e773.789348" ] ] }, { - "id": "31dadcd0.9c88f4", + "id": "e299e773.789348", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 4929.332969665527, - "y": 643.0000457763672, - "z": "816d5e60.eba45", + "x": 4928.329063415527, + "y": 647.9961395263672, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "c309d201.f689a", + "id": "cee6dd44.82ca8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 5132.665496826172, - "y": 574.0001978874207, - "z": "816d5e60.eba45", + "x": 5131.661590576172, + "y": 578.9962916374207, + "z": "afa42c56.2fe06", "wires": [ [ - "a99b2248.b5ad4", - "d11539fc.77a698" + "82fa522b.8f097", + "e872fc0f.e3138" ] ] }, { - "id": "d11539fc.77a698", + "id": "e872fc0f.e3138", "type": "set", "name": "set ipAddress prefixLength", "xml": "<set>\n<parameter name='prop.underlay.routeIds_length' value='`$prop.underlay.routeIds_length + 1`' />\n", "comments": "", - "x": 5332.333156585693, - "y": 600.000075340271, - "z": "816d5e60.eba45", + "x": 5331.329250335693, + "y": 604.996169090271, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "29342783.705ee8", + "id": "25d53393.ccdc7c", "type": "switchNode", "name": "switch prop.underlay.routeIdsValues_length", "xml": "<switch test='`$prop.underlay.routeIdsValues_length`'>\n", "comments": "", "outputs": 1, - "x": 5008.667121887207, - "y": 476.0000686645508, - "z": "816d5e60.eba45", + "x": 5007.663215637207, + "y": 480.9961624145508, + "z": "afa42c56.2fe06", "wires": [ [ - "4afb066.ff7c6f8", - "6e26a8d2.50c7d8" + "1988903d.6e7c9", + "31c7868c.1d918a" ] ] }, { - "id": "4afb066.ff7c6f8", + "id": "1988903d.6e7c9", "type": "outcome", "name": "3", "xml": "<outcome value='3'>\n", "comments": "", "outputs": 1, - "x": 5243.636054992676, - "y": 512.9687957763672, - "z": "816d5e60.eba45", + "x": 5242.632148742676, + "y": 517.9648895263672, + "z": "afa42c56.2fe06", "wires": [ [ - "c309d201.f689a" + "cee6dd44.82ca8" ] ] }, { - "id": "6e26a8d2.50c7d8", + "id": "31c7868c.1d918a", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 5260.666980743408, - "y": 395.00000953674316, - "z": "816d5e60.eba45", + "x": 5259.663074493408, + "y": 399.99610328674316, + "z": "afa42c56.2fe06", "wires": [ [ - "cde0413a.7980f" + "c3b9df69.c6c78" ] ] }, { - "id": "cde0413a.7980f", + "id": "c3b9df69.c6c78", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 5421.66650390625, - "y": 435, - "z": "816d5e60.eba45", + "x": 5420.66259765625, + "y": 439.99609375, + "z": "afa42c56.2fe06", "wires": [ [] ] }, { - "id": "61955a75.34d004", + "id": "2fd2f3c1.09b97c", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 2901.006446838379, - "y": 1008.3067564964294, - "z": "816d5e60.eba45", + "x": 2900.002540588379, + "y": 1013.3028502464294, + "z": "afa42c56.2fe06", "wires": [] }, { - "id": "5e3a3525.ed601c", + "id": "18ba51e1.01a3be", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2887.0059547424316, - "y": 956.9731774330139, - "z": "816d5e60.eba45", + "x": 2886.0020484924316, + "y": 961.9692711830139, + "z": "afa42c56.2fe06", "wires": [ [] ] + }, + { + "id": "f41a7058.b220e", + "type": "set", + "name": "hardcode hub route", + "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n", + "comments": "", + "x": 3420.0038681030273, + "y": 1853.0039892196655, + "z": "afa42c56.2fe06", + "wires": [] + }, + { + "id": "57accb29.01bb34", + "type": "set", + "name": "hardcode spoke route", + "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />", + "comments": "", + "x": 3435.004409790039, + "y": 2051.0039653778076, + "z": "afa42c56.2fe06", + "wires": [] + }, + { + "id": "a8dab23b.85144", + "type": "set", + "name": "hardcode hub route", + "xml": "<set>\n<parameter name='prop.hub.ipAddress' value=\"10.2.0.2\" />\n<parameter name='prop.hub.providerIpAddress' value=\"10.2.0.0/16\" />\n\n\n", + "comments": "", + "x": 3470.333251953125, + "y": 2532, + "z": "afa42c56.2fe06", + "wires": [] + }, + { + "id": "3c48a4f4.f048ec", + "type": "set", + "name": "hardcode spoke route", + "xml": "<set>\n<parameter name='prop.spoke.ipAddress' value=\"10.3.0.1\" />\n<parameter name='prop.spoke.providerIpAddress' value=\"10.3.0.0/16\" />", + "comments": "", + "x": 3476.333251953125, + "y": 2639, + "z": "afa42c56.2fe06", + "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json index 4a7ed514..0b1772df 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json @@ -1,20 +1,20 @@ [ { - "id": "365b721f.7a253e", + "id": "3b96b94e.d2db46", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 142.00390625, - "y": 164.01038789749146, - "z": "d540a7b.861cb58", + "x": 101.71429443359375, + "y": 190.01038789749146, + "z": "f7b8765.9d87788", "wires": [ [ - "4883cd2c.e8add4" + "2a24b40f.15257c" ] ] }, { - "id": "4883cd2c.e8add4", + "id": "2a24b40f.15257c", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1004 +22,1124 @@ "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": 217.28961181640625, - "y": 204.24849939346313, - "z": "d540a7b.861cb58", + "x": 177, + "y": 230.24849939346313, + "z": "f7b8765.9d87788", "wires": [ [ - "3fd0f9a0.bfb166" + "13982dc8.7557c2" ] ] }, { - "id": "3fd0f9a0.bfb166", + "id": "13982dc8.7557c2", "type": "method", "name": "method site-vnf-topology-operation-activate", "xml": "<method rpc='site-vnf-topology-operation-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 238.43252563476562, - "y": 294.01038789749146, - "z": "d540a7b.861cb58", + "x": 198.14291381835938, + "y": 320.01038789749146, + "z": "f7b8765.9d87788", "wires": [ [ - "a41ebaac.ea0658" + "cc746.fa4808ba" ] ] }, { - "id": "a41ebaac.ea0658", + "id": "cc746.fa4808ba", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 226.67063903808594, - "y": 483.6771664619446, - "z": "d540a7b.861cb58", + "x": 186.3810272216797, + "y": 509.6771664619446, + "z": "f7b8765.9d87788", "wires": [ [ - "d76422f.52b80e", - "221a8fd1.b8b2f", - "faa004c7.5a25c8", - "5f14f4d2.549ccc", - "3c340ff6.924a4", - "3edd9e9f.d604f2", - "dd9550a6.ba9af", - "ead8f54d.0eecc8", - "90854244.d2678", - "78b0ee0f.0865f" + "7d7132e1.2faacc", + "43a548ad.54cc98", + "b5ec2bbf.0ef568", + "c9f28855.c58858", + "2cf8df50.df009", + "5f881f0.741dae", + "445ef8.15e44108", + "448dd2dd.bafb8c", + "f7484eea.3c8a9", + "3fda4a72.8f9396" ] ] }, { - "id": "d76422f.52b80e", + "id": "7d7132e1.2faacc", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 665.9935684204102, - "y": 112.9999828338623, - "z": "d540a7b.861cb58", + "x": 625.7039566040039, + "y": 138.9999828338623, + "z": "f7b8765.9d87788", "wires": [ [ - "3851ce61.8f91c2", - "a2f9a6ea.ae2718", - "c137a07.e2f1f6" + "ed712d22.18f85", + "d79f3765.c39a08", + "34d8aa26.2a5306" ] ] }, { - "id": "3851ce61.8f91c2", + "id": "ed712d22.18f85", "type": "other", "name": "Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 896.9935455322266, - "y": 115.00004625320435, - "z": "d540a7b.861cb58", + "x": 856.7039337158203, + "y": 141.00004625320435, + "z": "f7b8765.9d87788", "wires": [ [ - "4f151038.9977" + "774eda2e.68a9d4" ] ] }, { - "id": "4f151038.9977", + "id": "774eda2e.68a9d4", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1054.7710609436035, - "y": 95.8889946937561, - "z": "d540a7b.861cb58", + "x": 1014.4814491271973, + "y": 121.8889946937561, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "a2f9a6ea.ae2718", + "id": "d79f3765.c39a08", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 888.9939727783203, - "y": 150.00006818771362, - "z": "d540a7b.861cb58", + "x": 848.7043609619141, + "y": 176.00006818771362, + "z": "f7b8765.9d87788", "wires": [ [ - "f0eea43d.80c008" + "3a3303bd.28cb7c" ] ] }, { - "id": "f0eea43d.80c008", + "id": "3a3303bd.28cb7c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1055.263442993164, - "y": 141.55460166931152, - "z": "d540a7b.861cb58", + "x": 1014.9738311767578, + "y": 167.55460166931152, + "z": "f7b8765.9d87788", "wires": [ [ - "5514a22c.cabcac", - "c241356.b2ab4c8", - "18332af4.bcb575" + "46ac8f1a.93c77", + "dec89d20.3ffd2", + "aa1fa754.8a56c8" ] ] }, { - "id": "5514a22c.cabcac", + "id": "46ac8f1a.93c77", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1306.2795715332031, - "y": 86.42860507965088, - "z": "d540a7b.861cb58", + "x": 1265.9899597167969, + "y": 112.42860507965088, + "z": "f7b8765.9d87788", "wires": [ [ - "5665ac79.9c7064" + "5d97713b.b0498" ] ] }, { - "id": "c241356.b2ab4c8", + "id": "dec89d20.3ffd2", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1261.5808868408203, - "y": 136.41179132461548, - "z": "d540a7b.861cb58", + "x": 1221.291275024414, + "y": 162.41179132461548, + "z": "f7b8765.9d87788", "wires": [ [ - "19a218fc.ad6fe7" + "12d5f510.98545b" ] ] }, { - "id": "19a218fc.ad6fe7", + "id": "12d5f510.98545b", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1413.0096893310547, - "y": 136.9832215309143, - "z": "d540a7b.861cb58", + "x": 1372.7200775146484, + "y": 162.9832215309143, + "z": "f7b8765.9d87788", "wires": [ [ - "87ce1b6f.ea04b8" + "baac3d2b.9c149" ] ] }, { - "id": "3d3bb0a2.e8367", + "id": "5d333a67.ea5b04", "type": "switchNode", "name": "switch vnfid found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1722.7082748413086, - "y": 45.67872476577759, - "z": "d540a7b.861cb58", + "x": 1682.4186630249023, + "y": 71.67872476577759, + "z": "f7b8765.9d87788", "wires": [ [ - "90ad7f4f.37ad5" + "ff1652c5.5f817" ] ] }, { - "id": "87ce1b6f.ea04b8", + "id": "baac3d2b.9c149", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", - "x": 1551.438087463379, - "y": 138.1260437965393, - "z": "d540a7b.861cb58", + "x": 1511.1484756469727, + "y": 164.1260437965393, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "90ad7f4f.37ad5", + "id": "ff1652c5.5f817", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1896.6607551574707, - "y": 45.57144498825073, - "z": "d540a7b.861cb58", + "x": 1856.3711433410645, + "y": 71.57144498825073, + "z": "f7b8765.9d87788", "wires": [ [ - "edd58360.fef7" + "c70c2471.2c7958" ] ] }, { - "id": "c137a07.e2f1f6", + "id": "34d8aa26.2a5306", "type": "outcome", "name": "0", "xml": "<outcome value='0'>\n", "comments": "", "outputs": 1, - "x": 894.9623565673828, - "y": 77.9687352180481, - "z": "d540a7b.861cb58", + "x": 854.6727447509766, + "y": 103.9687352180481, + "z": "f7b8765.9d87788", "wires": [ [ - "4f151038.9977" + "774eda2e.68a9d4" ] ] }, { - "id": "5f14f4d2.549ccc", + "id": "c9f28855.c58858", "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": 610.3376045227051, - "y": 666.344172000885, - "z": "d540a7b.861cb58", + "x": 570.0479927062988, + "y": 692.344172000885, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "ead8f54d.0eecc8", + "id": "448dd2dd.bafb8c", "type": "set", "name": "set vnf-level-oper-status to Active", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 672.8177947998047, - "y": 500.68161153793335, - "z": "d540a7b.861cb58", + "x": 632.5281829833984, + "y": 526.6816115379333, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "dd9550a6.ba9af", + "id": "445ef8.15e44108", "type": "set", "name": "set vnf-index and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", - "x": 672.50439453125, - "y": 457.34414625167847, - "z": "d540a7b.861cb58", + "x": 632.2147827148438, + "y": 483.34414625167847, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "1689d83b.0f3d48", + "id": "bbcb4df5.064e3", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1530.504482269287, - "y": 402.0003957748413, - "z": "d540a7b.861cb58", + "x": 1490.2148704528809, + "y": 428.0003957748413, + "z": "f7b8765.9d87788", "wires": [ [ - "877e79a4.de6e08" + "1ea13654.9fcfaa" ] ] }, { - "id": "877e79a4.de6e08", + "id": "1ea13654.9fcfaa", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 1719.0045776367188, - "y": 396.00040543079376, - "z": "d540a7b.861cb58", + "x": 1678.7149658203125, + "y": 422.00040543079376, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "e9a64136.0f3a4", + "id": "f9005f03.a47fb", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1533.995449066162, - "y": 449.57443141937256, - "z": "d540a7b.861cb58", + "x": 1493.7058372497559, + "y": 475.57443141937256, + "z": "f7b8765.9d87788", "wires": [ [ - "1ecf5c87.8a1883" + "5c27d008.c54fe" ] ] }, { - "id": "1ecf5c87.8a1883", + "id": "5c27d008.c54fe", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1707.5668601989746, - "y": 437.86016750335693, - "z": "d540a7b.861cb58", + "x": 1667.2772483825684, + "y": 463.86016750335693, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "46f84de2.5c2c94", + "id": "5f7c43f4.71b4dc", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1526.328456878662, - "y": 490.9077444076538, - "z": "d540a7b.861cb58", + "x": 1486.0388450622559, + "y": 516.9077444076538, + "z": "f7b8765.9d87788", "wires": [ [ - "87e2e13c.489f3" + "690bd523.e7874c" ] ] }, { - "id": "87e2e13c.489f3", + "id": "690bd523.e7874c", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 1714.1010131835938, - "y": 486.34693717956543, - "z": "d540a7b.861cb58", + "x": 1673.8114013671875, + "y": 512.3469371795654, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "e15f72bc.d37ff", + "id": "766aef68.e4df8", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 1263.50439453125, - "y": 450.0004016160965, - "z": "d540a7b.861cb58", + "x": 1223.2147827148438, + "y": 476.0004016160965, + "z": "f7b8765.9d87788", "wires": [ [ - "1689d83b.0f3d48", - "e9a64136.0f3a4", - "46f84de2.5c2c94" + "bbcb4df5.064e3", + "f9005f03.a47fb", + "5f7c43f4.71b4dc" ] ] }, { - "id": "8c66a623.b3e238", + "id": "cd48267e.9edf28", "type": "execute", "name": "execute RestApiCallNode Create SDWAN site", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-' + $template.site.role + '.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1286.004508972168, - "y": 607.0003957748413, - "z": "d540a7b.861cb58", + "x": 1250.71484375, + "y": 666.0003662109375, + "z": "f7b8765.9d87788", "wires": [ [ - "9cc77bf6.9a9d78", - "2cdd5eb4.cdc7e2" + "42f4d566.03c33c", + "bdd9ab07.dc7f48" ] ] }, { - "id": "45d1f2b.f3e000c", + "id": "f430b9bd.f345f8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1706.6710319519043, - "y": 608.8892965316772, - "z": "d540a7b.861cb58", + "x": 1666.381420135498, + "y": 634.8892965316772, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "7a151bff.37aaa4", + "id": "49b0ec38.4844e4", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1692.1156158447266, - "y": 668.4446439743042, - "z": "d540a7b.861cb58", + "x": 1651.8260040283203, + "y": 694.4446439743042, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "2cdd5eb4.cdc7e2", + "id": "bdd9ab07.dc7f48", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1547.1156063079834, - "y": 665.4446420669556, - "z": "d540a7b.861cb58", + "x": 1506.8259944915771, + "y": 691.4446420669556, + "z": "f7b8765.9d87788", "wires": [ [ - "7a151bff.37aaa4" + "49b0ec38.4844e4" ] ] }, { - "id": "9cc77bf6.9a9d78", + "id": "42f4d566.03c33c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1547.559944152832, - "y": 609.1114501953125, - "z": "d540a7b.861cb58", + "x": 1507.2703323364258, + "y": 635.1114501953125, + "z": "f7b8765.9d87788", "wires": [ [ - "45d1f2b.f3e000c" + "f430b9bd.f345f8" ] ] }, { - "id": "90854244.d2678", + "id": "f7484eea.3c8a9", "type": "set", "name": "copy input data to service data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />", "comments": "", - "x": 664.0043487548828, - "y": 544.0006427764893, - "z": "d540a7b.861cb58", + "x": 623.7147369384766, + "y": 570.0006427764893, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "dc8a36b0.c3b358", + "id": "416674e0.73681c", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, - "x": 1264.7584915161133, - "y": 543.0044623613358, - "z": "d540a7b.861cb58", + "x": 1224.468879699707, + "y": 569.0044623613358, + "z": "f7b8765.9d87788", "wires": [ [ - "b5fd26d4.434e58", - "35ebfe16.180562" + "58134bd4.bcfed4", + "6a9bb51c.bc170c" ] ] }, { - "id": "b5fd26d4.434e58", + "id": "58134bd4.bcfed4", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1529.758373260498, - "y": 528.004357457161, - "z": "d540a7b.861cb58", + "x": 1489.4687614440918, + "y": 554.004357457161, + "z": "f7b8765.9d87788", "wires": [ [ - "545e872c.836968" + "b4100138.98e92" ] ] }, { - "id": "35ebfe16.180562", + "id": "6a9bb51c.bc170c", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1522.008373260498, - "y": 569.6472407579422, - "z": "d540a7b.861cb58", + "x": 1481.7187614440918, + "y": 595.6472407579422, + "z": "f7b8765.9d87788", "wires": [ [ - "ec823836.0a8798" + "bf434721.5049e8" ] ] }, { - "id": "ec823836.0a8798", + "id": "bf434721.5049e8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1648.091869354248, - "y": 569.893273472786, - "z": "d540a7b.861cb58", + "x": 1607.8022575378418, + "y": 595.893273472786, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "545e872c.836968", + "id": "b4100138.98e92", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", - "x": 1666.758373260498, - "y": 528.004357457161, - "z": "d540a7b.861cb58", + "x": 1626.4687614440918, + "y": 554.004357457161, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "48a7bd41.b0ef94", + "id": "c6987662.432148", "type": "comment", "name": "tmp.thirdparty-sdnc-id is hardcoded value?", "info": "", "comments": "", - "x": 1312.0082931518555, - "y": 404.00437355041504, - "z": "d540a7b.861cb58", + "x": 1271.7186813354492, + "y": 430.00437355041504, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "3edd9e9f.d604f2", + "id": "5f881f0.741dae", "type": "set", "name": "set siteId to service data", "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='siteId' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$site-result.success[0].id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n", "comments": "", - "x": 654.0081787109375, - "y": 419.0042562484741, - "z": "d540a7b.861cb58", + "x": 613.7185668945312, + "y": 445.0042562484741, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "5c9c6749.a75a58", + "id": "473eb805.0b9488", "type": "switchNode", "name": "switch ActivateSDWANDeviceInstance", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n\n \n \n\n", "comments": "", "outputs": 1, - "x": 1790.2582473754883, - "y": 115.00390195846558, - "z": "d540a7b.861cb58", + "x": 1749.968635559082, + "y": 141.00390195846558, + "z": "f7b8765.9d87788", "wires": [ [ - "4e8a745e.fc595c" + "a2ae14c0.4e83e8" ] ] }, { - "id": "4e8a745e.fc595c", + "id": "a2ae14c0.4e83e8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2017.2581024169922, - "y": 114.00390100479126, - "z": "d540a7b.861cb58", + "x": 1976.968490600586, + "y": 140.00390100479126, + "z": "f7b8765.9d87788", "wires": [ [ - "80899e02.b6a68" + "e66294b6.7e7298" ] ] }, { - "id": "f39513a2.e7f31", + "id": "c0693138.694c4", "type": "comment", "name": "Get devices", "info": "", "comments": "", - "x": 1824.0082626342773, - "y": 135.75391721725464, - "z": "d540a7b.861cb58", + "x": 1783.718650817871, + "y": 161.75391721725464, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "221a8fd1.b8b2f", + "id": "43a548ad.54cc98", "type": "set", "name": "set prop.site.sdwan false", "xml": "<set>\n<parameter name='prop.site.sdwan' value=\"false\" />\n\n", "comments": "", - "x": 645.0039215087891, - "y": 54.00003242492676, - "z": "d540a7b.861cb58", + "x": 604.7143096923828, + "y": 80.00003242492676, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "3c340ff6.924a4", + "id": "2cf8df50.df009", "type": "switchNode", "name": "switch prop.site.sdwan", "xml": "<switch test=\"`$prop.site.sdwan`\">\n", "comments": "", "outputs": 1, - "x": 641.0040283203125, - "y": 361.6666216850281, - "z": "d540a7b.861cb58", + "x": 600.7144165039062, + "y": 387.6666216850281, + "z": "f7b8765.9d87788", "wires": [ [ - "3529dc36.6091c4" + "6b990b0d.fef984" ] ] }, { - "id": "3529dc36.6091c4", + "id": "6b990b0d.fef984", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 820.004077911377, - "y": 358.6666216850281, - "z": "d540a7b.861cb58", + "x": 779.7144660949707, + "y": 384.6666216850281, + "z": "f7b8765.9d87788", "wires": [ [ - "b0a30d5b.6002c" + "fac23885.a00b38" ] ] }, { - "id": "b0a30d5b.6002c", + "id": "fac23885.a00b38", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 976.0043029785156, - "y": 355.66694355010986, - "z": "d540a7b.861cb58", + "x": 935.7146911621094, + "y": 381.66694355010986, + "z": "f7b8765.9d87788", "wires": [ [ - "8c7ebff5.e351e", - "1aa5ae21.057332", - "8c66a623.b3e238", - "e15f72bc.d37ff", - "dc8a36b0.c3b358" + "d4d22841.f00eb8", + "cd48267e.9edf28", + "766aef68.e4df8", + "416674e0.73681c", + "793cd9f6.80cc58", + "702b3ce6.3adbe4" ] ] }, { - "id": "80899e02.b6a68", + "id": "e66294b6.7e7298", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1972.6710166931152, - "y": 176.00004196166992, - "z": "d540a7b.861cb58", + "x": 1932.381404876709, + "y": 202.00004196166992, + "z": "f7b8765.9d87788", "wires": [ [ - "744280bc.85fef" + "288cc13c.94077e" ] ] }, { - "id": "744280bc.85fef", + "id": "288cc13c.94077e", "type": "for", "name": "for loop deviceidx - Get deviceId from servicedata", "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`\">", "comments": "", "outputs": 1, - "x": 2254.0047702789307, - "y": 186.00006246566772, - "z": "d540a7b.861cb58", + "x": 2213.7151584625244, + "y": 212.00006246566772, + "z": "f7b8765.9d87788", "wires": [ [ - "e3f03864.75b5b8" + "d7048ef8.65174" ] ] }, { - "id": "e3f03864.75b5b8", + "id": "d7048ef8.65174", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2370.004554748535, - "y": 237.00024795532227, - "z": "d540a7b.861cb58", + "x": 2329.714942932129, + "y": 263.00024795532227, + "z": "f7b8765.9d87788", "wires": [ [ - "271bfd98.e39bf2" + "2e66cefe.b9e7b2" ] ] }, { - "id": "271bfd98.e39bf2", + "id": "2e66cefe.b9e7b2", "type": "switchNode", "name": "switch deviceId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n", "comments": "", "outputs": 1, - "x": 2530.004810333252, - "y": 239.00010108947754, - "z": "d540a7b.861cb58", + "x": 2489.7151985168457, + "y": 265.00010108947754, + "z": "f7b8765.9d87788", "wires": [ [ - "d2e3890.db58f78" + "302f3690.f9a14a" ] ] }, { - "id": "d2e3890.db58f78", + "id": "302f3690.f9a14a", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2682.004981994629, - "y": 238.00010108947754, - "z": "d540a7b.861cb58", + "x": 2641.7153701782227, + "y": 264.00010108947754, + "z": "f7b8765.9d87788", "wires": [ [ - "a5559674.8a50e8" + "35a2ea58.cd5716" ] ] }, { - "id": "a5559674.8a50e8", + "id": "35a2ea58.cd5716", "type": "set", "name": "set deviceId", "xml": "<set>\n<parameter name='prop.site.deviceId[$prop.site.deviceId_length]' value='`$service-data.vnfs.vnf[$vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$deviceidx].value`' />\n<parameter name='prop.site.deviceId_length' value='`$prop.site.deviceId_length + 1`' />\n", "comments": "", - "x": 2822.004985809326, - "y": 237.60005569458008, - "z": "d540a7b.861cb58", + "x": 2781.71537399292, + "y": 263.6000556945801, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "18332af4.bcb575", + "id": "aa1fa754.8a56c8", "type": "set", "name": "set prop.site.deviceId_length", "xml": "<set>\n<parameter name='prop.site.deviceId_length' value='0' />\n", "comments": "", - "x": 1298.003978729248, - "y": 40.99999475479126, - "z": "d540a7b.861cb58", + "x": 1257.7143669128418, + "y": 66.99999475479126, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "78b0ee0f.0865f", + "id": "3fda4a72.8f9396", "type": "save", "name": "update siteInstance configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /> \n<parameter name='generated-site-id' value='`$site-result.success[0].id`' /> \n<parameter name='operational-status' value='Active' />\n", + "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /> \n<parameter name='generated-site-id' value='`$site-result.success[0].id`' /> \n<parameter name='operational-status' value='Active' />\n", "comments": "", "outputs": 1, - "x": 694.0040740966797, - "y": 605.0001573562622, - "z": "d540a7b.861cb58", + "x": 653.7144622802734, + "y": 631.0001573562622, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "faa004c7.5a25c8", + "id": "b5ec2bbf.0ef568", "type": "execute", "name": "execute Properties", "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": 637.0039443969727, - "y": 250.9999966621399, - "z": "d540a7b.861cb58", + "x": 596.7143325805664, + "y": 276.9999966621399, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "8c7ebff5.e351e", + "id": "d4d22841.f00eb8", "type": "set", "name": "set siteId", "xml": "<set>\n<parameter name='prop.site.siteId' value=\"\" />\n\n", "comments": "", - "x": 1185.0042419433594, - "y": 346.00010216236115, - "z": "d540a7b.861cb58", + "x": 1158.714599609375, + "y": 384.0000915527344, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "f5d9902.f200f7", - "type": "comment", - "name": "should be null in request", - "info": "", - "comments": "", - "x": 1194.004165649414, - "y": 317.00005638599396, - "z": "d540a7b.861cb58", - "wires": [] - }, - { - "id": "edd58360.fef7", + "id": "c70c2471.2c7958", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2067.004051208496, - "y": 49.65758037567139, - "z": "d540a7b.861cb58", + "x": 2026.7144393920898, + "y": 75.65758037567139, + "z": "f7b8765.9d87788", "wires": [ [ - "e434b261.8d553", - "2f0be2c.5dcd11e", - "eee333df.5a9b6" + "9ba5f463.943968", + "32028fb9.746e", + "fb0b8823.b3d168" ] ] }, { - "id": "2f0be2c.5dcd11e", + "id": "32028fb9.746e", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n", "comments": "", - "x": 2319.337059020996, - "y": 66.65763568878174, - "z": "d540a7b.861cb58", + "x": 2279.04744720459, + "y": 92.65763568878174, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "e434b261.8d553", + "id": "9ba5f463.943968", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n", "comments": "", - "x": 2346.890769958496, - "y": 20, - "z": "d540a7b.861cb58", + "x": 2306.60115814209, + "y": 46, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "eee333df.5a9b6", + "id": "fb0b8823.b3d168", "type": "call", "name": "call sdwan-get-site-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2317.977737426758, - "y": 102.1071195602417, - "z": "d540a7b.861cb58", + "x": 2277.6881256103516, + "y": 128.1071195602417, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "1aa5ae21.057332", + "id": "6f03dda4.fbdb64", "type": "for", "name": "for cpidx..prop.site.controlpoints", "xml": "<for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >\n\t\t\t\t\t\t\t\t\t\n", "comments": "", "outputs": 1, - "x": 1245.0045166015625, - "y": 247.03131580352783, - "z": "d540a7b.861cb58", + "x": 1240.7148895263672, + "y": 341.03131008148193, + "z": "f7b8765.9d87788", "wires": [ [ - "78afb961.5c44f8" + "6ae2a7d2.64e9e8" ] ] }, { - "id": "78afb961.5c44f8", + "id": "6ae2a7d2.64e9e8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1488.0040283203125, - "y": 245.03125476837158, - "z": "d540a7b.861cb58", + "x": 1447.7144165039062, + "y": 271.0312547683716, + "z": "f7b8765.9d87788", "wires": [ [ - "6cfee007.a751c", - "9f90e330.d491e" + "d5e8a02e.b6af9", + "f4a3ecf1.a3a47" ] ] }, { - "id": "5665ac79.9c7064", + "id": "5d97713b.b0498", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1545.2540493011475, - "y": 86.00390911102295, - "z": "d540a7b.861cb58", + "x": 1504.9644374847412, + "y": 112.00390911102295, + "z": "f7b8765.9d87788", "wires": [ [ - "3d3bb0a2.e8367", - "5c9c6749.a75a58" + "5d333a67.ea5b04", + "473eb805.0b9488" ] ] }, { - "id": "6cfee007.a751c", + "id": "d5e8a02e.b6af9", "type": "get-resource", "name": "get-resource control pts for sideId", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"site-resource\" \n\t\tkey=\"site-resource.site-resource-name = $prop.controlPtId AND \n\t\t depth = '1'\"\n pfx='tmp.aai.controlPoints' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 1711.333595275879, - "y": 270.0000762939453, - "z": "d540a7b.861cb58", + "x": 1671.0439834594727, + "y": 296.0000762939453, + "z": "f7b8765.9d87788", "wires": [ [ - "80cbc7ba.096f98", - "e060fcc5.cef25" + "3002f41f.7cb61c", + "9eec95b7.76f808" ] ] }, { - "id": "44fab179.6e6d3", + "id": "545c41c0.800ed", "type": "set", "name": "set siteId in control point", "xml": "<set>\n<parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />\n\n", "comments": "", - "x": 2108.666790008545, - "y": 240.00019645690918, - "z": "d540a7b.861cb58", + "x": 2068.3771781921387, + "y": 266.0001964569092, + "z": "f7b8765.9d87788", "wires": [] }, { - "id": "80cbc7ba.096f98", + "id": "3002f41f.7cb61c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1930.0004386901855, - "y": 239.00007438659668, - "z": "d540a7b.861cb58", + "x": 1889.7108268737793, + "y": 265.0000743865967, + "z": "f7b8765.9d87788", "wires": [ [ - "44fab179.6e6d3" + "545c41c0.800ed" ] ] }, { - "id": "e060fcc5.cef25", + "id": "9eec95b7.76f808", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1932.2502822875977, - "y": 277.6429605484009, - "z": "d540a7b.861cb58", + "x": 1891.9606704711914, + "y": 303.6429605484009, + "z": "f7b8765.9d87788", "wires": [ [ - "a065dfd4.9970f" + "aebaf4c.ab33d08" ] ] }, { - "id": "a065dfd4.9970f", + "id": "aebaf4c.ab33d08", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2072.6666297912598, - "y": 276.0000171661377, - "z": "d540a7b.861cb58", + "x": 2032.3770179748535, + "y": 302.0000171661377, + "z": "f7b8765.9d87788", "wires": [ [] ] }, { - "id": "9f90e330.d491e", + "id": "f4a3ecf1.a3a47", "type": "set", "name": "set prop.controlPtId", "xml": "<set>\n<parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />\n\n", "comments": "", - "x": 1673.000099182129, - "y": 210.0000114440918, - "z": "d540a7b.861cb58", + "x": 1632.7104873657227, + "y": 236.0000114440918, + "z": "f7b8765.9d87788", + "wires": [] + }, + { + "id": "793cd9f6.80cc58", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 1203, + "y": 614, + "z": "f7b8765.9d87788", + "wires": [ + [] + ] + }, + { + "id": "702b3ce6.3adbe4", + "type": "switchNode", + "name": "switch prop.site.controlpoints ", + "xml": "<switch test=\"`$prop.site.controlPoint`\">\n\n", + "comments": "", + "outputs": 1, + "x": 1098, + "y": 224, + "z": "f7b8765.9d87788", + "wires": [ + [ + "4ac6f9a0.74a1d8", + "b2aa5e32.50984" + ] + ] + }, + { + "id": "4ac6f9a0.74a1d8", + "type": "other", + "name": "Null", + "xml": "<outcome value=''>\n", + "comments": "", + "outputs": 1, + "x": 1294, + "y": 197, + "z": "f7b8765.9d87788", + "wires": [ + [ + "d9d8dd65.e2446" + ] + ] + }, + { + "id": "b2aa5e32.50984", + "type": "other", + "name": "other", + "xml": "<outcome value='Other'>\n", + "comments": "", + "outputs": 1, + "x": 1286, + "y": 246, + "z": "f7b8765.9d87788", + "wires": [ + [ + "d71ee31.658172" + ] + ] + }, + { + "id": "d9d8dd65.e2446", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1432, + "y": 199, + "z": "f7b8765.9d87788", + "wires": [ + [ + "ca30cd8f.df3a" + ] + ] + }, + { + "id": "f1ac4b9c.e46258", + "type": "comment", + "name": "should be null in request", + "info": "", + "comments": "", + "x": 1334.714584350586, + "y": 384.00006771087646, + "z": "f7b8765.9d87788", + "wires": [] + }, + { + "id": "ca30cd8f.df3a", + "type": "set", + "name": "set template file hub", + "xml": "<set>\n<parameter name='template.site.role' value=\"hub\" />\n\n", + "comments": "", + "x": 1601.0039978027344, + "y": 202.00392055511475, + "z": "f7b8765.9d87788", + "wires": [] + }, + { + "id": "d71ee31.658172", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 1095.003890991211, + "y": 289.0039052963257, + "z": "f7b8765.9d87788", + "wires": [ + [ + "6f03dda4.fbdb64", + "f3663259.ad67e" + ] + ] + }, + { + "id": "f3663259.ad67e", + "type": "set", + "name": "set template file spoke", + "xml": "<set>\n<parameter name='template.site.role' value=\"spoke\" />\n\n", + "comments": "", + "x": 1275.00390625, + "y": 308.0039129257202, + "z": "f7b8765.9d87788", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json index de7bc57b..4d947bbf 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json @@ -1,20 +1,20 @@ [ { - "id": "d0010b4e.1448a8", + "id": "735f5ad1.ead7c4", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 135.00390625, - "y": 59.999999046325684, - "z": "32a9459d.29ba0a", + "x": 77.71430206298828, + "y": 47, + "z": "5c7962f1.1a851c", "wires": [ [ - "7fc8b438.987c3c" + "fe8db64d.524ea8" ] ] }, { - "id": "7fc8b438.987c3c", + "id": "fe8db64d.524ea8", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,418 +22,418 @@ "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": 234.28960418701172, - "y": 134.23810693901032, - "z": "32a9459d.29ba0a", + "x": 177, + "y": 121.23810789268464, + "z": "5c7962f1.1a851c", "wires": [ [ - "18f3c53b.5e40fb" + "1caac0d4.b3765f" ] ] }, { - "id": "18f3c53b.5e40fb", + "id": "1caac0d4.b3765f", "type": "method", "name": "method site-vnf-topology-operation-create", "xml": "<method rpc='site-vnf-topology-operation-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 255.4325180053711, - "y": 223.99999544303864, - "z": "32a9459d.29ba0a", + "x": 198.14291381835938, + "y": 210.99999639671296, + "z": "5c7962f1.1a851c", "wires": [ [ - "286c6526.b613ca" + "d05aaf1d.08055" ] ] }, { - "id": "286c6526.b613ca", + "id": "d05aaf1d.08055", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 235.67056274414062, - "y": 395.66666719596833, - "z": "32a9459d.29ba0a", + "x": 178.3809585571289, + "y": 382.66666814964265, + "z": "5c7962f1.1a851c", "wires": [ [ - "2a8f2c14.d43db4", - "5fbde6da.2bd958", - "cc1a93a5.7ab76", - "18b24e84.30ff61", - "a5742836.13c218", - "671e4dac.744e44", - "2dfa8b04.f64514", - "c4eecb83.953aa8", - "ee03e646.5fd808", - "d81ebfe3.370b", - "d3dc22e.6b5c4e", - "4ed7986f.14fb68" + "6f65d305.7dd0dc", + "c0e8c4a0.84ad08", + "d1be6ea1.8ea6a", + "8988370b.251a38", + "61f164dd.5ae33c", + "1f2f5cd6.515d03", + "7fec36e8.2120f8", + "2f304e20.895352", + "4e05fc36.a331a4", + "b30ee953.435c78", + "1bdd47aa.96d5c8", + "e5bdd145.df52f" ] ] }, { - "id": "5fbde6da.2bd958", + "id": "c0e8c4a0.84ad08", "type": "set", "name": "set vnf-level-oper-status to Created", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", - "x": 663.8173141479492, - "y": 814.6705651283264, - "z": "32a9459d.29ba0a", + "x": 606.5277099609375, + "y": 801.6705660820007, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "2a8f2c14.d43db4", + "id": "6f65d305.7dd0dc", "type": "set", "name": "copy input data to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n", "comments": "", - "x": 650.6704635620117, - "y": 712.6667809486389, - "z": "32a9459d.29ba0a", + "x": 593.380859375, + "y": 699.6667819023132, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "a5742836.13c218", + "id": "61f164dd.5ae33c", "type": "execute", "name": "execute generate-vnf-index", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n", "comments": "", "outputs": 1, - "x": 635.0039978027344, - "y": 639.3334522247314, - "z": "32a9459d.29ba0a", + "x": 577.7143936157227, + "y": 626.3334531784058, + "z": "5c7962f1.1a851c", "wires": [ [] ] }, { - "id": "6d87bfd7.c22d1", + "id": "8388db61.48edd8", "type": "set", "name": "set vnf-index to service data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n", "comments": "", - "x": 648.0040626525879, - "y": 768.3334197998047, - "z": "32a9459d.29ba0a", + "x": 590.7144584655762, + "y": 755.333420753479, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "cc1a93a5.7ab76", + "id": "d1be6ea1.8ea6a", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, - "x": 665.0038833618164, - "y": 274.33335876464844, - "z": "32a9459d.29ba0a", + "x": 607.7142791748047, + "y": 261.33335971832275, + "z": "5c7962f1.1a851c", "wires": [ [ - "6a52e61c.b473b8", - "ceafd752.94f398" + "ec91878.ef3fc78", + "8eb89062.3f8df" ] ] }, { - "id": "6a52e61c.b473b8", + "id": "ec91878.ef3fc78", "type": "other", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 899.7182693481445, - "y": 269.4761791229248, - "z": "32a9459d.29ba0a", + "x": 842.4286651611328, + "y": 256.4761800765991, + "z": "5c7962f1.1a851c", "wires": [ [ - "98d935d6.adba58" + "ee0ce75d.fadbc8" ] ] }, { - "id": "98d935d6.adba58", + "id": "ee0ce75d.fadbc8", "type": "set", "name": "set vnf-index=0", "xml": "<set>\n<parameter name='vnf-index' value='0' />\n", "comments": "", - "x": 1060.0039749145508, - "y": 269.4762706756592, - "z": "32a9459d.29ba0a", + "x": 1002.7143707275391, + "y": 256.4762716293335, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "ceafd752.94f398", + "id": "8eb89062.3f8df", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 896.1468086242676, - "y": 302.7620105743408, - "z": "32a9459d.29ba0a", + "x": 838.8572044372559, + "y": 289.76201152801514, + "z": "5c7962f1.1a851c", "wires": [ [ - "2edf4169.726dbe" + "dddde8e2.a6e3a8" ] ] }, { - "id": "f2ec0c7c.259ee", + "id": "22bd6504.22c48a", "type": "set", "name": "set vnf-index = vnf_length", "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n", "comments": "", - "x": 1289.004051208496, - "y": 281.0477361679077, - "z": "32a9459d.29ba0a", + "x": 1231.7144470214844, + "y": 268.04773712158203, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "728dfb90.8e3944", + "id": "8d104e1d.a35c3", "type": "for", "name": "for each existing VNF", "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, - "x": 1277.4326705932617, - "y": 316.0477080345154, - "z": "32a9459d.29ba0a", + "x": 1220.14306640625, + "y": 303.0477089881897, + "z": "5c7962f1.1a851c", "wires": [ [ - "f1186372.a0982" + "5570c3fc.a06f2c" ] ] }, { - "id": "2edf4169.726dbe", + "id": "dddde8e2.a6e3a8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1030.8610916137695, - "y": 304.7619800567627, - "z": "32a9459d.29ba0a", + "x": 973.5714874267578, + "y": 291.761981010437, + "z": "5c7962f1.1a851c", "wires": [ [ - "f2ec0c7c.259ee", - "728dfb90.8e3944" + "22bd6504.22c48a", + "8d104e1d.a35c3" ] ] }, { - "id": "f1186372.a0982", + "id": "5570c3fc.a06f2c", "type": "switchNode", "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id", "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n", "comments": "", "outputs": 1, - "x": 1670.718406677246, - "y": 316.6191921234131, - "z": "32a9459d.29ba0a", + "x": 1613.4288024902344, + "y": 303.6191930770874, + "z": "5c7962f1.1a851c", "wires": [ [ - "32b0d35f.e4b42c" + "476608a3.dc62a8" ] ] }, { - "id": "32b0d35f.e4b42c", + "id": "476608a3.dc62a8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1952.004108428955, - "y": 315.1905975341797, - "z": "32a9459d.29ba0a", + "x": 1894.7145042419434, + "y": 302.190598487854, + "z": "5c7962f1.1a851c", "wires": [ [ - "c7f17107.aecae" + "c72cc9fe.2f14b8" ] ] }, { - "id": "8ccad497.cccb38", + "id": "480cbd60.5b2ab4", "type": "comment", "name": "make sure this vnf-id doesn't exist already", "info": "", "comments": "", - "x": 1639.8610229492188, - "y": 280.19058418273926, - "z": "32a9459d.29ba0a", + "x": 1582.571418762207, + "y": 267.1905851364136, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "18b24e84.30ff61", + "id": "8988370b.251a38", "type": "set", "name": "set new vnf_length", "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n", "comments": "", - "x": 617.0039596557617, - "y": 606.3334069252014, - "z": "32a9459d.29ba0a", + "x": 559.71435546875, + "y": 593.3334078788757, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "c4eecb83.953aa8", + "id": "2f304e20.895352", "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": 619.0039863586426, - "y": 1037.5970339775085, - "z": "32a9459d.29ba0a", + "x": 561.7143821716309, + "y": 1024.5970349311829, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "671e4dac.744e44", + "id": "1f2f5cd6.515d03", "type": "save", "name": "save siteInstance configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $prop.vnf-index' >\n<parameter name='site-resource-id' value='`$prop.vnf-index`' /> \n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='prop.site.type' />\n<parameter name='role' value='prop.site.role' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $prop.vnf-index' >\n<parameter name='site-resource-id' value='`$prop.vnf-index`' /> \n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />\n", "comments": "", "outputs": 1, - "x": 667.6707305908203, - "y": 909.8190650939941, - "z": "32a9459d.29ba0a", + "x": 610.3811264038086, + "y": 896.8190660476685, + "z": "5c7962f1.1a851c", "wires": [ [] ] }, { - "id": "2dfa8b04.f64514", + "id": "7fec36e8.2120f8", "type": "save", "name": "save service relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />", "comments": "", "outputs": 1, - "x": 656.6707344055176, - "y": 972.5969476699829, - "z": "32a9459d.29ba0a", + "x": 599.3811302185059, + "y": 959.5969486236572, + "z": "5c7962f1.1a851c", "wires": [ [] ] }, { - "id": "ee03e646.5fd808", + "id": "4e05fc36.a331a4", "type": "set", "name": "set vnf-index and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />", "comments": "", - "x": 658.0039825439453, - "y": 858.5968360900879, - "z": "32a9459d.29ba0a", + "x": 600.7143783569336, + "y": 845.5968370437622, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "d81ebfe3.370b", + "id": "b30ee953.435c78", "type": "for", "name": "for loop idx - VNF input parameters", "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n", "comments": "", "outputs": 1, - "x": 651.0039978027344, - "y": 413.00006198883057, - "z": "32a9459d.29ba0a", + "x": 593.7143936157227, + "y": 400.0000629425049, + "z": "5c7962f1.1a851c", "wires": [ [ - "610b8a5.566b074" + "a33f518e.35371" ] ] }, { - "id": "610b8a5.566b074", + "id": "a33f518e.35371", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 865.782341003418, - "y": 410.555645942688, - "z": "32a9459d.29ba0a", + "x": 808.4927368164062, + "y": 397.5556468963623, + "z": "5c7962f1.1a851c", "wires": [ [ - "544f33c4.6ec91c", - "77273637.aeb898" + "97fc593c.33ca48", + "dcd520b2.7e574" ] ] }, { - "id": "544f33c4.6ec91c", + "id": "97fc593c.33ca48", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1062.0385437011719, - "y": 388.30378437042236, - "z": "32a9459d.29ba0a", + "x": 1004.7489395141602, + "y": 375.3037853240967, + "z": "5c7962f1.1a851c", "wires": [ [] ] }, { - "id": "77273637.aeb898", + "id": "dcd520b2.7e574", "type": "set", "name": "set parameterName", "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1031.4829711914062, - "y": 425.30390071868896, - "z": "32a9459d.29ba0a", + "x": 974.1933670043945, + "y": 412.3039016723633, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "d3dc22e.6b5c4e", + "id": "1bdd47aa.96d5c8", "type": "set", "name": "set vnf-request-input.", "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n", "comments": "", - "x": 613.0036163330078, - "y": 487.3247766494751, - "z": "32a9459d.29ba0a", + "x": 555.7140121459961, + "y": 474.3247776031494, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "4ed7986f.14fb68", + "id": "e5bdd145.df52f", "type": "call", "name": "call sdwan-get-site-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-site-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 629.0039825439453, - "y": 519.3249807357788, - "z": "32a9459d.29ba0a", + "x": 571.7143783569336, + "y": 506.3249816894531, + "z": "5c7962f1.1a851c", "wires": [ [] ] }, { - "id": "c7f17107.aecae", + "id": "c72cc9fe.2f14b8", "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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n", "comments": "", - "x": 2080.5754776000977, - "y": 366.19061183929443, - "z": "32a9459d.29ba0a", + "x": 2023.285873413086, + "y": 353.19061279296875, + "z": "5c7962f1.1a851c", "wires": [] }, { - "id": "9be618c6.476348", + "id": "272c1a85.bab626", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1374.0040893554688, - "y": 369.6666784286499, - "z": "32a9459d.29ba0a", + "x": 1316.714485168457, + "y": 356.6666793823242, + "z": "5c7962f1.1a851c", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json index 6eca6072..f97be6bb 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json @@ -1,6 +1,6 @@ [ { - "id": "d86fdeaf.90856", + "id": "f2d5a044.e7585", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -9,470 +9,470 @@ "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": 182.8570785522461, - "y": 146.23809719085693, - "z": "662bc73e.2f2df8", + "y": 139.23809814453125, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "8c1fcf5.c30ac3" + "3fa00e50.ff8f92" ] ] }, { - "id": "c3f643e9.793bf", + "id": "1dae242d.6645cc", "type": "dgstart", "name": "DGSTART", "outputs": 1, "x": 107.57137298583984, - "y": 105.99998569488525, - "z": "662bc73e.2f2df8", + "y": 98.99998664855957, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "d86fdeaf.90856" + "f2d5a044.e7585" ] ] }, { - "id": "8c1fcf5.c30ac3", + "id": "3fa00e50.ff8f92", "type": "method", "name": "method site-vnf-topology-operation-deactivate", "xml": "<method rpc='site-vnf-topology-operation-deactivate' mode='sync'>", "comments": "", "outputs": 1, "x": 176, - "y": 185.99997997283936, - "z": "662bc73e.2f2df8", + "y": 178.99998092651367, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "ed73a4d4.18b998" + "42e004c2.23654c" ] ] }, { - "id": "ed73a4d4.18b998", + "id": "42e004c2.23654c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 216.73809814453125, - "y": 257.69349098205566, - "z": "662bc73e.2f2df8", + "y": 250.69349193572998, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "59f08d7c.e40f14", - "c44bdf39.f49ac", - "af671a8b.af38d8", - "35b8b725.755a88", - "6ebc8511.a2521c", - "cf959324.083ab", - "82cb066d.91c668", - "2ec82407.2cc83c", - "ab2363bc.936b4" + "65c407c9.9f1008", + "48bce7ba.2d8768", + "a7851b19.e94318", + "7b84792a.cd09f8", + "33ca4ea0.f0ad62", + "85876d42.f8148", + "145e6ab2.474a25", + "65cd0ad5.7b6474", + "e07817c8.713ef8" ] ] }, { - "id": "6ebc8511.a2521c", + "id": "33ca4ea0.f0ad62", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 623.7856979370117, - "y": 122.8095064163208, - "z": "662bc73e.2f2df8", + "y": 115.80950736999512, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "3eca00ab.dea9f", - "33bd2a9b.930326", - "fb6a76d8.c72038", - "d8062777.1e2a88" + "44befce.c3f5f04", + "7d171976.884c68", + "2cfd8e20.8f3c62", + "c7b90528.204df8" ] ] }, { - "id": "3eca00ab.dea9f", + "id": "44befce.c3f5f04", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n", "comments": "", "outputs": 1, "x": 903.6747055053711, - "y": 148.14282417297363, - "z": "662bc73e.2f2df8", + "y": 141.14282512664795, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "b63df83d.881f98", - "2d9f4a28.834cf6" + "85e6c857.e79cf8", + "f4c886b6.8c7de8" ] ] }, { - "id": "b63df83d.881f98", + "id": "85e6c857.e79cf8", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, "x": 1157.2858276367188, - "y": 129.80951118469238, - "z": "662bc73e.2f2df8", + "y": 122.8095121383667, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "ce144d22.a6862" + "f39dd2df.24642" ] ] }, { - "id": "ce144d22.a6862", + "id": "f39dd2df.24642", "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.vnf-request-input.vnf-id not found in service-data\" />\n", "comments": "", "x": 1331.2858428955078, - "y": 129.80951118469238, - "z": "662bc73e.2f2df8", + "y": 122.8095121383667, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "2d9f4a28.834cf6", + "id": "f4c886b6.8c7de8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, "x": 1140.7857971191406, - "y": 165.80952167510986, - "z": "662bc73e.2f2df8", + "y": 158.80952262878418, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "5e80a5f7.14668c" + "9dbcc4cd.8daf68" ] ] }, { - "id": "5e80a5f7.14668c", + "id": "9dbcc4cd.8daf68", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 1322.7859954833984, - "y": 176.80952739715576, - "z": "662bc73e.2f2df8", + "y": 169.80952835083008, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "68893bf6.030534", - "ef8a4172.bf9b" + "5192b087.75251", + "a84b6b1.e64a598" ] ] }, { - "id": "ef8a4172.bf9b", + "id": "a84b6b1.e64a598", "type": "switchNode", "name": "switch tmp.vidx ", "xml": "<switch test=\"`$tmp.vidx`\">\n\n", "comments": "", "outputs": 1, "x": 1512.785888671875, - "y": 193.80952167510986, - "z": "662bc73e.2f2df8", + "y": 186.80952262878418, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "3898f902.da4f46" + "f8861e43.09ff7" ] ] }, { - "id": "fb6a76d8.c72038", + "id": "c7b90528.204df8", "type": "switchNode", "name": "switch vnf-level-oper-status", "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n", "comments": "", "outputs": 1, "x": 866.952507019043, - "y": 243.69837760925293, - "z": "662bc73e.2f2df8", + "y": 236.69837856292725, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "9a6e14da.4f6898", - "830ab1c4.069de" + "4f6faf17.9da86", + "63b6f7c3.593ea8" ] ] }, { - "id": "9a6e14da.4f6898", + "id": "4f6faf17.9da86", "type": "outcome", "name": "outcome Active", "xml": "<outcome value='Active'>\n", "comments": "", "outputs": 1, "x": 1173.7858200073242, - "y": 224.8094997406006, - "z": "662bc73e.2f2df8", + "y": 217.8095006942749, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "c41182b7.2c8a4" + "a798f2fb.14365" ] ] }, { - "id": "830ab1c4.069de", + "id": "63b6f7c3.593ea8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, "x": 1141.7858200073242, - "y": 264.8094997406006, - "z": "662bc73e.2f2df8", + "y": 257.8095006942749, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "ff8457d6.891c88" + "1d11ed5c.996383" ] ] }, { - "id": "ff8457d6.891c88", + "id": "1d11ed5c.996383", "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 is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />", + "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 is not in appropriate state for deactivate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />", "comments": "", "x": 1299.2858200073242, - "y": 264.8094997406006, - "z": "662bc73e.2f2df8", + "y": 257.8095006942749, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "33bd2a9b.930326", + "id": "7d171976.884c68", "type": "switchNode", "name": "switch vnf-id", "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n", "comments": "", "outputs": 1, "x": 845.7858047485352, - "y": 88.80949878692627, - "z": "662bc73e.2f2df8", + "y": 81.80949974060059, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "660d1ca1.7f5824" + "f940f6c8.c04158" ] ] }, { - "id": "660d1ca1.7f5824", + "id": "f940f6c8.c04158", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, "x": 988.7857971191406, - "y": 88.80950164794922, - "z": "662bc73e.2f2df8", + "y": 81.80950260162354, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "da90fecc.888a8" + "8db9d430.4ecf68" ] ] }, { - "id": "da90fecc.888a8", + "id": "8db9d430.4ecf68", "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.vnf-information.vnf-id is a required input\" />\n", "comments": "", "x": 1137.2857971191406, - "y": 88.8095006942749, - "z": "662bc73e.2f2df8", + "y": 81.80950164794922, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "68893bf6.030534", + "id": "5192b087.75251", "type": "for", "name": "for vidx..service-data.vnfs.vnf[]", "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n", "comments": "", "outputs": 1, "x": 1558.2859191894531, - "y": 155.80951118469238, - "z": "662bc73e.2f2df8", + "y": 148.8095121383667, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "32659e4e.c6e252" + "93fbba5f.463c78" ] ] }, { - "id": "32659e4e.c6e252", + "id": "93fbba5f.463c78", "type": "switchNode", "name": "switch vnf-id found", "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n", "comments": "", "outputs": 1, "x": 1844.2859191894531, - "y": 155.80951118469238, - "z": "662bc73e.2f2df8", + "y": 148.8095121383667, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "760edd7e.39ca84" + "8c6bb65a.97de78" ] ] }, { - "id": "760edd7e.39ca84", + "id": "8c6bb65a.97de78", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, "x": 2029.7859954833984, - "y": 155.80951309204102, - "z": "662bc73e.2f2df8", + "y": 148.80951404571533, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "e7380240.e1e34" + "5c836ef8.46731" ] ] }, { - "id": "e7380240.e1e34", + "id": "5c836ef8.46731", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].vnf-data.`' />\n", "comments": "", "x": 2237.785919189453, - "y": 155.80951118469238, - "z": "662bc73e.2f2df8", + "y": 148.8095121383667, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "9f76132b.ac81b", + "id": "7e651921.d7b4c8", "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.vnf-information.vnf-id not found in service-data\" />\n", "comments": "", "x": 1804.285888671875, - "y": 193.80952167510986, - "z": "662bc73e.2f2df8", + "y": 186.80952262878418, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "3898f902.da4f46", + "id": "f8861e43.09ff7", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, "x": 1666.785888671875, - "y": 193.80952167510986, - "z": "662bc73e.2f2df8", + "y": 186.80952262878418, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "9f76132b.ac81b" + "7e651921.d7b4c8" ] ] }, { - "id": "59f08d7c.e40f14", + "id": "65c407c9.9f1008", "type": "set", "name": "set vnf in service-data", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />", "comments": "", "x": 610.5715866088867, - "y": 591.0002222061157, - "z": "662bc73e.2f2df8", + "y": 584.00022315979, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "c44bdf39.f49ac", + "id": "48bce7ba.2d8768", "type": "set", "name": "set vnfId and vnf-object-path", "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />", "comments": "", "x": 632.1271820068359, - "y": 628.2224435806274, - "z": "662bc73e.2f2df8", + "y": 621.2224445343018, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "35b8b725.755a88", + "id": "7b84792a.cd09f8", "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": 585.9049634933472, - "y": 778.7778730392456, - "z": "662bc73e.2f2df8", + "y": 771.7778739929199, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "af671a8b.af38d8", + "id": "a7851b19.e94318", "type": "set", "name": "set vnf-level-oper-status to PendingDelete", "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n", "comments": "", "x": 670.5715866088867, - "y": 672.0002851486206, - "z": "662bc73e.2f2df8", + "y": 665.0002861022949, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "c41182b7.2c8a4", + "id": "a798f2fb.14365", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 1367.713279724121, - "y": 228.88886868953705, - "z": "662bc73e.2f2df8", + "y": 221.88886964321136, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] }, { - "id": "d8062777.1e2a88", + "id": "2cfd8e20.8f3c62", "type": "execute", "name": "execute requiredParameters", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n", "comments": "", "outputs": 1, "x": 895.5716171264648, - "y": 50.999999046325684, - "z": "662bc73e.2f2df8", + "y": 44, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] }, { - "id": "b2ebc544.1e6068", + "id": "dc5cbf86.069cb", "type": "comment", "name": "site-vnf-topology-operation-deactivate", "info": "", "comments": "", "x": 489.8570785522461, - "y": 51.238097190856934, - "z": "662bc73e.2f2df8", + "y": 44.23809814453125, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "cf959324.083ab", + "id": "85876d42.f8148", "type": "for", "name": "for loop idx - VNF input parameters", "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`' >\n", "comments": "", "outputs": 1, "x": 667.8572273254395, - "y": 322.00002098083496, - "z": "662bc73e.2f2df8", + "y": 315.0000219345093, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "fe2f83f9.8338" + "3e4458ac.5a1978" ] ] }, { - "id": "fe2f83f9.8338", + "id": "3e4458ac.5a1978", "type": "block", "name": "block", "xml": "<block>\n", @@ -480,314 +480,314 @@ "comments": "", "outputs": 1, "x": 874.7529640197754, - "y": 321.92188453674316, - "z": "662bc73e.2f2df8", + "y": 314.9218854904175, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "550bedb1.f170d4", - "b37adbd9.2464a8" + "d28edbd3.ae9358", + "bda524fb.86fa98" ] ] }, { - "id": "550bedb1.f170d4", + "id": "d28edbd3.ae9358", "type": "switchNode", - "name": "switch role", - "xml": "<switch test=\"`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`\">\n", + "name": "switch type", + "xml": "<switch test=\"`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`\">\n", "comments": "", "outputs": 1, "x": 1011.8701667785645, - "y": 321.89532470703125, - "z": "662bc73e.2f2df8", + "y": 314.89532566070557, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "de4a1711.c3fb08" + "a740d422.40d728" ] ] }, { - "id": "de4a1711.c3fb08", + "id": "a740d422.40d728", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, "x": 1151.870174407959, - "y": 322.89532470703125, - "z": "662bc73e.2f2df8", + "y": 315.89532566070557, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "d4dca6e6.2c3458" + "feaf8bb0.d7e508" ] ] }, { - "id": "d4dca6e6.2c3458", + "id": "feaf8bb0.d7e508", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 1300.419822692871, - "y": 323.92201805114746, - "z": "662bc73e.2f2df8", + "y": 316.9220190048218, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "8481bd23.50386" + "6e080bd9.2cad94" ] ] }, { - "id": "8481bd23.50386", + "id": "6e080bd9.2cad94", "type": "set", - "name": "set role", - "xml": "<set>\n<parameter name='prop.site.role' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n<parameter name='prop.site.sdwan' value=\"true\" />\n", + "name": "set type and sdwan flag", + "xml": "<set>\n<parameter name='prop.site.type' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n<parameter name='prop.site.sdwan' value=\"true\" />\n", "comments": "", "x": 1444.7531852722168, - "y": 324.92203521728516, - "z": "662bc73e.2f2df8", + "y": 317.9220361709595, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "82cb066d.91c668", + "id": "145e6ab2.474a25", "type": "switchNode", "name": "switch prop.site.sdwan", "xml": "<switch test=\"`$prop.site.sdwan`\">\n", "comments": "", "outputs": 1, "x": 641.8570785522461, - "y": 477.00004291534424, - "z": "662bc73e.2f2df8", + "y": 470.00004386901855, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "44689f8b.efef2" + "c9081f3c.c4c52" ] ] }, { - "id": "44689f8b.efef2", + "id": "c9081f3c.c4c52", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, "x": 822.8572120666504, - "y": 478.0000696182251, - "z": "662bc73e.2f2df8", + "y": 471.0000705718994, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "92d1a385.88b4d" + "5bb614a8.7a50ac" ] ] }, { - "id": "1f34e7d.f4ed818", + "id": "619fc994.c8c7e8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, "x": 1527.357234954834, - "y": 446.00012397766113, - "z": "662bc73e.2f2df8", + "y": 439.00012493133545, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "444dfd43.933654" + "9d1c31d.0bb00d" ] ] }, { - "id": "444dfd43.933654", + "id": "9d1c31d.0bb00d", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", "x": 1715.8573303222656, - "y": 440.0001336336136, - "z": "662bc73e.2f2df8", + "y": 433.0001345872879, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "20f5a47d.bf5c7c", + "id": "a8d0eff5.22c29", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, "x": 1530.848201751709, - "y": 493.5741596221924, - "z": "662bc73e.2f2df8", + "y": 486.5741605758667, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "efd0bf42.a45d2" + "182c54e4.50314b" ] ] }, { - "id": "efd0bf42.a45d2", + "id": "182c54e4.50314b", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", "x": 1704.4196128845215, - "y": 481.85989570617676, - "z": "662bc73e.2f2df8", + "y": 474.8598966598511, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "43e41f52.73e87", + "id": "dafc7114.f9611", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, "x": 1523.181209564209, - "y": 534.9074726104736, - "z": "662bc73e.2f2df8", + "y": 527.907473564148, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "b91e604b.71e8a" + "9c3bc7c8.8428c8" ] ] }, { - "id": "b91e604b.71e8a", + "id": "9c3bc7c8.8428c8", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", "x": 1710.9537658691406, - "y": 530.3466653823853, - "z": "662bc73e.2f2df8", + "y": 523.3466663360596, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "5edbf1df.1812f", + "id": "2718b5aa.7ee4da", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, "x": 1260.3571472167969, - "y": 494.0001298189163, - "z": "662bc73e.2f2df8", + "y": 487.00013077259064, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "1f34e7d.f4ed818", - "20f5a47d.bf5c7c", - "43e41f52.73e87" + "619fc994.c8c7e8", + "a8d0eff5.22c29", + "dafc7114.f9611" ] ] }, { - "id": "850d49b7.5d6588", + "id": "f6e580dc.483b5", "type": "execute", "name": "execute RestApiCallNode Create SDWAN site", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-site-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, "x": 1288.8574905395508, - "y": 692.0002012252808, - "z": "662bc73e.2f2df8", + "y": 685.0002021789551, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "ea765af1.578958", - "a315c86f.c08e38" + "9ccdb4e3.7037b8", + "542d6497.1e051c" ] ] }, { - "id": "27adc5f9.0dcbfa", + "id": "efaab9ba.da6af8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 1782.5236206054688, - "y": 665.8889733552933, - "z": "662bc73e.2f2df8", + "x": 1684.523811340332, + "y": 664.8890171051025, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] }, { - "id": "ffec3641.8f04a8", + "id": "eed03e10.52741", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 1757.96826171875, - "y": 727.4443560838699, - "z": "662bc73e.2f2df8", + "x": 1681.9683113098145, + "y": 699.444356918335, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "a315c86f.c08e38", + "id": "f190e7e4.b492e8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1612.96826171875, - "y": 724.4443560838699, - "z": "662bc73e.2f2df8", + "x": 1537.9683074951172, + "y": 698.444356918335, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "ffec3641.8f04a8" + "eed03e10.52741" ] ] }, { - "id": "ea765af1.578958", + "id": "3d884d4b.3bb372", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1609.4126358032227, - "y": 666.1111413240433, - "z": "662bc73e.2f2df8", + "x": 1541.4126434326172, + "y": 667.1111841201782, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "27adc5f9.0dcbfa" + "efaab9ba.da6af8" ] ] }, { - "id": "326c4c2.f406bb4", + "id": "268a0227.9f4d8e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, "x": 1526.611125946045, - "y": 572.0040856599808, - "z": "662bc73e.2f2df8", + "y": 565.0040866136551, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "9184b52b.37e358" + "7a5f68d2.12c3e8" ] ] }, { - "id": "e3754930.79e2e8", + "id": "ec5d99f5.fe59b8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, "x": 1518.861125946045, - "y": 613.646968960762, - "z": "662bc73e.2f2df8", + "y": 606.6469699144363, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "41ddc45.064fd3c" + "dc9e3b17.c88cb8" ] ] }, { - "id": "41ddc45.064fd3c", + "id": "dc9e3b17.c88cb8", "type": "block", "name": "block", "xml": "<block>\n", @@ -795,163 +795,240 @@ "comments": "", "outputs": 1, "x": 1644.944622039795, - "y": 613.8930016756058, - "z": "662bc73e.2f2df8", + "y": 606.8930026292801, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] }, { - "id": "9184b52b.37e358", + "id": "7a5f68d2.12c3e8", "type": "set", "name": "set token-id", "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", "comments": "", "x": 1663.611125946045, - "y": 572.0040856599808, - "z": "662bc73e.2f2df8", + "y": 565.0040866136551, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "6736685b.bef9d8", + "id": "cbf3519f.042f3", "type": "comment", "name": "tmp.thirdparty-sdnc-id is hardcoded value?", "info": "", "comments": "", "x": 1256.8610382080078, - "y": 461.0040513277054, - "z": "662bc73e.2f2df8", + "y": 454.0040522813797, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "92d1a385.88b4d", + "id": "5bb614a8.7a50ac", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 983.8571472167969, - "y": 478.66657733917236, - "z": "662bc73e.2f2df8", + "y": 471.6665782928467, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "5edbf1df.1812f", - "5a50b7d1.a81c28", - "850d49b7.5d6588" + "2718b5aa.7ee4da", + "8fc11da9.0efed", + "f6e580dc.483b5", + "49b38240.460c6c" ] ] }, { - "id": "2ec82407.2cc83c", + "id": "65cd0ad5.7b6474", "type": "save", "name": "update siteInstance configuration in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /> \n<parameter name='operational-status' value='PendingDelete' />\n", + "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /> \n<parameter name='operational-status' value='PendingDelete' />\n", "comments": "", "outputs": 1, "x": 663.8571701049805, - "y": 711.0001020431519, - "z": "662bc73e.2f2df8", + "y": 704.0001029968262, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] }, { - "id": "b37adbd9.2464a8", + "id": "bda524fb.86fa98", "type": "switchNode", "name": "switch siteId", "xml": "<switch test=\"`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].name == 'siteId'`\">\n", "comments": "", "outputs": 1, "x": 1011.8700637817383, - "y": 396.8953676223755, - "z": "662bc73e.2f2df8", + "y": 389.8953685760498, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "a2554bc6.d49ce8" + "5e12f6f2.154df8" ] ] }, { - "id": "a2554bc6.d49ce8", + "id": "5e12f6f2.154df8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, "x": 1151.8700714111328, - "y": 397.8953676223755, - "z": "662bc73e.2f2df8", + "y": 390.8953685760498, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "6ecb0b06.7fedc4" + "c0b4aa42.b23db8" ] ] }, { - "id": "6ecb0b06.7fedc4", + "id": "c0b4aa42.b23db8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, "x": 1300.419719696045, - "y": 398.9220609664917, - "z": "662bc73e.2f2df8", + "y": 391.922061920166, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "83210993.fce798" + "12912fa7.36df6" ] ] }, { - "id": "83210993.fce798", + "id": "12912fa7.36df6", "type": "set", "name": "set siteId", "xml": "<set>\n<parameter name='prop.site.siteId' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n", "comments": "", "x": 1444.7530822753906, - "y": 399.9220781326294, - "z": "662bc73e.2f2df8", + "y": 392.9220790863037, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "48d793e7.102a6c", + "id": "cc3aa10c.cf485", "type": "comment", "name": "Get siteId to delete", "info": "", "comments": "", "x": 1023.857048034668, - "y": 366.0000238418579, - "z": "662bc73e.2f2df8", + "y": 359.0000247955322, + "z": "ccd0c7cf.3cb8d8", "wires": [] }, { - "id": "5a50b7d1.a81c28", + "id": "8fc11da9.0efed", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>", "comments": "", "outputs": 1, "x": 1277.0000762939453, - "y": 595.0000381469727, - "z": "662bc73e.2f2df8", + "y": 588.000039100647, + "z": "ccd0c7cf.3cb8d8", "wires": [ [ - "326c4c2.f406bb4", - "e3754930.79e2e8" + "268a0227.9f4d8e", + "ec5d99f5.fe59b8" ] ] }, { - "id": "ab2363bc.936b4", + "id": "e07817c8.713ef8", "type": "execute", "name": "execute Properties", "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": 617, - "y": 232, - "z": "662bc73e.2f2df8", + "y": 225.00000095367432, + "z": "ccd0c7cf.3cb8d8", + "wires": [ + [] + ] + }, + { + "id": "49b38240.460c6c", + "type": "call", + "name": "call sdwan-get-tenant-auth", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 1237, + "y": 637, + "z": "ccd0c7cf.3cb8d8", + "wires": [ + [] + ] + }, + { + "id": "9ccdb4e3.7037b8", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 1545, + "y": 762, + "z": "ccd0c7cf.3cb8d8", + "wires": [ + [ + "b8677116.110c6" + ] + ] + }, + { + "id": "b8677116.110c6", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "comments": "", + "outputs": 1, + "x": 1701, + "y": 762, + "z": "ccd0c7cf.3cb8d8", + "wires": [ + [] + ] + }, + { + "id": "542d6497.1e051c", + "type": "other", + "name": "other", + "xml": "<outcome value='Other'>\n", + "comments": "", + "outputs": 1, + "x": 1545, + "y": 811, + "z": "ccd0c7cf.3cb8d8", + "wires": [ + [ + "e1c3f88e.80fd88" + ] + ] + }, + { + "id": "e1c3f88e.80fd88", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "comments": "", + "outputs": 1, + "x": 1723, + "y": 808, + "z": "ccd0c7cf.3cb8d8", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json index 200f80ed..b785bc4a 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json @@ -1,20 +1,20 @@ [ { - "id": "5133686c.68eb98", + "id": "c96eae79.08813", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 103.01040649414062, - "y": 42.010414123535156, - "z": "3425547d.b4704c", + "x": 100, + "y": 40, + "z": "307cdf1d.539fd", "wires": [ [ - "496791b5.8488d" + "2bbd4a2b.66a236" ] ] }, { - "id": "496791b5.8488d", + "id": "2bbd4a2b.66a236", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1284 +22,1299 @@ "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": 315.0104103088379, - "y": 114.01043128967285, - "z": "3425547d.b4704c", + "x": 275.00000381469727, + "y": 112.0000171661377, + "z": "307cdf1d.539fd", "wires": [ [ - "177388c0.d59117" + "7de06dac.f33994" ] ] }, { - "id": "177388c0.d59117", + "id": "7de06dac.f33994", "type": "method", "name": "sotn-attachment-topology-operation-create", "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 303.0105285644531, - "y": 202.01041412353516, - "z": "3425547d.b4704c", + "x": 263.0001220703125, + "y": 200, + "z": "307cdf1d.539fd", "wires": [ [ - "f8d7365b.409c58" + "8a29d369.0bab4" ] ] }, { - "id": "f8d7365b.409c58", + "id": "8a29d369.0bab4", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 223.01045989990234, - "y": 951.0106620788574, - "z": "3425547d.b4704c", + "x": 183.00005340576172, + "y": 949.0002479553223, + "z": "307cdf1d.539fd", "wires": [ [ - "9bdb10c1.b2c65", - "64a58452.ad453c", - "e271b8d5.7f00e8", - "1b3c993d.53c997", - "e93d7aa8.8afc58", - "52397993.71f7e8", - "e6318980.74cd38", - "461a26ad.352d08", - "99015db4.34427", - "302473e7.2159bc", - "8e35b842.c7d4f8", - "88bfb367.64d03", - "373e7d85.f8d5f2", - "ab686f72.f6d24", - "6568c68e.998458", - "42759b0d.8bfff4", - "7bc569ba.c7c2a8", - "aee1a7c1.04af88", - "c3e71ac5.708158", - "8031bd9b.aa492", - "b0b78151.f3bd1", - "13637009.f57bd", - "acf4df38.359e8" + "51f31211.8f114c", + "a2a65745.852438", + "f3044df1.6f232", + "5ba82df.f35b0d4", + "2da52da7.95c362", + "dc7e1c21.4599e", + "7bdd95f3.db24ac", + "371cf69b.dabcaa", + "c34405e1.82d938", + "46e15a07.ae9ba4", + "cd08d99a.10abb8", + "c56a158b.169088", + "3292b995.f13186", + "71214832.584f28", + "23b7a6d1.9a369a", + "4ebfff40.f0aa5", + "cb431e44.1b2d7", + "6c73a0d6.045f8", + "1f74500.b2f7fb", + "6d4b764b.a8a308", + "6e7b925f.51d77c", + "92f874df.f4a158", + "ea8d2a7c.dc1c98", + "5a956e5b.11a09" ] ] }, { - "id": "f392c1a2.4633e", + "id": "dceaac22.2856", "type": "comment", "name": "Set allotted resource id if not sent by SO", "info": "", "comments": "", - "x": 707.087158203125, - "y": 111.44433307647705, - "z": "3425547d.b4704c", + "x": 667.0767517089844, + "y": 109.4339189529419, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "9bdb10c1.b2c65", + "id": "51f31211.8f114c", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n", "comments": "", "outputs": 1, - "x": 653.0104370117188, - "y": 167.01040649414062, - "z": "3425547d.b4704c", + "x": 613.0000305175781, + "y": 164.99999237060547, + "z": "307cdf1d.539fd", "wires": [ [ - "61aacc9.ea6e934", - "1e985c69.1db8d4" + "5d06a5f3.384e7c", + "a9453642.a0afc8" ] ] }, { - "id": "61aacc9.ea6e934", + "id": "5d06a5f3.384e7c", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 851.0105247497559, - "y": 137.01039505004883, - "z": "3425547d.b4704c", + "x": 811.0001182556152, + "y": 134.99998092651367, + "z": "307cdf1d.539fd", "wires": [ [ - "89d751a9.4634e" + "b367b4cb.81eda8" ] ] }, { - "id": "1e985c69.1db8d4", + "id": "a9453642.a0afc8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 850.0104331970215, - "y": 174.0104055404663, - "z": "3425547d.b4704c", + "x": 810.0000267028809, + "y": 171.99999141693115, + "z": "307cdf1d.539fd", "wires": [ [ - "2d11e756.388fd8" + "b2cd00b8.57706" ] ] }, { - "id": "2d11e756.388fd8", + "id": "b2cd00b8.57706", "type": "set", "name": "set tmp.ar.allotted-resource-id", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n", "comments": "", - "x": 1048.0104217529297, - "y": 171.01042461395264, - "z": "3425547d.b4704c", + "x": 1008.0000152587891, + "y": 169.00001049041748, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "64a58452.ad453c", + "id": "a2a65745.852438", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 621.0103607177734, - "y": 388.01051330566406, - "z": "3425547d.b4704c", + "x": 580.9999542236328, + "y": 386.0000991821289, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "e271b8d5.7f00e8", + "id": "f3044df1.6f232", "type": "execute", "name": "execute Properties", "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": 621.2722778320312, - "y": 469.6771945953369, - "z": "3425547d.b4704c", + "x": 581.2618713378906, + "y": 467.66678047180176, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "1b3c993d.53c997", + "id": "5ba82df.f35b0d4", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 674.2723388671875, - "y": 556.6771125793457, - "z": "3425547d.b4704c", + "x": 634.2619323730469, + "y": 554.6666984558105, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "89d751a9.4634e", + "id": "b367b4cb.81eda8", "type": "execute", "name": "execute tmp.ar.allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n", "comments": "", "outputs": 1, - "x": 1066.0105018615723, - "y": 138.01040077209473, - "z": "3425547d.b4704c", + "x": 1026.0000953674316, + "y": 135.99998664855957, + "z": "307cdf1d.539fd", "wires": [ [ - "eb62b50e.452978" + "a3bb33e3.15368" ] ] }, { - "id": "eb62b50e.452978", + "id": "a3bb33e3.15368", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1284.0105438232422, - "y": 138.0103645324707, - "z": "3425547d.b4704c", + "x": 1244.0001373291016, + "y": 135.99995040893555, + "z": "307cdf1d.539fd", "wires": [ [ - "21e39486.41c95c" + "1a685e2d.8d4cc2" ] ] }, { - "id": "21e39486.41c95c", + "id": "1a685e2d.8d4cc2", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n", "comments": "", - "x": 1450.010498046875, - "y": 138.01037883758545, - "z": "3425547d.b4704c", + "x": 1410.0000915527344, + "y": 135.9999647140503, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "69607a16.ab23b4", + "id": "8b5477db.c5c9d8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1180.0106372833252, - "y": 628.7882852554321, - "z": "3425547d.b4704c", + "x": 1140.0002307891846, + "y": 626.777871131897, + "z": "307cdf1d.539fd", "wires": [ [ - "5509562b.e7bb48" + "5b1e701f.600c" ] ] }, { - "id": "ff29c66f.d0c078", + "id": "cc9f7f26.8914e", "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=\"Error: Existing connection attachment allotted resource\" />\n \n", "comments": "", - "x": 1913.529016494751, - "y": 629.8543567657471, - "z": "3425547d.b4704c", + "x": 1873.5186100006104, + "y": 627.8439426422119, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "988573f5.64b22", + "id": "65a2f2cb.5edd4c", "type": "comment", "name": "Check for non existence of allotted resource", "info": "", "comments": "", - "x": 1036.0105590820312, - "y": 562.7883520126343, - "z": "3425547d.b4704c", + "x": 996.0001525878906, + "y": 560.7779378890991, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "ae4a4ff0.de2", + "id": "2eaa291f.8f6b46", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1556.6771049499512, - "y": 773.0104644298553, - "z": "3425547d.b4704c", + "x": 1516.6666984558105, + "y": 771.0000503063202, + "z": "307cdf1d.539fd", "wires": [ [ - "79ba7554.7b000c" + "1bef4b2b.0d1235" ] ] }, { - "id": "52397993.71f7e8", + "id": "dc7e1c21.4599e", "type": "switchNode", "name": "switch service-data.consumed-allotted-resources_length", "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 738.6764297485352, - "y": 749.7244968414307, - "z": "3425547d.b4704c", + "x": 698.6660232543945, + "y": 747.7140827178955, + "z": "307cdf1d.539fd", "wires": [ [ - "ae3cba2c.22d388", - "70e9802d.1c53d" + "f0ad968c.edb0a8", + "6ec4508a.edb8" ] ] }, { - "id": "ae3cba2c.22d388", + "id": "f0ad968c.edb0a8", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1042.8193283081055, - "y": 718.5819339752197, - "z": "3425547d.b4704c", + "x": 1002.8089218139648, + "y": 716.5715198516846, + "z": "307cdf1d.539fd", "wires": [ [ - "b72b861c.815eb8" + "1bdd00e8.bfe58f" ] ] }, { - "id": "70e9802d.1c53d", + "id": "6ec4508a.edb8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1019.8193778991699, - "y": 779.5818891525269, - "z": "3425547d.b4704c", + "x": 979.8089714050293, + "y": 777.5714750289917, + "z": "307cdf1d.539fd", "wires": [ [ - "11ff47a3.643388" + "db245e97.27431" ] ] }, { - "id": "11ff47a3.643388", + "id": "db245e97.27431", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1179.9464683532715, - "y": 777.7078657150269, - "z": "3425547d.b4704c", + "x": 1139.9360618591309, + "y": 775.6974515914917, + "z": "307cdf1d.539fd", "wires": [ [ - "ae4a4ff0.de2", - "73e79a71.cfae24", - "c9aa1cc3.3ec63" + "2eaa291f.8f6b46", + "493dd1d2.fc196", + "23139ea3.633f22" ] ] }, { - "id": "b72b861c.815eb8", + "id": "1bdd00e8.bfe58f", "type": "set", "name": "set cidx", "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n", "comments": "", - "x": 1192.67631149292, - "y": 716.2959842681885, - "z": "3425547d.b4704c", + "x": 1152.6659049987793, + "y": 714.2855701446533, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "e6318980.74cd38", + "id": "7bdd95f3.db24ac", "type": "set", "name": "set consumed allotted resources", "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n", "comments": "", - "x": 667.5337219238281, - "y": 853.2960615158081, - "z": "3425547d.b4704c", + "x": 627.5233154296875, + "y": 851.285647392273, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "73e79a71.cfae24", + "id": "493dd1d2.fc196", "type": "switchNode", "name": "switch tmp.found-cidx", "xml": "<switch test='`$tmp.found-cidx`'>\n", "comments": "", "outputs": 1, - "x": 1369.0615158081055, - "y": 809.7193884849548, - "z": "3425547d.b4704c", + "x": 1329.0511093139648, + "y": 807.7089743614197, + "z": "307cdf1d.539fd", "wires": [ [ - "c00df3d6.a23ca" + "2ccff848.6a8838" ] ] }, { - "id": "c00df3d6.a23ca", + "id": "2ccff848.6a8838", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1559.0614700317383, - "y": 809.71932554245, - "z": "3425547d.b4704c", + "x": 1519.0510635375977, + "y": 807.7089114189148, + "z": "307cdf1d.539fd", "wires": [ [ - "210f1d5f.874d72" + "d5d85369.7e688" ] ] }, { - "id": "210f1d5f.874d72", + "id": "d5d85369.7e688", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1725.0614700317383, - "y": 809.71932554245, - "z": "3425547d.b4704c", + "x": 1685.0510635375977, + "y": 807.7089114189148, + "z": "307cdf1d.539fd", "wires": [ [ - "9f784ab7.a1a108" + "fa8e9142.85d7d" ] ] }, { - "id": "79ba7554.7b000c", + "id": "1bef4b2b.0d1235", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1973.7887344360352, - "y": 770.0104913711548, - "z": "3425547d.b4704c", + "x": 1933.7783279418945, + "y": 768.0000772476196, + "z": "307cdf1d.539fd", "wires": [ [ - "6f5753b3.9563cc" + "39a011f4.26c90e" ] ] }, { - "id": "6f5753b3.9563cc", + "id": "39a011f4.26c90e", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2155.5983085632324, - "y": 770.4749383926392, - "z": "3425547d.b4704c", + "x": 2115.587902069092, + "y": 768.464524269104, + "z": "307cdf1d.539fd", "wires": [ [ - "65ad78ab.417bb8" + "3bd67468.05082c" ] ] }, { - "id": "9f784ab7.a1a108", + "id": "fa8e9142.85d7d", "type": "set", "name": "set tmp.cidx", "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n", "comments": "", - "x": 1886.9348526000977, - "y": 809.2310266494751, - "z": "3425547d.b4704c", + "x": 1846.924446105957, + "y": 807.2206125259399, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "829f78ea.771c88", + "id": "45f09705.29f058", "type": "comment", "name": "Add to consumed service consumed-allotted-resources in mdsal", "info": "Prepare data and add to service-data", "comments": "", - "x": 759.6776428222656, - "y": 680.0104608535767, - "z": "3425547d.b4704c", + "x": 719.667236328125, + "y": 678.0000467300415, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "8b9e14b0.ee2668", + "id": "7472ca93.259114", "type": "comment", "name": "This set resource will be added to MDSAL by provider code", "info": "Below we add to service-data.consumed-allotted-resource at last index", "comments": "", - "x": 747.0105590820312, - "y": 818.788553237915, - "z": "3425547d.b4704c", + "x": 707.0001525878906, + "y": 816.7781391143799, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "13637009.f57bd", + "id": "ea8d2a7c.dc1c98", "type": "update", - "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n", + "name": "save AAI allotted-resource", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n", "comments": "", "outputs": 1, - "x": 652.7012557983398, - "y": 1868.5423040390015, - "z": "3425547d.b4704c", + "x": 612.6908721923828, + "y": 1866.5318479537964, + "z": "307cdf1d.539fd", "wires": [ [ - "2383f0f.fe77a1", - "1726f753.540739" + "951bf335.bca52", + "3aff12ef.b5135e" ] ] }, { - "id": "2383f0f.fe77a1", + "id": "951bf335.bca52", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 847.463191986084, - "y": 1859.4949054718018, - "z": "3425547d.b4704c", + "x": 807.4527854919434, + "y": 1857.4844913482666, + "z": "307cdf1d.539fd", "wires": [ [ - "bfb0685f.193b68" + "5683eb13.db5c34" ] ] }, { - "id": "bfb0685f.193b68", + "id": "5683eb13.db5c34", "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=\"AAI failed\" />\n", "comments": "", - "x": 1013.9870719909668, - "y": 1871.1139764785767, - "z": "3425547d.b4704c", + "x": 973.9766654968262, + "y": 1869.1035623550415, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "1726f753.540739", + "id": "3aff12ef.b5135e", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 854.558479309082, - "y": 1892.2568731307983, - "z": "3425547d.b4704c", + "x": 814.5480728149414, + "y": 1890.2464590072632, + "z": "307cdf1d.539fd", "wires": [ [ - "bfb0685f.193b68" + "5683eb13.db5c34" ] ] }, { - "id": "da5dd301.64278", + "id": "9b778367.8c46a", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 628.5108871459961, - "y": 1830.8442754745483, - "z": "3425547d.b4704c", + "x": 589.50048828125, + "y": 1809.8338623046875, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "d50db86.5001548", + "id": "9719bb6e.70a358", "type": "comment", "name": "Set allotted resource type if not sent by SO", "info": "", "comments": "", - "x": 693.0104064941406, - "y": 220.01041412353516, - "z": "3425547d.b4704c", + "x": 653, + "y": 218, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "e93d7aa8.8afc58", + "id": "2da52da7.95c362", "type": "switchNode", "name": "switch allotted-resource-type", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n", "comments": "", "outputs": 1, - "x": 654.9337158203125, - "y": 260.57647037506104, - "z": "3425547d.b4704c", + "x": 614.9233093261719, + "y": 258.5660562515259, + "z": "307cdf1d.539fd", "wires": [ [ - "f6469c6d.d6d7c", - "6b6259b5.f45218" + "684d8da4.b880e4", + "7ce6426e.522ebc" ] ] }, { - "id": "f6469c6d.d6d7c", + "id": "684d8da4.b880e4", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 857.9338684082031, - "y": 245.57647323608398, - "z": "3425547d.b4704c", + "x": 817.9234619140625, + "y": 243.56605911254883, + "z": "307cdf1d.539fd", "wires": [ [ - "9e957e4b.c63b4" + "63c4923.3c3426c" ] ] }, { - "id": "6b6259b5.f45218", + "id": "7ce6426e.522ebc", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 850.9336967468262, - "y": 285.57649326324463, - "z": "3425547d.b4704c", + "x": 810.9232902526855, + "y": 283.5660791397095, + "z": "307cdf1d.539fd", "wires": [ [ - "6a7aae3b.c248e" + "bca9b7c7.73b158" ] ] }, { - "id": "6a7aae3b.c248e", + "id": "bca9b7c7.73b158", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n", "comments": "", - "x": 1082.933681488037, - "y": 285.5764980316162, - "z": "3425547d.b4704c", + "x": 1042.9232749938965, + "y": 283.56608390808105, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "9d9d583f.dbc9c8", + "id": "4c5ae3e7.94b54c", "type": "comment", "name": "For storage in AAI connection-attachment-topology", "info": "", "comments": "", - "x": 718.010368347168, - "y": 355.01041412353516, - "z": "3425547d.b4704c", + "x": 677.9999618530273, + "y": 353, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "2787339d.0e091c", + "id": "566d8977.bdc218", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 693.0103530883789, - "y": 436.89932346343994, - "z": "3425547d.b4704c", + "x": 652.9999465942383, + "y": 434.8889093399048, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "da385e9d.31c6e", + "id": "eba557cf.66dec8", "type": "comment", "name": "Used for Put AR by id to MDSAL", "info": "", "comments": "", - "x": 659.0104370117188, - "y": 525.8993406295776, - "z": "3425547d.b4704c", + "x": 619.0000305175781, + "y": 523.8889265060425, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "fb746d4c.98d2e", + "id": "6d67020a.67de0c", "type": "comment", "name": "Obtain the last index in services", "info": "ServiceData is added by Provider code", "comments": "", - "x": 660.4548797607422, - "y": 711.8992853164673, - "z": "3425547d.b4704c", + "x": 620.4444732666016, + "y": 709.8888711929321, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "c3e71ac5.708158", + "id": "1f74500.b2f7fb", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 638.2785415649414, - "y": 1775.3696031570435, - "z": "3425547d.b4704c", + "x": 598.2681350708008, + "y": 1773.3591890335083, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "8031bd9b.aa492", + "id": "6d4b764b.a8a308", "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": 606.6916198730469, - "y": 1916.9853897094727, - "z": "3425547d.b4704c", + "x": 566.6812324523926, + "y": 1977.9749908447266, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "9e957e4b.c63b4", + "id": "63c4923.3c3426c", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n", "comments": "", - "x": 1097.010555267334, - "y": 246.0103998184204, - "z": "3425547d.b4704c", + "x": 1057.0001487731934, + "y": 243.99998569488525, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "31ce0f6c.4be64", + "id": "e855335b.71b3c", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 940.0045623779297, - "y": 1624.5041437149048, - "z": "3425547d.b4704c", + "x": 899.9941558837891, + "y": 1622.4937295913696, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "aee1a7c1.04af88", + "id": "6c73a0d6.045f8", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 689.0106735229492, - "y": 1709.0105323791504, - "z": "3425547d.b4704c", + "x": 649.0002670288086, + "y": 1707.0001182556152, + "z": "307cdf1d.539fd", "wires": [ [ - "8776bfe5.59d94", - "d7639202.15d54", - "3089b749.6674a8" + "17f1151d.06a5ab", + "ccace23a.27702", + "325329b.e9052d6" ] ] }, { - "id": "8776bfe5.59d94", + "id": "17f1151d.06a5ab", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 938.652027130127, - "y": 1747.3418626785278, - "z": "3425547d.b4704c", + "x": 898.6416206359863, + "y": 1745.3314485549927, + "z": "307cdf1d.539fd", "wires": [ [ - "7514cc17.dfede4" + "503ba1c3.ce81b" ] ] }, { - "id": "d7639202.15d54", + "id": "ccace23a.27702", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 929.6520767211914, - "y": 1715.8418884277344, - "z": "3425547d.b4704c", + "x": 889.6416702270508, + "y": 1713.8314743041992, + "z": "307cdf1d.539fd", "wires": [ [ - "7514cc17.dfede4" + "503ba1c3.ce81b" ] ] }, { - "id": "3089b749.6674a8", + "id": "325329b.e9052d6", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 933.4021148681641, - "y": 1686.1989933028817, - "z": "3425547d.b4704c", + "x": 893.3917083740234, + "y": 1684.1885791793466, + "z": "307cdf1d.539fd", "wires": [ [ - "e2b27745.660088" + "565609af.5fb058" ] ] }, { - "id": "7514cc17.dfede4", + "id": "503ba1c3.ce81b", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1099.402114868164, - "y": 1716.5919122695923, - "z": "3425547d.b4704c", + "x": 1059.3917083740234, + "y": 1714.5814981460571, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "e2b27745.660088", + "id": "565609af.5fb058", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1075.0580825805664, - "y": 1682.3911624923348, - "z": "3425547d.b4704c", + "x": 1035.0476760864258, + "y": 1680.3807483687997, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "8e35b842.c7d4f8", + "id": "cd08d99a.10abb8", "type": "execute", "name": "execute RestApiCallNode - Update parent provided service AR", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"parent\" />\n\n", "comments": "", "outputs": 1, - "x": 759.0103607177734, - "y": 1135.010579109192, - "z": "3425547d.b4704c", + "x": 718.9999542236328, + "y": 1133.0001649856567, + "z": "307cdf1d.539fd", "wires": [ [ - "4a784746.dec008", - "c64e1e39.2251", - "be9dd1f.2b8ae3" + "ef2f7f10.9941b", + "b03054a4.69fc18", + "8aa9a171.e089b" ] ] }, { - "id": "4a784746.dec008", + "id": "ef2f7f10.9941b", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1067.3184204101562, - "y": 1167.0088548660278, - "z": "3425547d.b4704c", + "x": 1027.3080139160156, + "y": 1164.9984407424927, + "z": "307cdf1d.539fd", "wires": [ [ - "fa176469.0fc3f8" + "65c0c4d1.41acbc" ] ] }, { - "id": "c64e1e39.2251", + "id": "b03054a4.69fc18", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1058.3184700012207, - "y": 1135.5088806152344, - "z": "3425547d.b4704c", + "x": 1018.3080635070801, + "y": 1133.4984664916992, + "z": "307cdf1d.539fd", "wires": [ [ - "fa176469.0fc3f8" + "65c0c4d1.41acbc" ] ] }, { - "id": "be9dd1f.2b8ae3", + "id": "8aa9a171.e089b", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1062.0685081481934, - "y": 1105.8659854903817, - "z": "3425547d.b4704c", + "x": 1022.0581016540527, + "y": 1103.8555713668466, + "z": "307cdf1d.539fd", "wires": [ [ - "a7887873.602db8" + "c70fcaaf.55a4c8" ] ] }, { - "id": "fa176469.0fc3f8", + "id": "65c0c4d1.41acbc", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1228.0685081481934, - "y": 1136.2589044570923, - "z": "3425547d.b4704c", + "x": 1188.0581016540527, + "y": 1134.2484903335571, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "a7887873.602db8", + "id": "c70fcaaf.55a4c8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1203.7244758605957, - "y": 1102.0581546798348, - "z": "3425547d.b4704c", + "x": 1163.714069366455, + "y": 1100.0477405562997, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "21d4e2e4.5ed5fe", + "id": "4609b233.9d833c", "type": "comment", "name": "Put the parent allotted resource in mdsal", "info": "", "comments": "", - "x": 688.0103073120117, - "y": 1097.010485649109, - "z": "3425547d.b4704c", + "x": 647.9999008178711, + "y": 1095.0000715255737, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "373e7d85.f8d5f2", + "id": "3292b995.f13186", "type": "set", "name": "set connection-attachment-ar-identifiers", "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n", "comments": "", - "x": 684.3674926757812, - "y": 1299.5821046829224, - "z": "3425547d.b4704c", + "x": 644.3570861816406, + "y": 1297.5716905593872, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "88bfb367.64d03", + "id": "c56a158b.169088", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />", "comments": "", - "x": 598.2242736816406, - "y": 1267.3914613723755, - "z": "3425547d.b4704c", + "x": 558.2138671875, + "y": 1265.3810472488403, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "ab686f72.f6d24", + "id": "71214832.584f28", "type": "set", "name": "set identifiers in overall structure", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n", "comments": "", - "x": 663.1772918701172, - "y": 1333.6772899627686, - "z": "3425547d.b4704c", + "x": 623.1668853759766, + "y": 1331.6668758392334, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "6568c68e.998458", + "id": "23b7a6d1.9a369a", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 615.5101318359375, - "y": 1407.010817527771, - "z": "3425547d.b4704c", + "x": 575.4997253417969, + "y": 1405.0004034042358, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "42759b0d.8bfff4", + "id": "4ebfff40.f0aa5", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 666.4971694946289, - "y": 1462.9620504379272, - "z": "3425547d.b4704c", + "x": 626.4867630004883, + "y": 1460.951636314392, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "7bc569ba.c7c2a8", + "id": "cb431e44.1b2d7", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 611.065788269043, - "y": 1368.5661754608154, - "z": "3425547d.b4704c", + "x": 571.0553817749023, + "y": 1366.5557613372803, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "5eda0baa.a6ac24", + "id": "10171c26.195644", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 728.3992767333984, - "y": 1233.5660219192505, - "z": "3425547d.b4704c", + "x": 688.3888702392578, + "y": 1231.5556077957153, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "302473e7.2159bc", + "id": "46e15a07.ae9ba4", "type": "execute", "name": "generate parent-ar url - replace allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 723.5104217529297, - "y": 1061.0104246139526, - "z": "3425547d.b4704c", + "x": 683.5000152587891, + "y": 1059.0000104904175, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "99015db4.34427", + "id": "c34405e1.82d938", "type": "execute", "name": "generate parent-ar url - replace service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 719.5103454589844, - "y": 1018.0105609893799, - "z": "3425547d.b4704c", + "x": 679.4999389648438, + "y": 1016.0001468658447, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "ac4fa77d.cd6878", + "id": "a521acad.d004d", "type": "comment", "name": "Prepare Parent AR URL", "info": "Preparation to set provided-allotted-resource in parent service instance", "comments": "", - "x": 637.5108032226562, - "y": 947.0105142593384, - "z": "3425547d.b4704c", + "x": 597.5003967285156, + "y": 945.0001001358032, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "461a26ad.352d08", + "id": "371cf69b.dabcaa", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 676.5105972290039, - "y": 980.5104537010193, - "z": "3425547d.b4704c", + "x": 636.5001907348633, + "y": 978.5000395774841, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "fc5e8c6b.8fefa", + "id": "471a396d.b72ac8", "type": "comment", "name": "Required for filling template values", "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters", "comments": "", - "x": 866.0107650756836, - "y": 1587.5102167129517, - "z": "3425547d.b4704c", + "x": 826.000358581543, + "y": 1585.4998025894165, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "65ad78ab.417bb8", + "id": "3bd67468.05082c", "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=\"Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n", "comments": "", - "x": 2233.767379760742, - "y": 818.6562433242798, - "z": "3425547d.b4704c", + "x": 2193.7569732666016, + "y": 816.6458292007446, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "c9aa1cc3.3ec63", + "id": "23139ea3.633f22", "type": "set", "name": "set tmp.found-cidx", "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n", "comments": "", - "x": 1359.656551361084, - "y": 730.3229863643646, - "z": "3425547d.b4704c", + "x": 1319.6461448669434, + "y": 728.3125722408295, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "ff67ccb2.50d8", + "id": "572750a4.da966", "type": "comment", "name": "Add to parent services provided-allotted-resources in mdsal", "info": "", "comments": "", - "x": 748.2119140625, - "y": 914.989670753479, - "z": "3425547d.b4704c", + "x": 708.2015075683594, + "y": 912.9792566299438, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "a5a8871f.3c0658", + "id": "c22af7ab.9a1898", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 668.9791030883789, - "y": 1200.9793510437012, - "z": "3425547d.b4704c", + "x": 628.9686965942383, + "y": 1198.968936920166, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "5509562b.e7bb48", + "id": "5b1e701f.600c", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1342.0104579925537, - "y": 628.2881746292114, - "z": "3425547d.b4704c", + "x": 1302.000051498413, + "y": 626.2777605056763, + "z": "307cdf1d.539fd", "wires": [ [ - "f6f2507e.ba037" + "f33fd165.6af9d" ] ] }, { - "id": "f6f2507e.ba037", + "id": "f33fd165.6af9d", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1529.8678379058838, - "y": 628.9073100090027, - "z": "3425547d.b4704c", + "x": 1489.8574314117432, + "y": 626.8968958854675, + "z": "307cdf1d.539fd", "wires": [ [ - "7ebe7287.439dec" + "30bd1249.6e0cce" ] ] }, { - "id": "7ebe7287.439dec", + "id": "30bd1249.6e0cce", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1729.2009601593018, - "y": 628.9073886871338, - "z": "3425547d.b4704c", + "x": 1689.1905536651611, + "y": 626.8969745635986, + "z": "307cdf1d.539fd", "wires": [ [ - "ff29c66f.d0c078" + "cc9f7f26.8914e" ] ] }, { - "id": "b0b78151.f3bd1", + "id": "6e7b925f.51d77c", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 814.0104598999023, - "y": 623.0104503631592, - "z": "3425547d.b4704c", + "x": 774.0000534057617, + "y": 621.000036239624, + "z": "307cdf1d.539fd", "wires": [ [ - "69607a16.ab23b4", - "4afffe17.752bc" + "8b5477db.c5c9d8", + "94a8a58d.dee408" ] ] }, { - "id": "4afffe17.752bc", + "id": "94a8a58d.dee408", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1182.0104904174805, - "y": 593.0104484558105, - "z": "3425547d.b4704c", + "x": 1142.0000839233398, + "y": 591.0000343322754, + "z": "307cdf1d.539fd", "wires": [ [ - "5d7e4f7b.5aaa4" + "9c37a2ea.b7b0a" ] ] }, { - "id": "5d7e4f7b.5aaa4", + "id": "9c37a2ea.b7b0a", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1334.0104904174805, - "y": 592.0104484558105, - "z": "3425547d.b4704c", + "x": 1294.0000839233398, + "y": 590.0000343322754, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "acf4df38.359e8", + "id": "92f874df.f4a158", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 610.5660171508789, - "y": 1542.6770677566528, - "z": "3425547d.b4704c", + "x": 570.5556106567383, + "y": 1540.6666536331177, + "z": "307cdf1d.539fd", "wires": [ [ - "e883ed0e.70e5", - "31ce0f6c.4be64" + "53c527c9.b22648", + "e855335b.71b3c" ] ] }, { - "id": "e883ed0e.70e5", + "id": "53c527c9.b22648", "type": "for", "name": "for each sotn-get-request-input-param", "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n", "comments": "", "outputs": 1, - "x": 880.5660820007324, - "y": 1542.6771154403687, - "z": "3425547d.b4704c", + "x": 840.5556755065918, + "y": 1540.6667013168335, + "z": "307cdf1d.539fd", "wires": [ [ - "c8bff3cc.09d2c" + "261e5f2.fe442a" ] ] }, { - "id": "8e066326.71f27", + "id": "d5857a39.639db8", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1420.5658645629883, - "y": 1498.6771488189697, - "z": "3425547d.b4704c", + "x": 1380.5554580688477, + "y": 1496.6667346954346, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "a6906228.fcd97", + "id": "6df2fba8.889c14", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1378.6005325317383, - "y": 1533.65629196167, - "z": "3425547d.b4704c", + "x": 1338.5901260375977, + "y": 1531.6458778381348, + "z": "307cdf1d.539fd", "wires": [ [] ] }, { - "id": "d3547289.18d19", + "id": "bd5f9072.2a8a7", "type": "set", "name": "set parameterName", - "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", + "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1349.0450592041016, - "y": 1566.65629196167, - "z": "3425547d.b4704c", + "x": 1309.034652709961, + "y": 1564.6458778381348, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "80d52421.de6378", + "id": "4a2aa60e.ed5c08", "type": "comment", "name": "Remove VNFC prefix", "info": "", "comments": "", - "x": 821.5660095214844, - "y": 1510.1214294433594, - "z": "3425547d.b4704c", + "x": 781.5556030273438, + "y": 1508.1110153198242, + "z": "307cdf1d.539fd", "wires": [] }, { - "id": "c8bff3cc.09d2c", + "id": "261e5f2.fe442a", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1127.56591796875, - "y": 1541.1214599609375, - "z": "3425547d.b4704c", + "x": 1087.5555114746094, + "y": 1539.1110458374023, + "z": "307cdf1d.539fd", "wires": [ [ - "a6906228.fcd97", - "d3547289.18d19" + "6df2fba8.889c14", + "bd5f9072.2a8a7" ] ] + }, + { + "id": "5a956e5b.11a09", + "type": "save", + "name": "save srcLTP relationship in AAI", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 619.0039329528809, + "y": 1925.0039825439453, + "z": "307cdf1d.539fd", + "wires": [ + [] + ] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json index 17d40546..a0bd528a 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json @@ -1,20 +1,20 @@ [ { - "id": "b54f27ef.5db9a8", + "id": "4cfb64e6.6e881c", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 76.00390625, - "y": 37.00390625, - "z": "4ec136ff.390af8", + "x": 94, + "y": 32, + "z": "c671301.759d0d", "wires": [ [ - "73825793.639008" + "12c465a6.56166a" ] ] }, { - "id": "73825793.639008", + "id": "12c465a6.56166a", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1863 +22,1924 @@ "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": 288.00391006469727, - "y": 109.0039234161377, - "z": "4ec136ff.390af8", + "x": 275.00000381469727, + "y": 92.0000171661377, + "z": "c671301.759d0d", "wires": [ [ - "91a3b40f.a091b8" + "2a9804fb.335a2c" ] ] }, { - "id": "91a3b40f.a091b8", + "id": "2a9804fb.335a2c", "type": "method", "name": "sotn-attachment-topology-operation-deactivate", "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 276.0040283203125, - "y": 197.00390625, - "z": "4ec136ff.390af8", + "x": 263.0001220703125, + "y": 180, + "z": "c671301.759d0d", "wires": [ [ - "8b49cdb4.0b003" + "8ef7baf0.8ab7b8" ] ] }, { - "id": "8b49cdb4.0b003", + "id": "8ef7baf0.8ab7b8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 292.0040283203125, - "y": 752.0041508674622, - "z": "4ec136ff.390af8", + "x": 279.0001220703125, + "y": 735.0002446174622, + "z": "c671301.759d0d", "wires": [ [ - "c083b508.69c318", - "520006f2.b2e4d8", - "70bf29a.577bcd8", - "648ef4ed.e1062c", - "8e15ef85.af876", - "7cd467cc.f359b8", - "4ca01b12.aeeae4", - "6963b7ed.1ac188", - "2a2a1345.d7f2ec", - "5c89f183.d2653", - "f1e26abf.1dc9f8", - "25f9e140.e4210e", - "1507ea99.aa8315", - "3a95a888.e92908", - "dd09565b.b81778", - "60ba1f59.42707", - "bf1b5f9f.275aa", - "ff509458.45f008", - "980e2d4b.7e472", - "372ff043.61187" + "7071662b.7233c8", + "3ad2f841.5f9c18", + "e4bfecd2.3089e", + "8d649aff.9610f8", + "76bb0e72.4c9e6", + "cfcc4cd.498b3b", + "d2afdfc8.3d49c", + "ff0d92e9.55c77", + "db753550.5e2778", + "6873bae7.8cf8e4", + "7a073085.0e81c", + "6fa8d61c.7e4378", + "39d4dd71.5f1112", + "d845a062.e24db", + "9b7849da.439398", + "5b4906aa.434008", + "485e569f.2b52d8", + "417e0490.1d34dc", + "d67f9f52.31c1f", + "2a0b728c.4f365e" ] ] }, { - "id": "c083b508.69c318", + "id": "7071662b.7233c8", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 688.9974670410156, - "y": 150.9973931312561, - "z": "4ec136ff.390af8", + "x": 675.9935607910156, + "y": 133.9934868812561, + "z": "c671301.759d0d", "wires": [] }, { - "id": "8cf7665f.0ad548", + "id": "f3d4b61.bd26248", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 717.9577789306641, - "y": 115.02918910980225, - "z": "4ec136ff.390af8", + "x": 704.9538726806641, + "y": 98.02528285980225, + "z": "c671301.759d0d", "wires": [] }, { - "id": "520006f2.b2e4d8", + "id": "3ad2f841.5f9c18", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 642.9974060058594, - "y": 243.99739837646484, - "z": "4ec136ff.390af8", + "x": 629.9934997558594, + "y": 226.99349212646484, + "z": "c671301.759d0d", "wires": [] }, { - "id": "8e15ef85.af876", + "id": "76bb0e72.4c9e6", "type": "execute", "name": "execute Properties", "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": 649.2592964172363, - "y": 331.6641273498535, - "z": "4ec136ff.390af8", + "x": 636.2553901672363, + "y": 314.6602210998535, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "70bf29a.577bcd8", + "id": "e4bfecd2.3089e", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 699.2593994140625, - "y": 418.66412830352783, - "z": "4ec136ff.390af8", + "x": 686.2554931640625, + "y": 401.66022205352783, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "f4f0e304.bbd67", + "id": "12a5d929.d1ab27", "type": "comment", "name": "GET connection-attachment-allotted-resource from mdsal", "info": "", "comments": "", - "x": 742.8123931884766, - "y": 489.54267501831055, - "z": "4ec136ff.390af8", + "x": 729.8084869384766, + "y": 472.53876876831055, + "z": "c671301.759d0d", "wires": [] }, { - "id": "3183ed7f.7cdf82", + "id": "d0fe36b8.253ae8", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 696.9974365234375, - "y": 210.997407913208, - "z": "4ec136ff.390af8", + "x": 683.9935302734375, + "y": 193.993501663208, + "z": "c671301.759d0d", "wires": [] }, { - "id": "61fa78e8.e88928", + "id": "b80d794b.4e9278", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 714.9974021911621, - "y": 296.8862886428833, - "z": "4ec136ff.390af8", + "x": 701.9934959411621, + "y": 279.8823823928833, + "z": "c671301.759d0d", "wires": [] }, { - "id": "e460b896.d8ce98", + "id": "cbbc01c9.a6bad", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 740.9974212646484, - "y": 383.8862476348877, - "z": "4ec136ff.390af8", + "x": 727.9935150146484, + "y": 366.8823413848877, + "z": "c671301.759d0d", "wires": [] }, { - "id": "f65756e0.dd7818", + "id": "dd903f73.c503a", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1183.6707344055176, - "y": 537.0039348602295, - "z": "4ec136ff.390af8", + "x": 1170.6668281555176, + "y": 520.0000286102295, + "z": "c671301.759d0d", "wires": [ [ - "4dc0f774.40c9e8" + "a2e7e6e6.009bb8" ] ] }, { - "id": "4dc0f774.40c9e8", + "id": "a2e7e6e6.009bb8", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1352.6707382202148, - "y": 535.5038356781006, - "z": "4ec136ff.390af8", + "x": 1339.6668319702148, + "y": 518.4999294281006, + "z": "c671301.759d0d", "wires": [ [ - "a07cda93.450c08" + "40901b07.2b8a34" ] ] }, { - "id": "a07cda93.450c08", + "id": "40901b07.2b8a34", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1525.5280075073242, - "y": 473.12299823760986, - "z": "4ec136ff.390af8", + "x": 1512.5241012573242, + "y": 456.11909198760986, + "z": "c671301.759d0d", "wires": [ [ - "22ec9ce0.2f5dd4", - "f2f6c092.18725" + "ff35eb42.56bb08", + "269f23f1.ccbfdc" ] ] }, { - "id": "22ec9ce0.2f5dd4", + "id": "ff35eb42.56bb08", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1762.8612518310547, - "y": 451.1229486465454, - "z": "4ec136ff.390af8", + "x": 1749.8573455810547, + "y": 434.1190423965454, + "z": "c671301.759d0d", "wires": [ [ - "9d16e841.df5298" + "51f5ccd7.88acc4" ] ] }, { - "id": "9d16e841.df5298", + "id": "51f5ccd7.88acc4", "type": "block", "name": "block: atomic", "xml": "<block atomic='true'>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1947.3851413726807, - "y": 448.02778244018555, - "z": "4ec136ff.390af8", + "x": 1934.3812351226807, + "y": 431.02387619018555, + "z": "c671301.759d0d", "wires": [ [ - "3e7b6049.99c1f", - "76484c5f.5d8d34", - "659367d9.de17c8" + "6cd3d1da.71f58", + "b9e7534b.5d3c7", + "69d088e.2321178" ] ] }, { - "id": "15003538.c9037b", + "id": "608eef9f.ff52c", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1871.5229835510254, - "y": 573.0700235366821, - "z": "4ec136ff.390af8", + "x": 1858.5190773010254, + "y": 556.0661172866821, + "z": "c671301.759d0d", "wires": [] }, { - "id": "1584b53e.263d2b", + "id": "5569926e.6ec77c", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1175.5225372314453, - "y": 572.0700197219849, - "z": "4ec136ff.390af8", + "x": 1162.5186309814453, + "y": 555.0661134719849, + "z": "c671301.759d0d", "wires": [ [ - "cfb38062.240c9" + "8fd3c2e7.8c13" ] ] }, { - "id": "cfb38062.240c9", + "id": "8fd3c2e7.8c13", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1355.5224876403809, - "y": 572.7365703582764, - "z": "4ec136ff.390af8", + "x": 1342.5185813903809, + "y": 555.7326641082764, + "z": "c671301.759d0d", "wires": [ [ - "15003538.c9037b" + "608eef9f.ff52c" ] ] }, { - "id": "f2f6c092.18725", + "id": "269f23f1.ccbfdc", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1751.1892051696777, - "y": 488.4033088684082, - "z": "4ec136ff.390af8", + "x": 1738.1852989196777, + "y": 471.3994026184082, + "z": "c671301.759d0d", "wires": [ [ - "15003538.c9037b" + "608eef9f.ff52c" ] ] }, { - "id": "3e7b6049.99c1f", + "id": "6cd3d1da.71f58", "type": "set", "name": "set connection-attachment-ar from get", "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n", "comments": "", - "x": 2193.448699951172, - "y": 408.0040121078491, - "z": "4ec136ff.390af8", + "x": 2180.444793701172, + "y": 391.0001058578491, + "z": "c671301.759d0d", "wires": [] }, { - "id": "659367d9.de17c8", + "id": "69d088e.2321178", "type": "set", "name": "set oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments": "", - "x": 2126.4486961364746, - "y": 498.43256664276123, - "z": "4ec136ff.390af8", + "x": 2113.4447898864746, + "y": 481.42866039276123, + "z": "c671301.759d0d", "wires": [] }, { - "id": "76484c5f.5d8d34", + "id": "b9e7534b.5d3c7", "type": "switchNode", "name": "switch order-status", "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 2137.448532104492, - "y": 452.0040159225464, - "z": "4ec136ff.390af8", + "x": 2124.444625854492, + "y": 435.0001096725464, + "z": "c671301.759d0d", "wires": [ [ - "731472d3.90aa5c", - "76bb9af5.092564" + "e31f34a6.200f98", + "4be6cb8d.440694" ] ] }, { - "id": "731472d3.90aa5c", + "id": "e31f34a6.200f98", "type": "outcome", "name": "outcome Active", "xml": "<outcome value='Active'>\n", "comments": "", "outputs": 1, - "x": 2344.048480987549, - "y": 442.0040159225464, - "z": "4ec136ff.390af8", + "x": 2331.044574737549, + "y": 425.0001096725464, + "z": "c671301.759d0d", "wires": [ [ - "e2186fc5.ee965" + "3c41da84.a11fe6" ] ] }, { - "id": "76bb9af5.092564", + "id": "4be6cb8d.440694", "type": "outcome", "name": "outcome Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2343.7630004882812, - "y": 484.4326066970825, - "z": "4ec136ff.390af8", + "x": 2330.7590942382812, + "y": 467.4287004470825, + "z": "c671301.759d0d", "wires": [ [ - "c14114c.2df93e8" + "4f30d53e.7d564c" ] ] }, { - "id": "e2186fc5.ee965", + "id": "3c41da84.a11fe6", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2496.5190353393555, - "y": 440.3796663284302, - "z": "4ec136ff.390af8", + "x": 2483.5151290893555, + "y": 423.3757600784302, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "c14114c.2df93e8", + "id": "4f30d53e.7d564c", "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\" \n value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n", "comments": "", - "x": 2516.6708908081055, - "y": 481.004017829895, - "z": "4ec136ff.390af8", + "x": 2503.6669845581055, + "y": 464.000111579895, + "z": "c671301.759d0d", "wires": [] }, { - "id": "71b7df96.cf2fe", + "id": "b70a2f75.befcc", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 904.3070220947266, - "y": 633.4974970817566, - "z": "4ec136ff.390af8", + "x": 891.3031158447266, + "y": 616.4935908317566, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "7cd467cc.f359b8", + "id": "cfcc4cd.498b3b", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 601.3131866455078, - "y": 634.5038452148438, - "z": "4ec136ff.390af8", + "x": 588.3092803955078, + "y": 617.4999389648438, + "z": "c671301.759d0d", "wires": [ [ - "71b7df96.cf2fe" + "b70a2f75.befcc" ] ] }, { - "id": "e0dac461.755818", + "id": "11cd074.969d5f9", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 783.0043487548828, - "y": 695.5356044769287, - "z": "4ec136ff.390af8", + "x": 770.0004425048828, + "y": 678.5316982269287, + "z": "c671301.759d0d", "wires": [] }, { - "id": "6358d403.359d6c", + "id": "9f5cf8a1.eb07d8", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1673.1889038085938, - "y": 899.0079889297485, - "z": "4ec136ff.390af8", + "x": 1660.1849975585938, + "y": 882.0040826797485, + "z": "c671301.759d0d", "wires": [ [ - "48ab36b2.10b5c8" + "60ecfe73.436f5" ] ] }, { - "id": "e3f9ceb3.fcc12", + "id": "99b7fbfe.94a448", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1079.3308753967285, - "y": 1031.5794496536255, - "z": "4ec136ff.390af8", + "x": 1066.3269691467285, + "y": 1014.5755434036255, + "z": "c671301.759d0d", "wires": [ [ - "6bf2a454.b0478c" + "6439feba.07b8e" ] ] }, { - "id": "879c81fc.e34a9", + "id": "bdbde57e.1f4d78", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1270.4582767486572, - "y": 896.7054774537683, - "z": "4ec136ff.390af8", + "x": 1257.4543704986572, + "y": 879.7015712037683, + "z": "c671301.759d0d", "wires": [ [ - "6358d403.359d6c" + "9f5cf8a1.eb07d8" ] ] }, { - "id": "48ab36b2.10b5c8", + "id": "60ecfe73.436f5", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2108.300304412842, - "y": 899.0078859329224, - "z": "4ec136ff.390af8", + "x": 2095.296398162842, + "y": 882.0039796829224, + "z": "c671301.759d0d", "wires": [ [ - "ca0f68e.fe64c98", - "9210d9d0.b73bc8" + "1a655308.b661fd", + "be68f27f.28bd6" ] ] }, { - "id": "ca0f68e.fe64c98", + "id": "1a655308.b661fd", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2317.110652923584, - "y": 879.4723424911499, - "z": "4ec136ff.390af8", + "x": 2304.106746673584, + "y": 862.4684362411499, + "z": "c671301.759d0d", "wires": [ [ - "bd0a6759.014208" + "9a95bbc4.4906f8" ] ] }, { - "id": "5b20e51b.570d9c", + "id": "b3792237.47167", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2465.871406555176, - "y": 915.3295240402222, - "z": "4ec136ff.390af8", + "x": 2452.867500305176, + "y": 898.3256177902222, + "z": "c671301.759d0d", "wires": [ [ - "6fdc71ce.76ec1" + "5c963186.53d88" ] ] }, { - "id": "6fdc71ce.76ec1", + "id": "5c963186.53d88", "type": "set", "name": "set tmp.pidx and ptx.consumed-ar", "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />", "comments": "", - "x": 2700.728843688965, - "y": 913.9010553359985, - "z": "4ec136ff.390af8", + "x": 2687.724937438965, + "y": 896.8971490859985, + "z": "c671301.759d0d", "wires": [] }, { - "id": "645720a8.c9b45", + "id": "bd64de18.15892", "type": "comment", "name": "Check existence of other AR in parent service data", "info": "Check if other allotted resource is available.", "comments": "", - "x": 706.9667510986328, - "y": 865.8968267440796, - "z": "4ec136ff.390af8", + "x": 693.9628448486328, + "y": 848.8929204940796, + "z": "c671301.759d0d", "wires": [] }, { - "id": "a518915c.e4ec5", + "id": "7e8c22a4.61fc8c", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1089.9832229614258, - "y": 966.681170463562, - "z": "4ec136ff.390af8", + "x": 1076.9793167114258, + "y": 949.677264213562, + "z": "c671301.759d0d", "wires": [ [ - "613ca19d.9a54f" + "c4a79f00.128a8" ] ] }, { - "id": "6bf2a454.b0478c", + "id": "6439feba.07b8e", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1251.9832191467285, - "y": 1030.681191444397, - "z": "4ec136ff.390af8", + "x": 1238.9793128967285, + "y": 1013.677285194397, + "z": "c671301.759d0d", "wires": [] }, { - "id": "525b4334.32e11c", + "id": "2061f78c.10bc08", "type": "other", "name": "outcome 2", "xml": "<outcome value='2'>\n", "comments": "", "outputs": 1, - "x": 1095.9832973480225, - "y": 897.6811778321862, - "z": "4ec136ff.390af8", + "x": 1082.9793910980225, + "y": 880.6772715821862, + "z": "c671301.759d0d", "wires": [ [ - "879c81fc.e34a9" + "bdbde57e.1f4d78" ] ] }, { - "id": "bd0a6759.014208", + "id": "9a95bbc4.4906f8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2446.094711303711, - "y": 874.6810827255249, - "z": "4ec136ff.390af8", + "x": 2433.090805053711, + "y": 857.6771764755249, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "9210d9d0.b73bc8", + "id": "be68f27f.28bd6", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 2317.0947036743164, - "y": 913.6810865402222, - "z": "4ec136ff.390af8", + "x": 2304.0907974243164, + "y": 896.6771802902222, + "z": "c671301.759d0d", "wires": [ [ - "5b20e51b.570d9c" + "b3792237.47167" ] ] }, { - "id": "1306b994.c05466", + "id": "de57d171.2f008", "type": "switchNode", "name": "switch mdsal-psd.networks_length", "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n", "comments": "", "outputs": 1, - "x": 1502.3169021606445, - "y": 969.9036674499512, - "z": "4ec136ff.390af8", + "x": 1489.3129959106445, + "y": 952.8997611999512, + "z": "c671301.759d0d", "wires": [ [ - "bcbc6710.4989d8", - "4a1544ae.b670bc" + "2dedf29c.7f1aee", + "754f989d.208718" ] ] }, { - "id": "4a1544ae.b670bc", + "id": "754f989d.208718", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1732.3169250488281, - "y": 945.7924995422363, - "z": "4ec136ff.390af8", + "x": 1719.3130187988281, + "y": 928.7885932922363, + "z": "c671301.759d0d", "wires": [ [ - "dd72a26.9ccfe6" + "55c6b97a.4d77c8" ] ] }, { - "id": "bcbc6710.4989d8", + "id": "2dedf29c.7f1aee", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1726.3170471191406, - "y": 1005.7924995422363, - "z": "4ec136ff.390af8", + "x": 1713.3131408691406, + "y": 988.7885932922363, + "z": "c671301.759d0d", "wires": [ [ - "a79d34a4.7a5eb8" + "f186a46c.9bf998" ] ] }, { - "id": "a79d34a4.7a5eb8", + "id": "f186a46c.9bf998", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n \n", "comments": "", - "x": 1898.9694328308105, - "y": 1005.8943061828613, - "z": "4ec136ff.390af8", + "x": 1885.9655265808105, + "y": 988.8903999328613, + "z": "c671301.759d0d", "wires": [] }, { - "id": "4762bac5.0337d4", + "id": "30d37efb.acb512", "type": "set", "name": "set tmp.network.", "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n", "comments": "", - "x": 2100.761848449707, - "y": 935.7926588058472, - "z": "4ec136ff.390af8", + "x": 2087.757942199707, + "y": 918.7887525558472, + "z": "c671301.759d0d", "wires": [] }, { - "id": "613ca19d.9a54f", + "id": "c4a79f00.128a8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1262.427577972412, - "y": 967.7924184799194, - "z": "4ec136ff.390af8", + "x": 1249.423671722412, + "y": 950.7885122299194, + "z": "c671301.759d0d", "wires": [ [ - "1306b994.c05466" + "de57d171.2f008" ] ] }, { - "id": "dd72a26.9ccfe6", + "id": "55c6b97a.4d77c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1900.094596862793, - "y": 964.7923336029053, - "z": "4ec136ff.390af8", + "x": 1887.090690612793, + "y": 947.7884273529053, + "z": "c671301.759d0d", "wires": [ [ - "4762bac5.0337d4", - "da4b8e5c.bc1b9" + "30d37efb.acb512", + "71f1a549.c26fcc" ] ] }, { - "id": "da4b8e5c.bc1b9", + "id": "71f1a549.c26fcc", "type": "for", "name": "for nidx..tmp.network.network-data.network-request-input.network...[]", "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >", "comments": "", "outputs": 1, - "x": 2276.09521484375, - "y": 1007.7923412322998, - "z": "4ec136ff.390af8", + "x": 2263.09130859375, + "y": 990.7884349822998, + "z": "c671301.759d0d", "wires": [ [ - "ff7a40b2.21a91" + "7875ac99.845f44" ] ] }, { - "id": "ff7a40b2.21a91", + "id": "7875ac99.845f44", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2599.6508750915527, - "y": 1008.7924184799194, - "z": "4ec136ff.390af8", + "x": 2586.6469688415527, + "y": 991.7885122299194, + "z": "c671301.759d0d", "wires": [ [ - "ffa1f84e.980b68", - "b00db02b.eb8b6" + "e81ff7c1.f7c6b8", + "bdffba6f.6b28d8" ] ] }, { - "id": "ffa1f84e.980b68", + "id": "e81ff7c1.f7c6b8", "type": "switchNode", "name": "switch access-node-id", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">", "comments": "", "outputs": 1, - "x": 2778.1609802246094, - "y": 992.8028364181519, - "z": "4ec136ff.390af8", + "x": 2765.1570739746094, + "y": 975.7989301681519, + "z": "c671301.759d0d", "wires": [ [ - "3081e79b.edd628" + "e7b692af.0dd02" ] ] }, { - "id": "3081e79b.edd628", + "id": "e7b692af.0dd02", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2965.1609802246094, - "y": 993.8028364181519, - "z": "4ec136ff.390af8", + "x": 2952.1570739746094, + "y": 976.7989301681519, + "z": "c671301.759d0d", "wires": [ [ - "d1012448.dbd488" + "bf146f7a.eb901" ] ] }, { - "id": "d1012448.dbd488", + "id": "bf146f7a.eb901", "type": "set", "name": "set tmp.found-in-network tmp.ep-available", "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />", "comments": "", - "x": 3216.160987854004, - "y": 993.4027786254883, - "z": "4ec136ff.390af8", + "x": 3203.157081604004, + "y": 976.3988723754883, + "z": "c671301.759d0d", "wires": [] }, { - "id": "b00db02b.eb8b6", + "id": "bdffba6f.6b28d8", "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": 2761.15087890625, - "y": 1037.7924356460571, - "z": "4ec136ff.390af8", + "x": 2748.14697265625, + "y": 1020.7885293960571, + "z": "c671301.759d0d", "wires": [] }, { - "id": "648ef4ed.e1062c", + "id": "8d649aff.9610f8", "type": "switchNode", "name": "switch tmp.ep-available", "xml": "<switch test='`$tmp.ep-available`'>\n", "comments": "", "outputs": 1, - "x": 638.3167724609375, - "y": 1170.2366914749146, - "z": "4ec136ff.390af8", + "x": 625.3128662109375, + "y": 1153.2327852249146, + "z": "c671301.759d0d", "wires": [ [ - "59ee447d.77e34c", - "88dd47.020332b8" + "4f8ffbf3.76c804", + "5d810111.f89bf" ] ] }, { - "id": "88dd47.020332b8", + "id": "5d810111.f89bf", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 820.9836082458496, - "y": 1194.5700998306274, - "z": "4ec136ff.390af8", + "x": 807.9797019958496, + "y": 1177.5661935806274, + "z": "c671301.759d0d", "wires": [ [ - "f03a557c.a1bc78" + "fc624863.8ed628" ] ] }, { - "id": "59ee447d.77e34c", + "id": "4f8ffbf3.76c804", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 823.8723793029785, - "y": 1133.570198059082, - "z": "4ec136ff.390af8", + "x": 810.8684730529785, + "y": 1116.566291809082, + "z": "c671301.759d0d", "wires": [ [ - "5a5c3a3.170aec4" + "95d9e1c5.ffafd" ] ] }, { - "id": "5a5c3a3.170aec4", + "id": "95d9e1c5.ffafd", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 960.8724555969238, - "y": 1132.4590120315552, - "z": "4ec136ff.390af8", + "x": 947.8685493469238, + "y": 1115.4551057815552, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "f03a557c.a1bc78", + "id": "fc624863.8ed628", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 991.0946960449219, - "y": 1192.5700578689575, - "z": "4ec136ff.390af8", + "x": 978.0907897949219, + "y": 1175.5661516189575, + "z": "c671301.759d0d", "wires": [ [ - "7df4dec5.12529" + "36542d01.f14212" ] ] }, { - "id": "530d26e7.1066c8", + "id": "1ad5d4a1.aaa1eb", "type": "comment", "name": "GET connection-attachment-ar to store AR data from mdsal", "info": "", "comments": "", - "x": 2176.476852416992, - "y": 372.5078754425049, - "z": "4ec136ff.390af8", + "x": 2163.472946166992, + "y": 355.5039691925049, + "z": "c671301.759d0d", "wires": [] }, { - "id": "96d6938d.7bded", + "id": "d24d901f.d9d76", "type": "comment", "name": "Set source end point", "info": "", "comments": "", - "x": 614.9767456054688, - "y": 602.2579708099365, - "z": "4ec136ff.390af8", + "x": 601.9728393554688, + "y": 585.2540645599365, + "z": "c671301.759d0d", "wires": [] }, { - "id": "4ca01b12.aeeae4", + "id": "d2afdfc8.3d49c", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 667.9728240966797, - "y": 727.0041151046753, - "z": "4ec136ff.390af8", + "x": 654.9689178466797, + "y": 710.0002088546753, + "z": "c671301.759d0d", "wires": [] }, { - "id": "13901d91.bcbec2", + "id": "7153ec61.6a9434", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1045.9728202819824, - "y": 776.004114151001, - "z": "4ec136ff.390af8", + "x": 1032.9689140319824, + "y": 759.000207901001, + "z": "c671301.759d0d", "wires": [ [ - "1def54f0.081ddb" + "90308511.d0d098" ] ] }, { - "id": "eada0637.1dd9c8", + "id": "f1d188a0.fe8058", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1037.8246231079102, - "y": 811.0701990127563, - "z": "4ec136ff.390af8", + "x": 1024.8207168579102, + "y": 794.0662927627563, + "z": "c671301.759d0d", "wires": [ [ - "7eae3ac9.be18e4" + "f851790f.ede818" ] ] }, { - "id": "7eae3ac9.be18e4", + "id": "f851790f.ede818", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1212.9733085632324, - "y": 807.3375492095947, - "z": "4ec136ff.390af8", + "x": 1199.9694023132324, + "y": 790.3336429595947, + "z": "c671301.759d0d", "wires": [] }, { - "id": "1def54f0.081ddb", + "id": "90308511.d0d098", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1196.9728202819824, - "y": 774.004114151001, - "z": "4ec136ff.390af8", + "x": 1183.9689140319824, + "y": 757.000207901001, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "6963b7ed.1ac188", + "id": "ff0d92e9.55c77", "type": "set", "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false", "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />", "comments": "", - "x": 754.9728164672852, - "y": 901.0040884017944, - "z": "4ec136ff.390af8", + "x": 741.9689102172852, + "y": 884.0001821517944, + "z": "c671301.759d0d", "wires": [] }, { - "id": "e7dc10be.4a762", + "id": "717c1a02.c09b54", "type": "comment", "name": "If other EP exists delete from domain controller", "info": "", "comments": "", - "x": 688.9727172851562, - "y": 1095.003903388977, - "z": "4ec136ff.390af8", + "x": 675.9688110351562, + "y": 1077.999997138977, + "z": "c671301.759d0d", "wires": [] }, { - "id": "3c03726e.58d62e", + "id": "b5225e87.1d6d6", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 2693.97354888916, - "y": 1392.0043325424194, - "z": "4ec136ff.390af8", + "x": 2680.96964263916, + "y": 1375.0004262924194, + "z": "c671301.759d0d", "wires": [] }, { - "id": "b649f241.fe659", + "id": "a7698ae.d89d278", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 2257.473487854004, - "y": 1451.0043325424194, - "z": "4ec136ff.390af8", + "x": 2244.469581604004, + "y": 1434.0004262924194, + "z": "c671301.759d0d", "wires": [ [ - "4eb1e7d1.a91458", - "8b33a960.d74f98", - "58a39417.8a89cc" + "f44dc730.296008", + "1e7b258.a67f1db", + "565f7f73.66ef7" ] ] }, { - "id": "4eb1e7d1.a91458", + "id": "f44dc730.296008", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2496.473487854004, - "y": 1404.0043325424194, - "z": "4ec136ff.390af8", + "x": 2483.469581604004, + "y": 1387.0004262924194, + "z": "c671301.759d0d", "wires": [ [ - "3c03726e.58d62e" + "b5225e87.1d6d6" ] ] }, { - "id": "8b33a960.d74f98", + "id": "1e7b258.a67f1db", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2499.964454650879, - "y": 1451.5783681869507, - "z": "4ec136ff.390af8", + "x": 2486.960548400879, + "y": 1434.5744619369507, + "z": "c671301.759d0d", "wires": [ [ - "d1891615.f0fe68" + "b82d2ebf.1a1b3" ] ] }, { - "id": "58a39417.8a89cc", + "id": "565f7f73.66ef7", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2495.297462463379, - "y": 1492.911681175232, - "z": "4ec136ff.390af8", + "x": 2482.293556213379, + "y": 1475.907774925232, + "z": "c671301.759d0d", "wires": [ [ - "9094de14.94959" + "a1bb007f.4a95b" ] ] }, { - "id": "d1891615.f0fe68", + "id": "b82d2ebf.1a1b3", "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 2676.5358657836914, - "y": 1439.864104270935, - "z": "4ec136ff.390af8", + "x": 2663.5319595336914, + "y": 1422.860198020935, + "z": "c671301.759d0d", "wires": [] }, { - "id": "9094de14.94959", + "id": "a1bb007f.4a95b", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 2683.0700187683105, - "y": 1488.3508739471436, - "z": "4ec136ff.390af8", + "x": 2670.0661125183105, + "y": 1471.3469676971436, + "z": "c671301.759d0d", "wires": [] }, { - "id": "de59b3c5.550e5", + "id": "41073eca.4f87f", "type": "get-resource", "name": "get-resource pnf", - "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id \n\t\tAND pnf.pnf-name = $tmp.node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n\n", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n\n", "comments": "", "outputs": 1, - "x": 2199.9736404418945, - "y": 1336.004324913025, - "z": "4ec136ff.390af8", + "x": 2186.9697341918945, + "y": 1319.000418663025, + "z": "c671301.759d0d", "wires": [ [ - "e39bc756.013308", - "2a9857ce.2f6878", - "1952da4b.fcde26" + "ea378f67.57494", + "868c9cb5.9db7b", + "3a1faec8.e90752" ] ] }, { - "id": "e39bc756.013308", + "id": "ea378f67.57494", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2387.9736557006836, - "y": 1282.0043172836304, - "z": "4ec136ff.390af8", + "x": 2374.9697494506836, + "y": 1265.0004110336304, + "z": "c671301.759d0d", "wires": [ [ - "21d4c191.6f41ee" + "1d2ccfbd.a8cd2" ] ] }, { - "id": "2a9857ce.2f6878", + "id": "868c9cb5.9db7b", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2393.464702606201, - "y": 1324.5782136917114, - "z": "4ec136ff.390af8", + "x": 2380.460796356201, + "y": 1307.5743074417114, + "z": "c671301.759d0d", "wires": [ [ - "7c6a4960.24dda8" + "9b840dcb.a56fd" ] ] }, { - "id": "1952da4b.fcde26", + "id": "3a1faec8.e90752", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2379.797710418701, - "y": 1362.9115495681763, - "z": "4ec136ff.390af8", + "x": 2366.793804168701, + "y": 1345.9076433181763, + "z": "c671301.759d0d", "wires": [ [ - "6c19b1e1.1bbdd" + "6444ae02.9da9b" ] ] }, { - "id": "7c6a4960.24dda8", + "id": "9b840dcb.a56fd", "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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n", "comments": "", - "x": 2547.036003112793, - "y": 1314.8640203475952, - "z": "4ec136ff.390af8", + "x": 2534.032096862793, + "y": 1297.8601140975952, + "z": "c671301.759d0d", "wires": [] }, { - "id": "6c19b1e1.1bbdd", + "id": "6444ae02.9da9b", "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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n", "comments": "", - "x": 2543.570182800293, - "y": 1354.3508396148682, - "z": "4ec136ff.390af8", + "x": 2530.566276550293, + "y": 1337.3469333648682, + "z": "c671301.759d0d", "wires": [] }, { - "id": "21d4c191.6f41ee", + "id": "1d2ccfbd.a8cd2", "type": "set", "name": "set tmp.thirdparty-sdnc-id", "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n", "comments": "", - "x": 2587.9736709594727, - "y": 1277.0043172836304, - "z": "4ec136ff.390af8", + "x": 2574.9697647094727, + "y": 1260.0004110336304, + "z": "c671301.759d0d", "wires": [] }, { - "id": "4f8efcb5.a9cf14", + "id": "9df1ac2f.51afc", "type": "comment", "name": "get domain controller information", "info": "", "comments": "", - "x": 2243.4775466918945, - "y": 1305.0082921981812, - "z": "4ec136ff.390af8", + "x": 2230.4736404418945, + "y": 1288.0043859481812, + "z": "c671301.759d0d", "wires": [] }, { - "id": "35e0c434.3e437c", + "id": "8e68e45a.813908", "type": "execute", "name": "execute RestApiCallNode Delete ethernet Service", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 2305.97354888916, - "y": 1556.0043325424194, - "z": "4ec136ff.390af8", + "x": 2292.96964263916, + "y": 1539.0004262924194, + "z": "c671301.759d0d", "wires": [ [ - "c3b6b741.e17f38", - "dfd52870.a619b8" + "133da42a.747e7c", + "65e79690.a17a38" ] ] }, { - "id": "c3b6b741.e17f38", + "id": "133da42a.747e7c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2592.973487854004, - "y": 1579.0043325424194, - "z": "4ec136ff.390af8", + "x": 2579.969581604004, + "y": 1562.0004262924194, + "z": "c671301.759d0d", "wires": [ [ - "1373f104.3035cf" + "25b2c93d.e0d066" ] ] }, { - "id": "1373f104.3035cf", + "id": "25b2c93d.e0d066", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 2762.9734268188477, - "y": 1582.0043325424194, - "z": "4ec136ff.390af8", + "x": 2749.9695205688477, + "y": 1565.0004262924194, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "98709530.f9e578", + "id": "48ed3cb6.2c6ac4", "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=\"Error executing Create vpn rest api\" />\n", "comments": "", - "x": 2762.97354888916, - "y": 1538.0043325424194, - "z": "4ec136ff.390af8", + "x": 2749.96964263916, + "y": 1521.0004262924194, + "z": "c671301.759d0d", "wires": [] }, { - "id": "dfd52870.a619b8", + "id": "65e79690.a17a38", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2595.9734268188477, - "y": 1538.0043325424194, - "z": "4ec136ff.390af8", + "x": 2582.9695205688477, + "y": 1521.0004262924194, + "z": "c671301.759d0d", "wires": [ [ - "98709530.f9e578" + "48ed3cb6.2c6ac4" ] ] }, { - "id": "a09d44d6.036498", + "id": "d8c8a336.34039", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 917.7346534729004, - "y": 1694.9566963911057, - "z": "4ec136ff.390af8", + "x": 904.7307472229004, + "y": 1677.9527901411057, + "z": "c671301.759d0d", "wires": [ [ - "8338cff1.c1a26" + "16163acd.838405" ] ] }, { - "id": "8338cff1.c1a26", + "id": "16163acd.838405", "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=\"AAI failed\" />\n", "comments": "", - "x": 1084.2585334777832, - "y": 1706.5757673978806, - "z": "4ec136ff.390af8", + "x": 1071.2546272277832, + "y": 1689.5718611478806, + "z": "c671301.759d0d", "wires": [] }, { - "id": "9111ff4f.4282f", + "id": "dfa99ab0.574428", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 924.8299407958984, - "y": 1727.7186640501022, - "z": "4ec136ff.390af8", + "x": 911.8260345458984, + "y": 1710.7147578001022, + "z": "c671301.759d0d", "wires": [ [ - "8338cff1.c1a26" + "16163acd.838405" ] ] }, { - "id": "e911009.f267e", + "id": "60dc28ca.d224f8", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 636.7823677062988, - "y": 1677.3060846328735, - "z": "4ec136ff.390af8", + "x": 623.7784614562988, + "y": 1660.3021783828735, + "z": "c671301.759d0d", "wires": [] }, { - "id": "3a95a888.e92908", + "id": "d845a062.e24db", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 651.5500640869141, - "y": 1598.8315658569336, - "z": "4ec136ff.390af8", + "x": 638.5461578369141, + "y": 1581.8276596069336, + "z": "c671301.759d0d", "wires": [] }, { - "id": "dd09565b.b81778", + "id": "9b7849da.439398", "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": 619.9631462097168, - "y": 1759.4473180770874, - "z": "4ec136ff.390af8", + "x": 606.9592399597168, + "y": 1742.4434118270874, + "z": "c671301.759d0d", "wires": [] }, { - "id": "1507ea99.aa8315", + "id": "39d4dd71.5f1112", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 701.2821655273438, - "y": 1506.472339630127, - "z": "4ec136ff.390af8", + "x": 688.2782592773438, + "y": 1489.468433380127, + "z": "c671301.759d0d", "wires": [ [ - "36bc9007.e2fa4", - "65e8ae51.bc0a7", - "822d49a0.d686d8" + "f102f99f.ef15d8", + "c83c9026.cf22e", + "7e167ed3.568ff" ] ] }, { - "id": "36bc9007.e2fa4", + "id": "f102f99f.ef15d8", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 969.9235420227051, - "y": 1557.803751371801, - "z": "4ec136ff.390af8", + "x": 956.9196357727051, + "y": 1540.799845121801, + "z": "c671301.759d0d", "wires": [ [ - "4b0971a1.d1673" + "5e6822ac.d3f74c" ] ] }, { - "id": "65e8ae51.bc0a7", + "id": "c83c9026.cf22e", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 960.9235916137695, - "y": 1526.3037771210074, - "z": "4ec136ff.390af8", + "x": 947.9196853637695, + "y": 1509.2998708710074, + "z": "c671301.759d0d", "wires": [ [ - "4b0971a1.d1673" + "5e6822ac.d3f74c" ] ] }, { - "id": "822d49a0.d686d8", + "id": "7e167ed3.568ff", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 964.6736297607422, - "y": 1496.6608819961548, - "z": "4ec136ff.390af8", + "x": 951.6697235107422, + "y": 1479.6569757461548, + "z": "c671301.759d0d", "wires": [ [ - "d0da3bc8.9e8958" + "a5182b73.66b2a8" ] ] }, { - "id": "4b0971a1.d1673", + "id": "5e6822ac.d3f74c", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1130.6736297607422, - "y": 1527.0538009628654, - "z": "4ec136ff.390af8", + "x": 1117.6697235107422, + "y": 1510.0498947128654, + "z": "c671301.759d0d", "wires": [] }, { - "id": "d0da3bc8.9e8958", + "id": "a5182b73.66b2a8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1106.3295974731445, - "y": 1492.853051185608, - "z": "4ec136ff.390af8", + "x": 1093.3256912231445, + "y": 1475.849144935608, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "2a2a1345.d7f2ec", + "id": "db753550.5e2778", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />", "comments": "", - "x": 601.4957847595215, - "y": 1356.8532626628876, - "z": "4ec136ff.390af8", + "x": 588.4918785095215, + "y": 1339.8493564128876, + "z": "c671301.759d0d", "wires": [] }, { - "id": "f1e26abf.1dc9f8", + "id": "7a073085.0e81c", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 618.7816276550293, - "y": 1429.4728603363037, - "z": "4ec136ff.390af8", + "x": 605.7777214050293, + "y": 1412.4689540863037, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "25f9e140.e4210e", + "id": "6fa8d61c.7e4378", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 673.768684387207, - "y": 1467.4239978790283, - "z": "4ec136ff.390af8", + "x": 660.764778137207, + "y": 1450.4200916290283, + "z": "c671301.759d0d", "wires": [] }, { - "id": "5c89f183.d2653", + "id": "6873bae7.8cf8e4", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 615.3373260498047, - "y": 1396.027913093567, - "z": "4ec136ff.390af8", + "x": 602.3334197998047, + "y": 1379.024006843567, + "z": "c671301.759d0d", "wires": [] }, { - "id": "b42e02fb.93ce4", + "id": "9fb656d5.ef4218", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 728.6707878112793, - "y": 1317.0278651714325, - "z": "4ec136ff.390af8", + "x": 715.6668815612793, + "y": 1300.0239589214325, + "z": "c671301.759d0d", "wires": [] }, { - "id": "3f84c752.6766f8", + "id": "ad67b90f.7f4058", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 670.2506141662598, - "y": 1284.4411668777466, - "z": "4ec136ff.390af8", + "x": 657.2467079162598, + "y": 1267.4372606277466, + "z": "c671301.759d0d", "wires": [] }, { - "id": "60ba1f59.42707", + "id": "5b4906aa.434008", "type": "update", "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n", + "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n", "comments": "", "outputs": 1, - "x": 663.2266464233398, - "y": 1714.7582273483276, - "z": "4ec136ff.390af8", + "x": 650.2227401733398, + "y": 1697.7543210983276, + "z": "c671301.759d0d", "wires": [ [ - "a09d44d6.036498", - "9111ff4f.4282f" + "d8c8a336.34039", + "dfa99ab0.574428" ] ] }, { - "id": "7df4dec5.12529", + "id": "36542d01.f14212", "type": "get-resource", "name": "get-resource connectivity", - "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND \n\t\t depth = '1'\"\n pfx='tmp.connectivity' local-only='false' >\n", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.service-data.networks.network[0].network-id AND \n\t\t depth = '1'\"\n pfx='tmp.connectivity' local-only='false' >\n", "comments": "", "outputs": 1, - "x": 1197.0044708251953, - "y": 1192.5083332061768, - "z": "4ec136ff.390af8", + "x": 1184.0005645751953, + "y": 1175.5044269561768, + "z": "c671301.759d0d", "wires": [ [ - "c873d73.0af9728", - "1fd3fb2b.7cf7a5" + "ac511500.01c158", + "73ce6220.0aa3ac" ] ] }, { - "id": "482867b5.2cc388", + "id": "acaf1b93.77d2c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1970.1217803955078, - "y": 1389.3484659194946, - "z": "4ec136ff.390af8", + "x": 1957.1178741455078, + "y": 1372.3445596694946, + "z": "c671301.759d0d", "wires": [ [ - "6613cefb.76171", - "6eb3502d.b2e8f", - "de59b3c5.550e5", - "b649f241.fe659", - "35e0c434.3e437c" + "49ef2c84.8031a4", + "240e11a5.31781e", + "41073eca.4f87f", + "a7698ae.d89d278", + "8e68e45a.813908", + "17a0b9d8.6d99a6" ] ] }, { - "id": "a4dcab46.732d98", + "id": "bfb6dec9.6c932", "type": "outcome", "name": "vpn-binding", "xml": "<outcome value='vpn-binding'>\n", "comments": "", "outputs": 1, - "x": 1796.290298461914, - "y": 1391.8299894332886, - "z": "4ec136ff.390af8", + "x": 1783.286392211914, + "y": 1374.8260831832886, + "z": "c671301.759d0d", "wires": [ [ - "482867b5.2cc388" + "acaf1b93.77d2c8" ] ] }, { - "id": "2e8bc3df.71844c", + "id": "a4e854e4.e41328", "type": "for", "name": "for each relationship", "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >\n", "comments": "", "outputs": 1, - "x": 1418.0042419433594, - "y": 1390.0082159042358, - "z": "4ec136ff.390af8", + "x": 1405.0003356933594, + "y": 1373.0043096542358, + "z": "c671301.759d0d", "wires": [ [ - "8af67803.bf6a88" + "998442eb.48b4" ] ] }, { - "id": "8af67803.bf6a88", + "id": "998442eb.48b4", "type": "switchNode", "name": "switch related-to", "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n", "comments": "", "outputs": 1, - "x": 1630.0042533874512, - "y": 1391.0082159042358, - "z": "4ec136ff.390af8", + "x": 1617.0003471374512, + "y": 1374.0043096542358, + "z": "c671301.759d0d", "wires": [ [ - "a4dcab46.732d98" + "bfb6dec9.6c932" ] ] }, { - "id": "6eb3502d.b2e8f", + "id": "240e11a5.31781e", "type": "set", "name": "set tmp.vpn-name", "xml": "<set>\n<parameter name='tmp.vpn-name' value=\"`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` \" />\n", "comments": "", - "x": 2203.0044479370117, - "y": 1103.008532524109, - "z": "4ec136ff.390af8", + "x": 2190.0005416870117, + "y": 1086.004626274109, + "z": "c671301.759d0d", "wires": [] }, { - "id": "6613cefb.76171", + "id": "49ef2c84.8031a4", "type": "execute", "name": "split vpnName to find nodeId", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.vpn-name`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n", "comments": "", "outputs": 1, - "x": 2239.0044021606445, - "y": 1204.0078992843628, - "z": "4ec136ff.390af8", + "x": 2226.0004959106445, + "y": 1187.0039930343628, + "z": "c671301.759d0d", "wires": [ [ - "41fe5a08.6540e4", - "12fef836.878578" + "29be775d.300d28", + "79e65a65.d62d64" ] ] }, { - "id": "12fef836.878578", + "id": "79e65a65.d62d64", "type": "failure", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2440.004592895508, - "y": 1181.0078916549683, - "z": "4ec136ff.390af8", + "x": 2427.000686645508, + "y": 1164.0039854049683, + "z": "c671301.759d0d", "wires": [ [ - "c4ef2190.9fbc6" + "2e37c245.6cda0e" ] ] }, { - "id": "c4ef2190.9fbc6", + "id": "2e37c245.6cda0e", "type": "set", "name": "set tmp.node-id", - "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n", + "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n<parameter name='tmp.actual.vpn-name' value='`$route1[1]`' />\n", "comments": "", - "x": 2593.004753112793, - "y": 1179.0078926086426, - "z": "4ec136ff.390af8", + "x": 2580.000846862793, + "y": 1162.0039863586426, + "z": "c671301.759d0d", "wires": [] }, { - "id": "fa885e6a.929bd", + "id": "3186476.c93d1b8", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n", "comments": "", - "x": 2577.004919052124, - "y": 1228.0078945159912, - "z": "4ec136ff.390af8", + "x": 2564.001012802124, + "y": 1211.0039882659912, + "z": "c671301.759d0d", "wires": [] }, { - "id": "41fe5a08.6540e4", + "id": "29be775d.300d28", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2437.00457572937, - "y": 1229.0078964233398, - "z": "4ec136ff.390af8", + "x": 2424.00066947937, + "y": 1212.0039901733398, + "z": "c671301.759d0d", "wires": [ [ - "fa885e6a.929bd" + "3186476.c93d1b8" ] ] }, { - "id": "c873d73.0af9728", + "id": "ac511500.01c158", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1378.0040702819824, - "y": 1227.0039777755737, - "z": "4ec136ff.390af8", + "x": 1365.0001640319824, + "y": 1210.0000715255737, + "z": "c671301.759d0d", "wires": [ [ - "72cdc300.185abc" + "35849f58.75b79" ] ] }, { - "id": "1fd3fb2b.7cf7a5", + "id": "73ce6220.0aa3ac", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1380.855800628662, - "y": 1154.0702228546143, - "z": "4ec136ff.390af8", + "x": 1367.851894378662, + "y": 1137.0663166046143, + "z": "c671301.759d0d", "wires": [ [ - "132951fb.62166e" + "3d1a3d62.7aa882" ] ] }, { - "id": "132951fb.62166e", + "id": "3d1a3d62.7aa882", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Connectivity resource not found\" />\n \n", "comments": "", - "x": 1523.0045700073242, - "y": 1154.3376331329346, - "z": "4ec136ff.390af8", + "x": 1510.0006637573242, + "y": 1137.3337268829346, + "z": "c671301.759d0d", "wires": [] }, { - "id": "72cdc300.185abc", + "id": "35849f58.75b79", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1380.0040817260742, - "y": 1305.0041437149048, - "z": "4ec136ff.390af8", + "x": 1367.0001754760742, + "y": 1288.0002374649048, + "z": "c671301.759d0d", "wires": [ [ - "2e8bc3df.71844c" + "a4e854e4.e41328" ] ] }, { - "id": "bf1b5f9f.275aa", + "id": "485e569f.2b52d8", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 816.3378601074219, - "y": 553.5038557052612, - "z": "4ec136ff.390af8", + "x": 803.3339538574219, + "y": 536.4999494552612, + "z": "c671301.759d0d", "wires": [ [ - "f65756e0.dd7818", - "1584b53e.263d2b" + "dd903f73.c503a", + "5569926e.6ec77c" ] ] }, { - "id": "ff509458.45f008", + "id": "417e0490.1d34dc", "type": "execute", "name": "get parent-service-data tmp.ar-url-psd", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 670.0041046142578, - "y": 762.0041170120239, - "z": "4ec136ff.390af8", + "x": 657.0001983642578, + "y": 745.0002107620239, + "z": "c671301.759d0d", "wires": [ [] ] }, { - "id": "980e2d4b.7e472", + "id": "d67f9f52.31c1f", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 737.0040664672852, - "y": 797.0042009353638, - "z": "4ec136ff.390af8", + "x": 724.0001602172852, + "y": 780.0002946853638, + "z": "c671301.759d0d", "wires": [ [ - "13901d91.bcbec2", - "eada0637.1dd9c8" + "7153ec61.6a9434", + "f1d188a0.fe8058" ] ] }, { - "id": "372ff043.61187", + "id": "2a0b728c.4f365e", "type": "switchNode", "name": "switch mdsal-psd.service-data.provided-allotted-resources_length", "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 753.1881866455078, - "y": 971.7220287322998, - "z": "4ec136ff.390af8", + "x": 740.1842803955078, + "y": 954.7181224822998, + "z": "c671301.759d0d", "wires": [ [ - "e3f9ceb3.fcc12", - "a518915c.e4ec5", - "525b4334.32e11c" + "99b7fbfe.94a448", + "7e8c22a4.61fc8c", + "2061f78c.10bc08" ] ] + }, + { + "id": "17a0b9d8.6d99a6", + "type": "update", + "name": "delete AAI vpn-binding", + "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n key='vpn-binding.vpn-id = $tmp.vpn-name' >", + "comments": "", + "outputs": 1, + "x": 2224, + "y": 1642, + "z": "c671301.759d0d", + "wires": [ + [ + "496ebae3.0822d4", + "1b687bcc.3acb54" + ] + ] + }, + { + "id": "496ebae3.0822d4", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 2478.5080070495605, + "y": 1622.198469042778, + "z": "c671301.759d0d", + "wires": [ + [ + "9a00ded1.17f07" + ] + ] + }, + { + "id": "1b687bcc.3acb54", + "type": "failure", + "name": "not-found", + "xml": "<outcome value='not-found'>\n", + "comments": "", + "outputs": 1, + "x": 2485.6032943725586, + "y": 1654.9604367017746, + "z": "c671301.759d0d", + "wires": [ + [ + "9a00ded1.17f07" + ] + ] + }, + { + "id": "9a00ded1.17f07", + "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=\"AAI failed\" />\n", + "comments": "", + "x": 2645.0318870544434, + "y": 1633.817540049553, + "z": "c671301.759d0d", + "wires": [] } -]
\ No newline at end of file +] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json index 3204bd86..453b7829 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json @@ -1,20 +1,20 @@ [ { - "id": "4b30503e.867f2", + "id": "11e769e3.3811f6", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 116.00390625, - "y": 47.999999046325684, - "z": "5c846185.ea888", + "x": 114, + "y": 40, + "z": "22c49458.dad37c", "wires": [ [ - "37e77520.ee3cba" + "a911446f.df7748" ] ] }, { - "id": "37e77520.ee3cba", + "id": "a911446f.df7748", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,917 +22,909 @@ "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": 328.00391006469727, - "y": 120.00001621246338, - "z": "5c846185.ea888", + "x": 288.00000381469727, + "y": 95.0000171661377, + "z": "22c49458.dad37c", "wires": [ [ - "5677b71b.5fb328" + "7ff497ab.f66f98" ] ] }, { - "id": "5677b71b.5fb328", + "id": "7ff497ab.f66f98", "type": "method", "name": "sotn-attachment-topology-operation-delete", "xml": "<method rpc='sotn-attachment-topology-operation-delete' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 316.0040283203125, - "y": 207.99999904632568, - "z": "5c846185.ea888", + "x": 276.0001220703125, + "y": 183, + "z": "22c49458.dad37c", "wires": [ [ - "9d2f20f7.d7e57" + "5cbadab.7a99a24" ] ] }, { - "id": "9d2f20f7.d7e57", + "id": "5cbadab.7a99a24", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 332.0040283203125, - "y": 763.0002436637878, - "z": "5c846185.ea888", + "x": 292.0001220703125, + "y": 738.0002446174622, + "z": "22c49458.dad37c", "wires": [ [ - "ed51ef95.ae803", - "88df7f3c.6dcf", - "3f1b61e1.0ac49e", - "e2fe8873.3a2848", - "d8fe29bc.d00d68", - "4903f6e1.1eeb68", - "f2266740.3e9f68", - "a2240e65.e6034", - "1742ced6.939601", - "8b97d92c.0d63e8", - "4eb557ec.96c928", - "608b88dd.e3a5a8", - "12cd17c5.66c948", - "9eb3dfae.f51c4", - "cf61b833.d96918" + "12de2d1a.68bba3", + "51b97e85.9070d", + "1fed4a5d.8e6a46", + "6484d39f.eed1bc", + "5b5b7d66.22fc34", + "e0c27564.dc6708", + "4516c95e.b99748", + "497a6009.1522c", + "79c8cfb5.a81b4", + "72f76f27.124fe", + "eb5610dc.278e7", + "8cb29231.a6eaa", + "322e0846.b44bc8", + "9ea8a95d.e39878", + "75c532eb.23cc8c" ] ] }, { - "id": "ed51ef95.ae803", + "id": "12de2d1a.68bba3", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 728.9974670410156, - "y": 161.9934859275818, - "z": "5c846185.ea888", + "x": 688.9935607910156, + "y": 136.9934868812561, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "d21298fe.289dd8", + "id": "a47c80d2.4bf0a", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 757.9577789306641, - "y": 126.02528190612793, - "z": "5c846185.ea888", + "x": 717.9538726806641, + "y": 101.02528285980225, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "88df7f3c.6dcf", + "id": "51b97e85.9070d", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 682.9974060058594, - "y": 254.99349117279053, - "z": "5c846185.ea888", + "x": 642.9934997558594, + "y": 229.99349212646484, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "d8fe29bc.d00d68", + "id": "5b5b7d66.22fc34", "type": "execute", "name": "execute Properties", "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": 689.2592964172363, - "y": 342.6602201461792, - "z": "5c846185.ea888", + "x": 649.2553901672363, + "y": 317.6602210998535, + "z": "22c49458.dad37c", "wires": [ [] ] }, { - "id": "3f1b61e1.0ac49e", + "id": "1fed4a5d.8e6a46", "type": "execute", "name": "generate allotted-resource url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 721.2593231201172, - "y": 430.66020154953003, - "z": "5c846185.ea888", + "x": 681.2554168701172, + "y": 405.66020250320435, + "z": "22c49458.dad37c", "wires": [ [] ] }, { - "id": "c43edf3b.dcbac", + "id": "ab7e7ca9.bc19e", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 736.9974365234375, - "y": 221.9935007095337, - "z": "5c846185.ea888", + "x": 696.9935302734375, + "y": 196.993501663208, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "10733905.283097", + "id": "ba32781e.53a208", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 754.9974021911621, - "y": 307.882381439209, - "z": "5c846185.ea888", + "x": 714.9934959411621, + "y": 282.8823823928833, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "62545852.867ec8", + "id": "b5885f7.9b7d5a", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 780.9974212646484, - "y": 394.8823404312134, - "z": "5c846185.ea888", + "x": 740.9935150146484, + "y": 369.8823413848877, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "ed0a2645.640ef8", + "id": "e2ab0cde.eabb7", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 848.0042343139648, - "y": 849.5316219329834, - "z": "5c846185.ea888", + "x": 808.0003280639648, + "y": 824.5316228866577, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "a950273c.9f66a8", + "id": "9608d482.14feb8", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1676.1888427734375, - "y": 1083.0042576789856, - "z": "5c846185.ea888", + "x": 1636.1849365234375, + "y": 1058.00425863266, + "z": "22c49458.dad37c", "wires": [ [ - "e88ff344.a2353" + "9f0a169a.b7bf38" ] ] }, { - "id": "e2fe8873.3a2848", + "id": "6484d39f.eed1bc", "type": "switchNode", "name": "switch mdsal-psd.service-data.provided-allotted-resources_length", "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 827.1882019042969, - "y": 1089.7180404663086, - "z": "5c846185.ea888", + "x": 787.1842956542969, + "y": 1064.718041419983, + "z": "22c49458.dad37c", "wires": [ [ - "7dbb67ae.29f3f8", - "dea01091.d8b15" + "3cb5550a.e1379a", + "525dfe7f.9aace" ] ] }, { - "id": "2fdb27fa.f6ac38", + "id": "72d22ab8.9fbaf4", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1277.4583644866943, - "y": 1129.7015261650085, - "z": "5c846185.ea888", + "x": 1237.4544582366943, + "y": 1104.7015271186829, + "z": "22c49458.dad37c", "wires": [ [ - "a950273c.9f66a8", - "19cf7741.613499" + "9608d482.14feb8", + "37cdb210.11699e" ] ] }, { - "id": "e88ff344.a2353", + "id": "9f0a169a.b7bf38", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2126.300048828125, - "y": 1081.0041155815125, - "z": "5c846185.ea888", + "x": 2086.296142578125, + "y": 1056.0041165351868, + "z": "22c49458.dad37c", "wires": [ [ - "c87ef19e.e93cf" + "1c3b0551.8a3d7b" ] ] }, { - "id": "4903f6e1.1eeb68", + "id": "e0c27564.dc6708", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 738.9726181030273, - "y": 885.0000667572021, - "z": "5c846185.ea888", + "x": 698.9687118530273, + "y": 860.0000677108765, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "9023749d.2a65a8", + "id": "df350c49.f450e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1118.972900390625, - "y": 963.0001816749573, - "z": "5c846185.ea888", + "x": 1078.968994140625, + "y": 938.0001826286316, + "z": "22c49458.dad37c", "wires": [ [ - "85ec274.d7380d8" + "f5ff5552.dcef18" ] ] }, { - "id": "13a32c23.faaff4", + "id": "a707d837.6f7a08", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1110.8247032165527, - "y": 998.0662665367126, - "z": "5c846185.ea888", + "x": 1070.8207969665527, + "y": 973.066267490387, + "z": "22c49458.dad37c", "wires": [ [ - "61460fc5.a222" + "72020d23.f0ba44" ] ] }, { - "id": "61460fc5.a222", + "id": "72020d23.f0ba44", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n \n", "comments": "", - "x": 1285.973388671875, - "y": 994.333616733551, - "z": "5c846185.ea888", + "x": 1245.969482421875, + "y": 969.3336176872253, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "85ec274.d7380d8", + "id": "f5ff5552.dcef18", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1269.972900390625, - "y": 961.0001816749573, - "z": "5c846185.ea888", + "x": 1229.968994140625, + "y": 936.0001826286316, + "z": "22c49458.dad37c", "wires": [ [] ] }, { - "id": "2a315011.b7952", + "id": "b9f57970.85bbb8", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 972.7346687316895, - "y": 1278.9528144598007, - "z": "5c846185.ea888", + "x": 932.7307624816895, + "y": 1253.952815413475, + "z": "22c49458.dad37c", "wires": [ [ - "398739b4.01afc6" + "7794b76c.3bcdd8" ] ] }, { - "id": "398739b4.01afc6", + "id": "7794b76c.3bcdd8", "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=\"AAI failed\" />\n", "comments": "", - "x": 1139.2585487365723, - "y": 1290.5718854665756, - "z": "5c846185.ea888", + "x": 1099.2546424865723, + "y": 1265.57188642025, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "2e78e3b1.a4cadc", + "id": "2e04eae7.d58896", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 979.8299560546875, - "y": 1311.7147821187973, - "z": "5c846185.ea888", + "x": 939.8260498046875, + "y": 1286.7147830724716, + "z": "22c49458.dad37c", "wires": [ [ - "398739b4.01afc6" + "7794b76c.3bcdd8" ] ] }, { - "id": "3f6ffe96.e0bda2", - "type": "comment", - "name": "TODO: Rework after confirmation from AAI", - "info": "", - "comments": "", - "x": 1104.1413345336914, - "y": 1229.8732142448425, - "z": "5c846185.ea888", - "wires": [] - }, - { - "id": "f2266740.3e9f68", + "id": "4516c95e.b99748", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 705.5500564575195, - "y": 1242.8276815414429, - "z": "5c846185.ea888", + "x": 665.5461502075195, + "y": 1217.8276824951172, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "a2240e65.e6034", + "id": "497a6009.1522c", "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": 674.9631614685059, - "y": 1343.4434361457825, - "z": "5c846185.ea888", + "x": 634.9592552185059, + "y": 1318.4434370994568, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "1742ced6.939601", + "id": "75c532eb.23cc8c", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='Delete' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 754.6705703735352, - "y": 519.3333616256714, - "z": "5c846185.ea888", + "x": 714.6666641235352, + "y": 494.3333625793457, + "z": "22c49458.dad37c", "wires": [ [ - "597f085a.f89fd8", - "c3fb7b14.ff60a8", - "e4c15d29.0e847" + "62855576.29e8bc", + "943e1cd3.5570d", + "d016523b.d696c" ] ] }, { - "id": "597f085a.f89fd8", + "id": "62855576.29e8bc", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 994.3120727539062, - "y": 559.6649098396301, - "z": "5c846185.ea888", + "x": 954.3081665039062, + "y": 534.6649107933044, + "z": "22c49458.dad37c", "wires": [ [ - "67fdc38f.4e65cc" + "1a54db3b.e65b75" ] ] }, { - "id": "c3fb7b14.ff60a8", + "id": "943e1cd3.5570d", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 991.3120727539062, - "y": 516.1649074554443, - "z": "5c846185.ea888", + "x": 951.3081665039062, + "y": 491.16490840911865, + "z": "22c49458.dad37c", "wires": [ [ - "67fdc38f.4e65cc" + "1a54db3b.e65b75" ] ] }, { - "id": "e4c15d29.0e847", + "id": "d016523b.d696c", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 998.0621528625488, - "y": 475.52200269699097, - "z": "5c846185.ea888", + "x": 958.0582466125488, + "y": 450.5220036506653, + "z": "22c49458.dad37c", "wires": [ [ - "50ef93e6.56ad3c" + "4e5c2e12.2b4c5" ] ] }, { - "id": "67fdc38f.4e65cc", + "id": "1a54db3b.e65b75", "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=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1150.062240600586, - "y": 537.9149079322815, - "z": "5c846185.ea888", + "x": 1110.058334350586, + "y": 512.9149088859558, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "50ef93e6.56ad3c", + "id": "4e5c2e12.2b4c5", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1135.7180843353271, - "y": 475.7141823768616, - "z": "5c846185.ea888", + "x": 1095.7141780853271, + "y": 450.7141833305359, + "z": "22c49458.dad37c", "wires": [ [] ] }, { - "id": "c4e5f3c2.475ed", + "id": "568d92cc.719a5c", "type": "comment", "name": "Delete Allotted Resource", "info": "", "comments": "", - "x": 702.0039520263672, - "y": 488.0000276565552, - "z": "5c846185.ea888", + "x": 662.0000457763672, + "y": 463.0000286102295, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "de43dad6.d53448", + "id": "34b11a52.976836", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1652.0078125, - "y": 725.0039052963257, - "z": "5c846185.ea888", + "x": 1612.00390625, + "y": 700.00390625, + "z": "22c49458.dad37c", "wires": [ [ - "584a4c5d.3639a4" + "905bba1a.0e8108" ] ] }, { - "id": "8b97d92c.0d63e8", + "id": "79c8cfb5.a81b4", "type": "switchNode", "name": "switch service-data.consumed-allotted-resources_length", "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 805.0071983337402, - "y": 685.7179067134857, - "z": "5c846185.ea888", + "x": 765.0032920837402, + "y": 660.71790766716, + "z": "22c49458.dad37c", "wires": [ [ - "3433f8dc.aa0358", - "d35e52b4.a3e33" + "a04a8128.1b845", + "9bf1251d.a97d08" ] ] }, { - "id": "3433f8dc.aa0358", + "id": "a04a8128.1b845", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1129.1500625610352, - "y": 668.5753412246704, - "z": "5c846185.ea888", + "x": 1089.1461563110352, + "y": 643.5753421783447, + "z": "22c49458.dad37c", "wires": [ [ - "e9cfa004.3e1db" + "673a72bf.8ebb9c" ] ] }, { - "id": "d35e52b4.a3e33", + "id": "9bf1251d.a97d08", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1115.1500854492188, - "y": 731.5753300189972, - "z": "5c846185.ea888", + "x": 1075.1461791992188, + "y": 706.5753309726715, + "z": "22c49458.dad37c", "wires": [ [ - "27f778ec.7e6108" + "db5549c4.4372e8" ] ] }, { - "id": "27f778ec.7e6108", + "id": "db5549c4.4372e8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1275.2771759033203, - "y": 729.7013065814972, - "z": "5c846185.ea888", + "x": 1235.2732696533203, + "y": 704.7013075351715, + "z": "22c49458.dad37c", "wires": [ [ - "de43dad6.d53448", - "c89d5c3.bdcfea" + "34b11a52.976836", + "f5274780.cdc8d8" ] ] }, { - "id": "4eb557ec.96c928", + "id": "72f76f27.124fe", "type": "set", "name": "set consumed allotted resources for deletion", "xml": "<set>\n<parameter name=\"service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].\" value=\"\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n", "comments": "", - "x": 761.8645324707031, - "y": 756.2895498275757, - "z": "5c846185.ea888", + "x": 721.8606262207031, + "y": 731.28955078125, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "584a4c5d.3639a4", + "id": "905bba1a.0e8108", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2090.1194229125977, - "y": 721.0040273666382, - "z": "5c846185.ea888", + "x": 2050.1155166625977, + "y": 696.0040283203125, + "z": "22c49458.dad37c", "wires": [ [ - "c6c0a37e.c2dab" + "a9176335.8c5a3" ] ] }, { - "id": "c6c0a37e.c2dab", + "id": "a9176335.8c5a3", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2285.929244995117, - "y": 720.4683518409729, - "z": "5c846185.ea888", + "x": 2245.925338745117, + "y": 695.4683527946472, + "z": "22c49458.dad37c", "wires": [ [ - "980eb324.1f10c" + "c3d97090.70bae" ] ] }, { - "id": "b3956a96.0877a8", + "id": "cc5aea61.28e048", "type": "set", "name": "set tmp.cidx", "xml": "<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n", "comments": "", - "x": 2601.2657775878906, - "y": 721.2246098518372, - "z": "5c846185.ea888", + "x": 2561.2618713378906, + "y": 696.2246108055115, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "f7015fdd.73e0f", + "id": "ad0e4910.5dc848", "type": "comment", "name": "Delete consumed service consumed-allotted-resources in mdsal", "info": "", "comments": "", - "x": 816.0084686279297, - "y": 618.003871455905, - "z": "5c846185.ea888", + "x": 776.0045623779297, + "y": 593.0038724095793, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "1b9b1c3c.959814", + "id": "5b6b08ee.203c48", "type": "comment", "name": "This set resource will be deleted in MDSAL by provider code", "info": "", "comments": "", - "x": 806.341251373291, - "y": 722.7819633483887, - "z": "5c846185.ea888", + "x": 766.337345123291, + "y": 697.781964302063, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "4ceb1c8.5e02ee4", + "id": "5c1ad210.960a1c", "type": "comment", "name": "Obtain the index of conusumed AR", "info": "", "comments": "", - "x": 728.7856597900391, - "y": 649.8927316665649, - "z": "5c846185.ea888", + "x": 688.7817535400391, + "y": 624.8927326202393, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "e9cfa004.3e1db", + "id": "673a72bf.8ebb9c", "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n", "comments": "", - "x": 1291.0078125, - "y": 669.0039052963257, - "z": "5c846185.ea888", + "x": 1251.00390625, + "y": 644.00390625, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "980eb324.1f10c", + "id": "c3d97090.70bae", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2435.007843017578, - "y": 721.2539548873901, - "z": "5c846185.ea888", + "x": 2395.003936767578, + "y": 696.2539558410645, + "z": "22c49458.dad37c", "wires": [ [ - "b3956a96.0877a8" + "cc5aea61.28e048" ] ] }, { - "id": "157c6d55.8b7213", + "id": "b29df060.eb56c", "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=\"resource to be deleted is not available in mdsal\" />\n", "comments": "", - "x": 1745.2578125, - "y": 778.2539052963257, - "z": "5c846185.ea888", + "x": 1705.25390625, + "y": 753.25390625, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "2c9e34da.91de0c", + "id": "b8b02536.9fab38", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1607.7578125, - "y": 778.2539052963257, - "z": "5c846185.ea888", + "x": 1567.75390625, + "y": 753.25390625, + "z": "22c49458.dad37c", "wires": [ [ - "157c6d55.8b7213" + "b29df060.eb56c" ] ] }, { - "id": "c89d5c3.bdcfea", + "id": "f5274780.cdc8d8", "type": "switchNode", "name": "switch tmp.cidx ", "xml": "<switch test=\"`$tmp.cidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1453.7578125, - "y": 778.2539052963257, - "z": "5c846185.ea888", + "x": 1413.75390625, + "y": 753.25390625, + "z": "22c49458.dad37c", "wires": [ [ - "2c9e34da.91de0c" + "b8b02536.9fab38" ] ] }, { - "id": "c4252e31.dbb43", + "id": "88b79953.981898", "type": "comment", "name": "Delete provided service provided-allotted-resources in mdsal", "info": "", "comments": "", - "x": 802.5078277587891, - "y": 814.0039052963257, - "z": "5c846185.ea888", + "x": 762.5039215087891, + "y": 789.00390625, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "dea01091.d8b15", + "id": "525dfe7f.9aace", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1130.5080833435059, - "y": 1128.7540974617004, - "z": "5c846185.ea888", + "x": 1090.5041770935059, + "y": 1103.7540984153748, + "z": "22c49458.dad37c", "wires": [ [ - "2fdb27fa.f6ac38" + "72d22ab8.9fbaf4" ] ] }, { - "id": "7dbb67ae.29f3f8", + "id": "3cb5550a.e1379a", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1147.5080032348633, - "y": 1040.7539315223694, - "z": "5c846185.ea888", + "x": 1107.5040969848633, + "y": 1015.7539324760437, + "z": "22c49458.dad37c", "wires": [ [ - "f54472a.345109" + "b0f98381.70f7" ] ] }, { - "id": "f54472a.345109", + "id": "b0f98381.70f7", "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n", "comments": "", - "x": 1311.3656005859375, - "y": 1041.1824765205383, - "z": "5c846185.ea888", + "x": 1271.3616943359375, + "y": 1016.1824774742126, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "e1824da6.1f214", + "id": "1af61fb0.016", "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=\"resource to be deleted is not available in mdsal\" />\n", "comments": "", - "x": 1742.7578563690186, - "y": 1158.7539353370667, - "z": "5c846185.ea888", + "x": 1702.7539501190186, + "y": 1133.753936290741, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "8205df8d.8ddee", + "id": "457e37be.33a0e8", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1605.2578563690186, - "y": 1158.7539353370667, - "z": "5c846185.ea888", + "x": 1565.2539501190186, + "y": 1133.753936290741, + "z": "22c49458.dad37c", "wires": [ [ - "e1824da6.1f214" + "1af61fb0.016" ] ] }, { - "id": "19cf7741.613499", + "id": "37cdb210.11699e", "type": "switchNode", "name": "switch tmp.pidx ", "xml": "<switch test=\"`$tmp.pidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1451.2578563690186, - "y": 1158.7539353370667, - "z": "5c846185.ea888", + "x": 1411.2539501190186, + "y": 1133.753936290741, + "z": "22c49458.dad37c", "wires": [ [ - "8205df8d.8ddee" + "457e37be.33a0e8" ] ] }, { - "id": "c87ef19e.e93cf", + "id": "1c3b0551.8a3d7b", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2315.508274078369, - "y": 1078.7540936470032, - "z": "5c846185.ea888", + "x": 2275.504367828369, + "y": 1053.7540946006775, + "z": "22c49458.dad37c", "wires": [ [ - "27e8796d.045376" + "f8a04da0.ae331" ] ] }, { - "id": "33e9010b.6c835e", + "id": "26796192.02fd4e", "type": "set", "name": "set tmp.pidx", - "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n", + "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n\n", "comments": "", - "x": 2383.8443908691406, - "y": 1213.510190486908, - "z": "5c846185.ea888", + "x": 2343.8404846191406, + "y": 1188.5101914405823, + "z": "22c49458.dad37c", "wires": [] }, { - "id": "27e8796d.045376", + "id": "f8a04da0.ae331", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2375.586727142334, - "y": 1149.5395798683167, - "z": "5c846185.ea888", + "x": 2335.582820892334, + "y": 1124.539580821991, + "z": "22c49458.dad37c", "wires": [ [ - "33e9010b.6c835e" + "26796192.02fd4e" ] ] }, { - "id": "608b88dd.e3a5a8", - "type": "set", - "name": "set provided allotted resources for deletion", - "xml": "<set>\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource[$pidx].\" value=\"\" />\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource_length\" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n", - "comments": "", - "x": 761.0079040527344, - "y": 1144.003975868225, - "z": "5c846185.ea888", - "wires": [] - }, - { - "id": "12cd17c5.66c948", + "id": "eb5610dc.278e7", "type": "update", "name": "update AAI allotted-resource", "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='allotted-resource' \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n", "comments": "", "outputs": 1, - "x": 718.2266616821289, - "y": 1298.7543454170227, - "z": "5c846185.ea888", + "x": 678.2227554321289, + "y": 1273.754346370697, + "z": "22c49458.dad37c", "wires": [ [ - "2a315011.b7952", - "2e78e3b1.a4cadc" + "b9f57970.85bbb8", + "2e04eae7.d58896" ] ] }, { - "id": "cf61b833.d96918", + "id": "322e0846.b44bc8", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 808.3373260498047, - "y": 984.3333654403687, - "z": "5c846185.ea888", + "x": 768.3334197998047, + "y": 959.333366394043, + "z": "22c49458.dad37c", "wires": [ [ - "9023749d.2a65a8", - "13a32c23.faaff4" + "df350c49.f450e", + "a707d837.6f7a08" ] ] }, { - "id": "9eb3dfae.f51c4", + "id": "8cb29231.a6eaa", "type": "execute", "name": "get parent-service-data tmp.ar-url-psd", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>", "comments": "", "outputs": 1, - "x": 742.3372650146484, - "y": 942.3332047462463, - "z": "5c846185.ea888", + "x": 702.3333587646484, + "y": 917.3332056999207, + "z": "22c49458.dad37c", + "wires": [ + [] + ] + }, + { + "id": "9ea8a95d.e39878", + "type": "execute", + "name": "execute RestApiCallNode - delete-resource parent service data", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd-delete\" />\n\n", + "comments": "", + "outputs": 1, + "x": 773, + "y": 1168, + "z": "22c49458.dad37c", "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 52fe79c6..e8f26f76 100755 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -189,4 +189,33 @@ GENERIC-RESOURCE-API sdwan-network-topology-operation-activate ${project.version GENERIC-RESOURCE-API sdwan-network-topology-operation-create ${project.version} sync GENERIC-RESOURCE-API sdwan-network-topology-operation-deactivate ${project.version} sync GENERIC-RESOURCE-API sdwan-network-topology-operation-delete ${project.version} sync -GENERIC-RESOURCE-API validate-sdwan-network-input-parameters ${project.version} sync
\ No newline at end of file +GENERIC-RESOURCE-API validate-sdwan-network-input-parameters ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-tenant-auth ${project.version} sync +GENERIC-RESOURCE-API sdwan-attachment-topology-operation-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-attachment-topology-operation-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-attachment-topology-operation-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-attachment-topology-operation-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-device-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-saved-ar-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-wan-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-device-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-device-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-device-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-device-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-wanport-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-wanport-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-wanport-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vnf-topology-operation-wanport-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-wanport-vnf-topology-operation-underlay ${project.version} sync + + + + + + + + + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml index b4ceb0f8..c54ff02a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml @@ -297,6 +297,71 @@ </outcome>
</get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="token-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='success'>
+ <set>
+ <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+ </set>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-subscription"
+ key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type
+ AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'
+ force="true" pfx="tmp.AnAI-data-tenant">
+ <outcome value='success'>
+ <switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="tenant-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
@@ -408,8 +473,7 @@ pfx='pfx' local-only='false' force='false'>
<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
<parameter name="selflink" value="`$tmp.ar.self-link`" />
- <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
- <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
<parameter name="operational-status" value="Active" />
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml index 29094f70..75d05fa2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml @@ -236,7 +236,7 @@ value="`$connection-attachment-ar-identifiers.`" /> + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
- <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
@@ -244,17 +244,10 @@ value="`$connection-attachment-ar-identifiers.`" /> allotted-resource.id = $tmp.ar.allotted-resource-id"
pfx='pfx' local-only='false' force='false'>
<parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
- <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
- <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
- <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
- <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
- <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
- <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
- <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
- <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+ <parameter name="role" value="`$prop.connection-attachment.role`" />
+ <parameter name="vpn-name" value="`$prop.connection-attachment.sdwanVpnName`" />
<parameter name="selflink" value="`$tmp.ar.self-link`" />
- <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
- <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
<parameter name="operational-status" value="Created" />
<outcome value='failure'>
<return status='failure'>
@@ -270,7 +263,7 @@ value="`$connection-attachment-ar-identifiers.`" /> <parameter name="error-message" value="AAI failed" />
</return>
</outcome>
- </update>
+ </save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml index 2f87fbd5..2d10d4e3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml @@ -107,13 +107,48 @@ </return>
</outcome>
</execute>
+ <for index='ntidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >
+ <block atomic="true">
+ <switch test="`$mdsal-psd.service-data.networks.network[$ntidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <for index="paramidx" start="0" end="`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param_length`">
+ <block>
+ <switch test="`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.name' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.vpn1Id' value='`$mdsal-psd.service-data.networks.network[$ntidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
<set>
<parameter name='prop.siteAttachements_length' value='0' />
<parameter name='prop.siteIds_length' value='0' />
</set>
<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
<block atomic="true">
- <switch test="`$prop.ar.provided-allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
<outcome value='false'>
<block atomic="true">
<set>
@@ -177,20 +212,20 @@ <outcome value='success'>
<block atomic="true">
<for index='pnidx' start='0' end='`$mdsal-parentsd.service-data.networks.network_length`' >
- <block>
+ <block atomic="true">
<switch test="`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.request-information.request-action == 'ActivateSDWANConnectivityInstance'`">
<outcome value='true'>
<block atomic="true">
<for index="paramidx" start="0" end="`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param_length`">
<block>
- <switch test="`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`">
+ <switch test="`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'topology'`">
<outcome value='true'>
<set>
- <parameter name='prop.topology' value='`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
+ <parameter name='prop.topology' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
</set>
</outcome>
</switch>
- <switch test="`$mdsal-psd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">
+ <switch test="`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">
<outcome value='true'>
<set>
<parameter name='prop.vpn1Id' value='`$mdsal-parentsd.service-data.networks.network[$pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
@@ -302,6 +337,71 @@ </return>
</outcome>
</get-resource>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="post"/>
+ <parameter name="responsePrefix" value="token-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <outcome value='success'>
+ <set>
+ <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+ </set>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-subscription"
+ key= 'service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type
+ AND customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id'
+ force="true" pfx="tmp.AnAI-data-tenant">
+ <outcome value='success'>
+ <switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="tenant-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ </execute>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-wanport-vnf-topology-operation-underlay' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />
@@ -413,8 +513,7 @@ allotted-resource.id = $tmp.ar.allotted-resource-id"
pfx='pfx' local-only='false' force='false'>
<parameter name="selflink" value="`$tmp.ar.self-link`" />
- <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
- <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
<parameter name="operational-status" value="PendingDelete" />
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml index 753f41b6..28f6442a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml @@ -144,10 +144,14 @@ </block>
</outcome>
</switch>
- <set>
- <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" />
- <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource_length" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />
- </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`" />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='DELETE' />
+ <parameter name="responsePrefix" value="mdsal-psd-delete" />
+ </execute>
<set>
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
@@ -155,6 +159,26 @@ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id">
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ </delete>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml new file mode 100644 index 00000000..64885828 --- /dev/null +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml @@ -0,0 +1,50 @@ +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sdwan-get-tenant-auth' mode='sync'>
+ <block atomic="true">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-subscription"
+ key= 'service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type
+ AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id'
+ force="true" pfx="tmp.AnAI-data-tenant">
+ <outcome value='success'>
+ <switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />
+ </set>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="tenant-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ </execute>
+ </block>
+ </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml index 07cd7181..553852d3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml @@ -94,19 +94,22 @@ <set>
<parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="service-subscription"
- key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type
- AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>
- <parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' />
- </save>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >
+ <parameter name="source" value='`$prop.customer-id`'/>
+ <parameter name="outputPath" value="tmp.userAccountEmail"/>
+ <parameter name="target" value="@test.com"/>
+ </execute>
+ <set>
+ <parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />
+ <parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />
+ </set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-tenant.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
+ <parameter name="httpMethod" value="post"/>
<parameter name="responsePrefix" value="tenant-result"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -114,11 +117,18 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
</execute>
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-subscription"
+ key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type
+ AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>
+ <parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />
+ <!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->
+ </update>
<set>
<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
@@ -133,9 +143,24 @@ </block>
</outcome>
<outcome value='Other'>
- <set>
- <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />
- </set>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="tenant-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ </execute>
+ </block>
</outcome>
</switch>
</outcome>
@@ -165,7 +190,7 @@ </block>
<block atomic="true">
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -183,7 +208,7 @@ <parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml index 162385ab..abbe0898 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml @@ -96,6 +96,43 @@ </return>
</outcome>
</execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="service-subscription"
+ key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type
+ AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'
+ force="true" pfx="tmp.AnAI-data">
+ <outcome value='success'>
+ <switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>
+ <outcome value='Other'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="tenant-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ </execute>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing get token rest api" />
+ </return>
+ </outcome>
+ </get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml index 1f17ef4a..cb02af60 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml @@ -87,13 +87,14 @@ <block></block>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-device.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
+ <parameter name="httpMethod" value="post"/>
<parameter name="responsePrefix" value="deviceResp"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -132,22 +133,12 @@ <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device'
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device'
key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >
<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
<!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->
<parameter name='operational-status' value='Active' />
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
- key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
- AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id
- AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
- force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="device" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $vnf-topology-operation-input.vnf-information.vnf-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
- </save>
+ </update>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml index cba46ed5..ab122cc1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml @@ -107,8 +107,8 @@ <switch test='`$prop.sdncCreate`'>
<outcome value='true'>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device'
- key='device.devcie-id = $prop.vnf-id' >
- <parameter name='devcie-id' value='`$prop.vnf-id`' />
+ key='device.device-id = $prop.vnf-id' >
+ <parameter name='device-id' value='`$prop.vnf-id`' />
<parameter name='esn' value='`$prop.device.esn`' />
<parameter name='device-name' value='`$prop.device.name`' />
<parameter name='description' value='`$prop.device.description`' />
@@ -156,7 +156,7 @@ force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="device" />
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $prop.vnf-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.device-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />
</save>
<return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml index 7e88cf90..9ded93e9 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml @@ -62,7 +62,7 @@ </outcome>
</get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-device.json'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
<parameter name="format" value="json"/>
<parameter name="httpMethod" value="post"/>
@@ -80,6 +80,7 @@ <block></block>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<set>
<parameter name='prop.devices_length' value='1' />
</set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml index e6293ad4..77ad158c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml @@ -192,13 +192,14 @@ </return>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-port.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
+ <parameter name="httpMethod" value="post"/>
<parameter name="responsePrefix" value="portResp"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml index 064236dc..a182dc54 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml @@ -80,7 +80,7 @@ <parameter name="wan-port-config-name" value="`$prop.wan.name`" />
<parameter name="device-id" value="`$prop.wan.deviceName`" />
<parameter name='vlan-id' value="`$prop.wan.vlanId`" />
- <parameter name="ip-address" value="`$prop.wan.ipAdddress`" />
+ <parameter name="ip-address" value="`$prop.wan.ipAddress`" />
<parameter name="provider-ip-address" value="`$prop.wan.providerIpAddress`" />
<parameter name="input-bandwidth" value="`$prop.wan.inputBandwidth`" />
<parameter name="output-bandwidth" value="`$prop.wan.outputBandwidth`" />
@@ -101,7 +101,7 @@ force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="wan-port-config" />
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/wan-port-configs/wan-port-config/' + $prop.vnf-index`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="wan-port-config.id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="wan-port-config.wan-port-config-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" />
</save>
<return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml index ce57e786..bf5d4af1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml @@ -104,54 +104,6 @@ </return>
</outcome>
</execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-del.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports/action/batch-delete'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
- <parameter name="responsePrefix" value="portResp"/>
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
- </return>
- </outcome>
- <outcome value='success'>
- <block atomic="true"></block>
- </outcome>
- </execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-device-port-del.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
- <parameter name="responsePrefix" value="portResp"/>
- <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
- <parameter name="trustStorePassword" value="adminadmin"/>
- <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
- </return>
- </outcome>
- <outcome value='success'>
- <block atomic="true"></block>
- </outcome>
- </execute>
<set>
<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml index ebe9422c..1c7f5cbd 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml @@ -260,7 +260,7 @@ </set>
</outcome>
</switch>
- <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpnId'`">
+ <switch test="`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].name == 'vpn-id'`">
<outcome value='true'>
<set>
<parameter name='prop.vpnId' value='`$mdsal-psd.service-data.networks.network[$tmp.pnidx].network-data.network-request-input.network-input-parameters.param[$paramidx].value`' />
@@ -476,6 +476,10 @@ <outcome value='ActivateSDWANAttachmentInstance'>
<block atomic="true">
<set>
+ <parameter name='prop.hub.ipAddress' value="10.2.0.2" />
+ <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />
+ </set>
+ <set>
<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />
<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />
<parameter name='prop.route.deviceId' value='`$prop.hub.deviceId`' />
@@ -506,6 +510,10 @@ <outcome value='success'></outcome>
</execute>
<set>
+ <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />
+ <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />
+ </set>
+ <set>
<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />
<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />
<parameter name='prop.route.deviceId' value='`$prop.spoke.deviceId`' />
@@ -572,6 +580,10 @@ </block>
</for>
<set>
+ <parameter name='prop.hub.ipAddress' value="10.2.0.2" />
+ <parameter name='prop.hub.providerIpAddress' value="10.2.0.0/16" />
+ </set>
+ <set>
<parameter name='prop.route.id' value='`$prop.hubRouteId`' />
<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />
<parameter name='prop.route.siteId' value='`$prop.hub.siteId`' />
@@ -603,6 +615,10 @@ <outcome value='success'></outcome>
</execute>
<set>
+ <parameter name='prop.spoke.ipAddress' value="10.3.0.1" />
+ <parameter name='prop.spoke.providerIpAddress' value="10.3.0.0/16" />
+ </set>
+ <set>
<parameter name='prop.route.id' value='`$prop.spokeRouteId`' />
<parameter name='prop.route.vpnId' value='`$prop.vpnId`' />
<parameter name='prop.route.siteId' value='`$prop.spoke.siteId`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml index 9e9759cc..3fc0bc7f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml @@ -81,27 +81,43 @@ <switch test="`$prop.site.sdwan`">
<outcome value='true'>
<block atomic="true">
- <for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >
- <block atomic="true">
- <set>
- <parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />
- </set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <switch test="`$prop.site.controlPoint`">
+ <outcome value=''>
+ <block>
+ <set>
+ <parameter name='template.site.role' value="hub" />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <set>
+ <parameter name='template.site.role' value="spoke" />
+ </set>
+ <for index='cpidx' start='0' end='`$prop.site.controlpoints_length`' >
+ <block atomic="true">
+ <set>
+ <parameter name='prop.controlPtId' value='`$prop.site.controlpoints[$cpidx]`' />
+ </set>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="site-resource"
key="site-resource.site-resource-name = $prop.controlPtId AND
depth = '1'"
pfx='tmp.aai.controlPoints' local-only='false' >
- <outcome value='success'>
- <set>
- <parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />
- </set>
- </outcome>
- <outcome value='failure'>
- <block></block>
- </outcome>
- </get-resource>
- </block>
- </for>
+ <outcome value='success'>
+ <set>
+ <parameter name='prop.site.controlpoints[$cpidx]' value='`$tmp.aai.controlPoints.generated-site-id`' />
+ </set>
+ </outcome>
+ <outcome value='failure'>
+ <block></block>
+ </outcome>
+ </get-resource>
+ </block>
+ </for>
+ </block>
+ </outcome>
+ </switch>
<set>
<parameter name='prop.site.siteId' value="" />
</set>
@@ -151,8 +167,9 @@ <block></block>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-site.json'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-site-' + $template.site.role + '.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -199,12 +216,12 @@ <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >
<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
<parameter name='generated-site-id' value='`$site-result.success[0].id`' />
<parameter name='operational-status' value='Active' />
- </save>
+ </update>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml index 2b642df8..f431eb64 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml @@ -73,8 +73,8 @@ <parameter name='site-resource-id' value='`$prop.vnf-index`' />
<parameter name='site-resource-name' value='`$prop.site.name`' />
<parameter name='description' value='`$prop.site.description`' />
- <parameter name='type' value='prop.site.type' />
- <parameter name='role' value='prop.site.role' />
+ <parameter name='type' value='`$prop.site.type`' />
+ <parameter name='role' value='`$prop.site.role`' />
<parameter name='operational-status' value='Created' />
<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />
<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />
@@ -88,7 +88,7 @@ force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="site-resource" />
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/site-resources/site-resource/' + $prop.vnf-index`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="site-resource.id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="site-resource.site-resource-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" />
</save>
<return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml index 4599910e..de4d052d 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml @@ -56,7 +56,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
+ <parameter name="error-message" value="`'VNF is not in appropriate state for deactivate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
</return>
</outcome>
</switch>
@@ -67,11 +67,11 @@ </execute>
<for index='idx' start='0' end='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`' >
<block>
- <switch test="`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`">
+ <switch test="`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`">
<outcome value='true'>
<block atomic="true">
<set>
- <parameter name='prop.site.role' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ <parameter name='prop.site.type' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
<parameter name='prop.site.sdwan' value="true" />
</set>
</block>
@@ -137,6 +137,7 @@ <block></block>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-site-del.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/sites/action/batch-delete'`" />
@@ -150,15 +151,11 @@ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='success'>
+ <outcome value='failure'>
<block atomic="true"></block>
</outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
- </return>
+ <outcome value='Other'>
+ <block atomic="true"></block>
</outcome>
</execute>
</block>
@@ -178,11 +175,11 @@ <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >
<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
<parameter name='operational-status' value='PendingDelete' />
- </save>
+ </update>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml index 92842c9d..e0beaac9 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml @@ -1,281 +1,292 @@ -<service-logic - xmlns='http://www.onap.org/sdnc/svclogic' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> - <method rpc='sotn-attachment-topology-operation-create' mode='sync'> - <block atomic="true"> - <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'> - <outcome value=''> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' > - <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/> - <outcome value='failure'> - <return status='failure'> - <parameter name='error-code' value='' /> - <parameter name='error-message' value="An error occured while generation allotted resource ID" /> - </return> - </outcome> - </execute> - </outcome> - <outcome value='Other'> - <set> - <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' /> - </set> - </outcome> - </switch> - <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'> - <outcome value=''> - <set> - <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" /> - </set> - </outcome> - <outcome value='Other'> - <set> - <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' /> - </set> - </outcome> - </switch> - <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/' - + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/connection-attachment-topology/'` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' /> - <parameter name='contextPrefix' value='prop' /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/> - <parameter name="outputPath" value="tmp.ar-url"/> - <parameter name="target" value="{allotted-resource-id}"/> - <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='GET' /> - <parameter name="responsePrefix" value="mdsal-ar" /> - <outcome value='failure'> - <block></block> - </outcome> - <outcome value='success'> - <block atomic="true"> - <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'> - <outcome value='1'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error: Existing connection attachment allotted resource" /> - </return> - </outcome> - </switch> - </block> - </outcome> - </execute> - <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'> - <outcome value=''> - <set> - <parameter name='tmp.cidx' value="`0`" /> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" /> - </set> - </outcome> - <outcome value='Other'> - <block atomic="true"> - <set> - <parameter name='tmp.found-cidx' value="`false`" /> - </set> - <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' > - <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`"> - <outcome value='true'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." /> - </return> - </outcome> - </switch> - </for> - <switch test='`$tmp.found-cidx`'> - <outcome value='false'> - <block atomic="true"> - <set> - <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' /> - </set> - </block> - </outcome> - </switch> - </block> - </outcome> - </switch> - <set> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " /> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " /> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " /> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' /> - </set> - <set> - <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/> - <parameter name="outputPath" value="tmp.parent-ar-url"/> - <parameter name="target" value="{service-instance-id}"/> - <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="`$tmp.parent-ar-url`"/> - <parameter name="outputPath" value="tmp.parent-ar-url"/> - <parameter name="target" value="{allotted-resource-id}"/> - <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" /> - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='PUT' /> - <parameter name="responsePrefix" value="parent" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - </execute> - <set> - <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " /> - <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " /> - <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" /> - <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " /> - </set> - <set> - <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " /> - <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " /> - <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " /> - <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " /> - </set> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' -value="`$connection-attachment-ar-identifiers.`" /> - </set> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' > - <parameter name="outputPath" value="tmp.current-time" /> - </execute> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' /> - </set> - <block atomic="true"> - <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' > - <block atomic="true"> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' > - <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/> - <parameter name="regex" value="_"/> - <parameter name="ctx_memory_result_key" value="param-prefix"/> - </execute> - <set> - <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/> - </set> - </block> - </for> - <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call> - </block> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" /> - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='PUT' /> - <parameter name="responsePrefix" value="mdsal-ar" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - </execute> - <set> - <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> - <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/> - <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' - + $connection-attachment-topology-operation-input.service-information.service-instance-id - + '/service-data/service-topology/'`"/> - </set> - <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="allotted-resource" - key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND - service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND - service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND - allotted-resource.id = $tmp.ar.allotted-resource-id" - pfx='pfx' local-only='false' force='false'> - <parameter name="id" value="`$tmp.ar.allotted-resource-id`" /> - <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" /> - <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" /> - <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" /> - <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" /> - <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" /> - <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" /> - <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" /> - <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" /> - <parameter name="selflink" value="`$tmp.ar.self-link`" /> - <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /> - <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /> - <parameter name="operational-status" value="Created" /> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - </update> - <return status='success'> - <parameter name="ack-final-indicator" value="Y" /> - <parameter name="error-code" value="200" /> - <parameter name="error-message" value="`$error-message`" /> - </return> - </block> - </method> -</service-logic> +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+ <block atomic="true">
+ <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+ <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+ </return>
+ </outcome>
+ </execute>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+ <outcome value=''>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+ </set>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='failure'>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true">
+ <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+ <outcome value='1'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </execute>
+ <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+ <outcome value=''>
+ <set>
+ <parameter name='tmp.cidx' value="`0`" />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.found-cidx' value="`false`" />
+ </set>
+ <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+ <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <outcome value='true'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+ </return>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$tmp.found-cidx`'>
+ <outcome value='false'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+ <parameter name="outputPath" value="tmp.parent-ar-url"/>
+ <parameter name="target" value="{service-instance-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.parent-ar-url`"/>
+ <parameter name="outputPath" value="tmp.parent-ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <parameter name="responsePrefix" value="parent" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+ <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+ <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.'
+value="`$connection-attachment-ar-identifiers.`" />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+ <parameter name="outputPath" value="tmp.current-time" />
+ </execute>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+ </set>
+ <block atomic="true">
+ <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
+ <block atomic="true">
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="param-prefix"/>
+ </execute>
+ <set>
+ <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+ </set>
+ </block>
+ </for>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+ </block>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="allotted-resource"
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id"
+ pfx='pfx' local-only='false' force='false'>
+ <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
+ <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+ <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+ <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+ <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+ <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+ <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+ <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
+ <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+ <parameter name="selflink" value="`$tmp.ar.self-link`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+ <parameter name="operational-status" value="Created" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="allotted-resource"
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id"
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+ </save>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml index 4a6baad7..5452fc8e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml @@ -1,400 +1,416 @@ -<service-logic - xmlns='http://www.onap.org/sdnc/svclogic' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> - <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'> - <block atomic="true"> - <set> - <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' /> - <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' /> - </set> - <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/' - + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/connection-attachment-topology/'` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' /> - <parameter name='contextPrefix' value='prop' /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/> - <parameter name="outputPath" value="tmp.ar-url"/> - <parameter name="target" value="{allotted-resource-id}"/> - <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='GET' /> - <parameter name="responsePrefix" value="mdsal-ar" /> - <outcome value='success'> - <block atomic="true"> - <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'> - <outcome value='1'> - <block atomic='true'> - <set> - <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' /> - </set> - <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'> - <outcome value='Active'> - <block></block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" - value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" /> - </return> - </outcome> - </switch> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' /> - </set> - </block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: SOTN resource not found" /> - </return> - </outcome> - </switch> - </block> - </outcome> - <outcome value='Other'> - <block atomic="true"> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: SOTN resource not found" /> - </return> - </block> - </outcome> - </execute> - <block atomic="true"> - <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call> - </block> - <set> - <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/> - <parameter name="outputPath" value="tmp.ar-url-psd"/> - <parameter name="target" value="{service-instance-id}"/> - <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='GET' /> - <parameter name="responsePrefix" value="mdsal-psd" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: SOTN resource not found" /> - </return> - </outcome> - </execute> - <set> - <parameter name='tmp.found-in-ar' value='false' /> - <parameter name='tmp.found-in-network' value='false' /> - <parameter name='tmp.ep-available' value='false' /> - </set> - <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'> - <outcome value='2'> - <block atomic="true"> - <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' > - <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`"> - <outcome value='true'> - <block></block> - </outcome> - <outcome value='false'> - <block atomic="true"> - <set> - <parameter name='tmp.pidx' value='`$pidx`' /> - <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' /> - <parameter name='tmp.found-in-ar' value='true' /> - <parameter name='tmp.ep-available' value='true' /> - </set> - </block> - </outcome> - </switch> - </for> - </block> - </outcome> - <outcome value='1'> - <block atomic="true"> - <switch test='`$mdsal-psd.service-data.networks.network_length`'> - <outcome value='1'> - <block atomic="true"> - <set> - <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' /> - </set> - <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' > - <block> - <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`"> - <outcome value='true'> - <set> - <parameter name='tmp.found-in-network' value='true' /> - <parameter name='tmp.ep-available' value='true' /> - </set> - </outcome> - </switch> - <return status='success'> - <parameter name="ack-final-indicator" value="Y" /> - <parameter name="error-code" value="200" /> - <parameter name="error-message" value="`$error-message`" /> - </return> - </block> - </for> - </block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: Incorrect state found more then 1 network" /> - </return> - </outcome> - </switch> - </block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: SOTN resource not found" /> - </return> - </outcome> - </switch> - <switch test='`$tmp.ep-available`'> - <outcome value='false'> - <block></block> - </outcome> - <outcome value='true'> - <block atomic="true"> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="connectivity" - key="connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND - depth = '1'" - pfx='tmp.connectivity' local-only='false' > - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: Connectivity resource not found" /> - </return> - </outcome> - <outcome value='success'> - <block> - <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' > - <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'> - <outcome value='vpn-binding'> - <block atomic="true"> - <set> - <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' > - <parameter name="original_string" value='`$tmp.vpn-name`'/> - <parameter name="regex" value="-"/> - <parameter name="ctx_memory_result_key" value="route1"/> - <outcome value='success'> - <set> - <parameter name='tmp.node-id' value='`$route1[0]`' /> - </set> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='error-code' value='' /> - <parameter name='error-message' value="An error occured while splitting sna1_route" /> - </return> - </outcome> - </execute> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="pnf" - key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id - AND pnf.pnf-name = $tmp.node-id - AND depth = '0'" - pfx='tmp.aai.pnf' local-only='false' > - <outcome value='success'> - <set> - <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" /> - </set> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" /> - </return> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" /> - </return> - </outcome> - </get-resource> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="esr-thirdparty-sdnc" - key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND - depth = '1'" - pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' > - <outcome value='success'> - <set> - <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" /> - <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" /> - <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" /> - </set> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" /> - </return> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" /> - </return> - </outcome> - </get-resource> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.vpn-name`" /> - <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" /> - <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" /> - <parameter name="format" value="json"/> - <parameter name="httpMethod" value="delete"/> - <parameter name="responsePrefix" value="vpn-result"/> - <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/> - <parameter name="trustStorePassword" value="adminadmin"/> - <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/> - <parameter name="keyStorePassword" value="adminadmin"/> - <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" /> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error executing Create vpn rest api" /> - </return> - </outcome> - <outcome value='success'> - <block atomic="true"></block> - </outcome> - </execute> - </block> - </outcome> - </switch> - </for> - </block> - </outcome> - </get-resource> - </block> - </outcome> - </switch> - <set> - <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " /> - <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" /> - <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " /> - </set> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' > - <parameter name="outputPath" value="tmp.current-time" /> - </execute> - <set> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' /> - <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' /> - </set> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" /> - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='PUT' /> - <parameter name="responsePrefix" value="mdsal-ar" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - </execute> - <set> - <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> - <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/> - <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' - + $connection-attachment-topology-operation-input.service-information.service-instance-id - + '/service-data/service-topology/'`"/> - </set> - <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="allotted-resource" - key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND - service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND - service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND - allotted-resource.id = $tmp.ar.allotted-resource-id" - pfx='pfx' local-only='false' force='false'> - <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" /> - <parameter name="selflink" value="`$tmp.ar.self-link`" /> - <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /> - <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /> - <parameter name="operational-status" value="PendingDelete" /> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - </update> - <return status='success'> - <parameter name="ack-final-indicator" value="Y" /> - <parameter name="error-code" value="200" /> - <parameter name="error-message" value="`$error-message`" /> - </return> - </block> - </method> -</service-logic>
\ No newline at end of file +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <block atomic="true">
+ <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+ <outcome value='1'>
+ <block atomic='true'>
+ <set>
+ <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+ </set>
+ <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+ <outcome value='Active'>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message"
+ value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+ </return>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: SOTN resource not found" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: SOTN resource not found" />
+ </return>
+ </block>
+ </outcome>
+ </execute>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+ </block>
+ <set>
+ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="outputPath" value="tmp.ar-url-psd"/>
+ <parameter name="target" value="{service-instance-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-psd" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: SOTN resource not found" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='tmp.found-in-ar' value='false' />
+ <parameter name='tmp.found-in-network' value='false' />
+ <parameter name='tmp.ep-available' value='false' />
+ </set>
+ <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+ <outcome value='2'>
+ <block atomic="true">
+ <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+ <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <outcome value='true'>
+ <block></block>
+ </outcome>
+ <outcome value='false'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.pidx' value='`$pidx`' />
+ <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+ <parameter name='tmp.found-in-ar' value='true' />
+ <parameter name='tmp.ep-available' value='true' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ <outcome value='1'>
+ <block atomic="true">
+ <switch test='`$mdsal-psd.service-data.networks.network_length`'>
+ <outcome value='1'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />
+ </set>
+ <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+ <block>
+ <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.found-in-network' value='true' />
+ <parameter name='tmp.ep-available' value='true' />
+ </set>
+ </outcome>
+ </switch>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </for>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: SOTN resource not found" />
+ </return>
+ </outcome>
+ </switch>
+ <switch test='`$tmp.ep-available`'>
+ <outcome value='false'>
+ <block></block>
+ </outcome>
+ <outcome value='true'>
+ <block atomic="true">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="connectivity"
+ key="connectivity.connectivity-id = $mdsal-psd.service-data.networks.network[0].network-id AND
+ depth = '1'"
+ pfx='tmp.connectivity' local-only='false' >
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: Connectivity resource not found" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block>
+ <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >
+ <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>
+ <outcome value='vpn-binding'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$tmp.vpn-name`'/>
+ <parameter name="regex" value="-"/>
+ <parameter name="ctx_memory_result_key" value="route1"/>
+ <outcome value='success'>
+ <set>
+ <parameter name='tmp.node-id' value='`$route1[0]`' />
+ <parameter name='tmp.actual.vpn-name' value='`$route1[1]`' />
+ </set>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value="An error occured while splitting sna1_route" />
+ </return>
+ </outcome>
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="pnf"
+ key="pnf.pnf-name = $tmp.node-id
+ AND depth = '0'"
+ pfx='tmp.aai.pnf' local-only='false' >
+ <outcome value='success'>
+ <set>
+ <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+ </set>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+ </return>
+ </outcome>
+ </get-resource>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="esr-thirdparty-sdnc"
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND
+ depth = '1'"
+ pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+ <outcome value='success'>
+ <set>
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+ <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+ </set>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+ </return>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="delete"/>
+ <parameter name="responsePrefix" value="vpn-result"/>
+ <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+ <parameter name="trustStorePassword" value="adminadmin"/>
+ <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Create vpn rest api" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true"></block>
+ </outcome>
+ </execute>
+ <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+ key='vpn-binding.vpn-id = $tmp.vpn-name' >
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ </delete>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+ <parameter name="outputPath" value="tmp.current-time" />
+ </execute>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ </set>
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="allotted-resource"
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id"
+ pfx='pfx' local-only='false' force='false'>
+ <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+ <parameter name="selflink" value="`$tmp.ar.self-link`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+ <parameter name="operational-status" value="PendingDelete" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ </update>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml index f2ac12f1..2d723a70 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml @@ -1,185 +1,189 @@ -<service-logic - xmlns='http://www.onap.org/sdnc/svclogic' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> - <method rpc='sotn-attachment-topology-operation-delete' mode='sync'> - <block atomic="true"> - <set> - <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' /> - <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' /> - </set> - <set> - <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/' - + $tmp.ar.allotted-resource-id - + '/allotted-resource-data/connection-attachment-topology/'` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' > - <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' /> - <parameter name='contextPrefix' value='prop' /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/> - <parameter name="outputPath" value="tmp.ar-url"/> - <parameter name="target" value="{allotted-resource-id}"/> - <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='Delete' /> - <parameter name="responsePrefix" value="mdsal-ar" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" /> - </return> - </outcome> - </execute> - <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'> - <outcome value=''> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." /> - </return> - </outcome> - <outcome value='Other'> - <block atomic="true"> - <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' > - <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`"> - <outcome value='true'> - <block atomic="true"> - <set> - <parameter name='tmp.cidx' value='`$cidx`' /> - </set> - </block> - </outcome> - </switch> - </for> - <switch test="`$tmp.cidx`"> - <outcome value=''> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="resource to be deleted is not available in mdsal" /> - </return> - </outcome> - </switch> - </block> - </outcome> - </switch> - <set> - <parameter name="service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx]." value="" /> - <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' /> - </set> - <set> - <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " /> - </set> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' > - <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/> - <parameter name="outputPath" value="tmp.ar-url-psd"/> - <parameter name="target" value="{service-instance-id}"/> - <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/> - </execute> - <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > - <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' /> - <parameter name='restapiUser' value='`$prop.controller.user`' /> - <parameter name='restapiPassword' value='`$prop.controller.pwd`' /> - <parameter name='format' value='json' /> - <parameter name='httpMethod' value='GET' /> - <parameter name="responsePrefix" value="mdsal-psd" /> - <outcome value='success'> - <block></block> - </outcome> - <outcome value='Other'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="404" /> - <parameter name="error-message" value="Error: SOTN resource not found" /> - </return> - </outcome> - </execute> - <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'> - <outcome value=''> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." /> - </return> - </outcome> - <outcome value='Other'> - <block atomic="true"> - <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' > - <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`"> - <outcome value='true'> - <block atomic="true"> - <set> - <parameter name='tmp.pidx' value='`$pidx`' /> - </set> - </block> - </outcome> - </switch> - </for> - <switch test="`$tmp.pidx`"> - <outcome value=''> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="resource to be deleted is not available in mdsal" /> - </return> - </outcome> - </switch> - </block> - </outcome> - </switch> - <set> - <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" /> - <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource_length" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' /> - </set> - <set> - <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' /> - <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/> - <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' - + $connection-attachment-topology-operation-input.service-information.service-instance-id - + '/service-data/service-topology/'`"/> - </set> - <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource' - key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND - service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND - service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND - allotted-resource.id = $tmp.ar.allotted-resource-id"> - <outcome value='failure'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="AAI failed" /> - </return> - </outcome> - </delete> - <return status='success'> - <parameter name="ack-final-indicator" value="Y" /> - <parameter name="error-code" value="200" /> - <parameter name="error-message" value="`$error-message`" /> - </return> - </block> - </method> -</service-logic>
\ No newline at end of file +<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+ <method rpc='sotn-attachment-topology-operation-delete' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='Delete' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+ <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.cidx' value='`$cidx`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.cidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name="service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx]." value="" />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+ <parameter name="outputPath" value="tmp.ar-url-psd"/>
+ <parameter name="target" value="{service-instance-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-psd" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: SOTN resource not found" />
+ </return>
+ </outcome>
+ </execute>
+ <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+ <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.pidx' value='`$pidx`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.pidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.ar-url-psd + '/provided-allotted-resources/provided-allotted-resource/' + $tmp.ar.allotted-resource-id`" />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='DELETE' />
+ <parameter name="responsePrefix" value="mdsal-psd-delete" />
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ </set>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id">
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </return>
+ </outcome>
+ </delete>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic>
diff --git a/platform-logic/restapi-templates/src/main/json/actokentemplate.json b/platform-logic/restapi-templates/src/main/json/actokentemplate.json index 31bf0ee2..934b9b46 100644 --- a/platform-logic/restapi-templates/src/main/json/actokentemplate.json +++ b/platform-logic/restapi-templates/src/main/json/actokentemplate.json @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ { "userName": ${prop.sdncRestApi.thirdpartySdnc.user}, diff --git a/platform-logic/restapi-templates/src/main/json/oof-getpath.json b/platform-logic/restapi-templates/src/main/json/oof-getpath.json index f407f64b..feab0bc0 100644 --- a/platform-logic/restapi-templates/src/main/json/oof-getpath.json +++ b/platform-logic/restapi-templates/src/main/json/oof-getpath.json @@ -1,23 +1,3 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - CCSDK - * ================================================================================ - * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { "srcPort": { "src-access-topology-id": ${prop.connection-attachment.access-topology-id}, @@ -34,3 +14,4 @@ "dst-access-ltp-id": ${prop.remote.connection-attachment.access-ltp-id} } } + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json index 4d3c15a8..efe5fdd0 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-device-del.json @@ -4,3 +4,4 @@ } ] } + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json index 101723cf..a871f114 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-network-orchestration.json @@ -1,13 +1,25 @@ { - "bgpAsNum": 65101, + "bpgAsNum": 65101, "vpnType": "dsvpn", - "siteScale": 30, + "siteScale":"30", "dsvpnIPpool": ["100.1.0.0/16"], - "innerTunnelPool": ["101.1.0.0/16"], + "innerTunnelIPpool": [ + "101.1.0.0/16" + ], "interConnectIPpool": "102.1.0.0/16", - "transportNetworks": [ {} ], + "transportNetworks": [ + { + "name": "net001", + "routingDomain": "routing001", + "description": "string" + } + ], + "routingDomain":[{ + "name": "routing001", + "ipsecEncryption":false + }], "ipsecEncryptionParameter": { - "encryptionAlgorithm": "AES128", - "preSharedKey": "Admin@12134", + "encrptionAlgorithm":"AES128", + "preSharedKey": "Admin@12134==========================================" } }
\ No newline at end of file diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port.json b/platform-logic/restapi-templates/src/main/json/sdwan-port.json index 694d3a67..8d937586 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-port.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-port.json @@ -4,16 +4,11 @@ "portType": ${prop.wan.portType}, "portNumber": ${prop.wan.portNumber}, "deviceId": ${prop.wan.deviceId}, - "portSwitch": null, + "portSwitch": "layer3-port", "linkInfo": { "linkType": "Ethernet", - "cellular": null, - "atm": null, "ethernet": { - "negotiateMode": "auto", - "media": null, - "duplex": null, - "speed" : "10" + "negotiationMode": "auto" } } } diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json index 60cd98a4..daa6a335 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-del.json @@ -6,3 +6,4 @@ ] } + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json new file mode 100644 index 00000000..1dcedd9b --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-hub.json @@ -0,0 +1,30 @@ +{ + "sites": [ + { + "name": ${prop.site.name}, + "locations": [ + { + "name": ${prop.site.location-name}, + "address": ${prop.site.location-address}, + "postcode": ${prop.site.location-postcode} + } + ], + "devices": [${repeat:prop.site.deviceId_length: + { + "deviceId": ${prop.site.deviceId[${1}]}, + "locationName": ${prop.site.location-name}, + }, + } + ], + "siteType": ${prop.site.type}, + "role": [${repeat:prop.site.roles_length: + ${prop.site.roles[${1}]}, + } + ], + "controlPoints": [], + "description": "--------role:dsvpn-hub---------------" + } + ] +} + + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-site.json b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json index 3e40fb92..1e50e76f 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-site.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-site-spoke.json @@ -7,20 +7,16 @@ { "name": ${prop.site.location-name}, "address": ${prop.site.location-address}, - "postcode": ${prop.site.location-postcode}, - "latitude": ${prop.site.location-latitude}, - "longitude": ${prop.site.location-longitude} + "postcode": ${prop.site.location-postcode} } ], - "devices": [${repeat:prop.site.deviceId_length: { - "deviceId":${prop.site.deviceId[${1}]}, + "deviceId": ${prop.site.deviceId[${1}]}, "locationName": ${prop.site.location-name}, }, } ], - "siteType": ${prop.site.type}, "role": [${repeat:prop.site.roles_length: ${prop.site.roles[${1}]}, @@ -29,14 +25,10 @@ "controlPoints": [${repeat:prop.site.controlpoints_length: ${prop.site.controlpoints[${1}]}, } - ], - "contact":{ - "emails":[${repeat:prop.site.email_length: - ${prop.site.email[${1}]}, - } - ] - }, - "description": ${prop.site.description} + ], + "description": "--------role:dsvpn-hub---------------" } ] } + + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json index a32136a0..6161b1bd 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-tenant.json @@ -1,12 +1,12 @@ { "tenantName": ${prop.customer-id}, - "tenantEmail": "test@test.com", + "tenantEmail": ${prop.userEmail}, "tenantPhone": "8888888888", "tenantDescription": "This is a test tenant created by ONAP", "tenantAddress": "Road123", "limitAccountNum": 1000, - "userAccount": "test@test.com", - "userEmail": "test@test.com", + "userAccount": ${prop.userAccount}, + "userEmail": ${prop.userEmail}, "sendInitEmailEnable": "true", "countryCode": "CN", "userPassword": "Test@12345" diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json index eed2c32e..ed6161b8 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-underlay.json @@ -1,18 +1,17 @@ { - "routes": [ - { - "id": ${prop.route.id}, - "vpnId": ${prop.vpnId}, - "siteId": ${prop.route.siteId}, - "deviceId": ${prop.route.deviceId}, - "tnpId": ${prop.route.wanportId}, - "priority": 60, - "destination": ${prop.route.providerIpAddress}, - "nextHopType": "ip-address", - "ipAddress": ${prop.route.ipAddress}, - "track": "false", - "target": null - } - ] + "routes": [ + { + "id": ${prop.route.id}, + "vpnId": ${prop.vpnId}, + "siteId": ${prop.route.siteId}, + "deviceId": ${prop.route.deviceId}, + "destinationAddressMask": ${prop.route.providerIpAddress}, + "priority": 60, + "nextHopType": "ip-address", + "ipAddress": ${prop.route.ipAddress}, + "track": false, + "target": null + } + ] } diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json new file mode 100644 index 00000000..d6814d5c --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-create.json @@ -0,0 +1,9 @@ +{ + "vpns": [ + { + "name": ${prop.name}, + "id": ${prop.vpn1Id} + } + ] +} + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json new file mode 100644 index 00000000..713ef759 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology-create.json @@ -0,0 +1,11 @@ +{ + "vpnId": ${prop.vpn1Id}, + "areas": [ + { + "name": "area1", + "areaType": "backbone", + "topologyType": ${prop.topology} + } + ] +} + diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json index 6d22cb9e..89da9a28 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn-topology.json @@ -3,13 +3,14 @@ "areas": [ { "name": "area1", - "areaType": "leaf", + "areaType": "backbone", "topologyType": ${prop.topology}, - "siteAttachements": [${repeat:prop.siteAttachement_length: - {"siteId": [${repeat:prop.siteAttachement[${1}].siteId_length: - ${prop.siteAttachement[${1}].siteId[${2}]},} + "siteAttachments": [${repeat:prop.siteAttachements_length: + {"siteId": ${prop.siteAttachements[${1}].siteId}, + "role": [${repeat:prop.siteAttachements[${1}].roles_length: + ${prop.siteAttachements[${1}].roles[${2}]}, + } ], - "role": ${prop.siteAttachement[${1}].role}, "workMode": "with-interconnection", "sitePriority": "active", "borders": null diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json index ce3b65d3..11412b41 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-vpn.json @@ -2,6 +2,7 @@ "vpns": [ { "name": ${prop.name}, + "id": ${prop.vpn1Id}, "siteIds": [ ${repeat:prop.siteIds_length: ${prop.siteIds[${1}]}, diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json index e3c45939..55e603ec 100644 --- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json +++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port.json @@ -5,19 +5,19 @@ "siteId": ${prop.wan.siteId}, "deviceId": ${prop.wan.deviceId}, "portId": ${prop.wan.devicePortId}, - "inSubInterfaces": "false", - "vlanId": null, + "inSubInterface": false, + "vlanId": "null", "ipConnection": { "ipv4": { "publicIP": ${prop.wan.ip-address}, - "accessType": "IPOE", + "accessType": "IPoE", "ipMode": "Static", "customerAddress": ${prop.wan.ip-address}, "prefixLength": ${prop.wan.prefixLength}, "providerAddress": ${prop.wan.providerIpAddress}, - "peerIp": null, - "userName": null, - "userKey": null + "peerIp": "null", + "userName": "null", + "userKey": "null" } }, "transportNetworkInfo": { @@ -30,6 +30,15 @@ "mtu": 1500, "TCPmss": 1200 }, + "ntp": [ + { + "serverIP": "11.11.11.11", + "authentication": false, + "mode": "MD5", + "authKey": "123456", + "authId": 123 + } + ], "description": ${prop.wan.description} } ] |