diff options
author | 2018-09-07 14:38:22 +0530 | |
---|---|---|
committer | 2018-09-07 17:24:17 +0530 | |
commit | 55b429cfc73802e3e52fa2f3864ecc4cdd552728 (patch) | |
tree | 5eee99f5b0b7e039ea0250d5549ca25aae74fd04 /platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json | |
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/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json | 609 |
1 files changed, 343 insertions, 266 deletions
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": [ [] ] |