diff options
| author |   shashikanth.vh <shashikanth.vh@huawei.com> | 2019-04-29 16:16:46 +0530 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2019-05-05 23:03:23 +0000 |
| commit | 838b0cd5c6367d7a6048f8436751c718ecc6e07e (patch) | |
| tree | 443fd36221e213919e0a0a1971249b8bdc3207d6 /platform-logic/generic-resource-api | |
| parent | 32910e33d3bd0034b799604fb9112a4701122844 (diff) | |
fixed WAN port deactivate issue
On delete of WAN port controller returned 500
error code, this issue fixed
Change-Id: Iebcd3b44b830bd067f6858230e339b6338964773
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
(cherry picked from commit aaf1d3598cb0da403c6e4df3f550c9f7b666d8dc [formerly 4db3c5b014e3e5002e2df59ab922268bc0fdce08])
Former-commit-id: 494b89509f15733336d4e588984bc8d37d9aa770
Diffstat (limited to 'platform-logic/generic-resource-api')
2 files changed, 285 insertions, 293 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.json index 04265aad..ab5b2860 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.json @@ -1,34 +1,34 @@ [
{
- "id": "e69423a5.584ae",
+ "id": "40773877.e7f878",
"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": 849.5312957763672,
- "y": 366.07812881469727,
- "z": "4fee9402.f5c9bc",
+ "x": 823,
+ "y": 371.07812309265137,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
},
{
- "id": "a2e25c17.8e9c",
+ "id": "8daa10ea.b957b",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 130,
- "y": 54.0000057220459,
- "z": "4fee9402.f5c9bc",
+ "x": 103.46870422363281,
+ "y": 59,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "3fa8aef8.7e3df2"
+ "61fe2f58.e4c3e"
]
]
},
{
- "id": "3fa8aef8.7e3df2",
+ "id": "61fe2f58.e4c3e",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -36,797 +36,797 @@ "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": 261.2856903076172,
- "y": 103.23811435699463,
- "z": "4fee9402.f5c9bc",
+ "x": 234.75439453125,
+ "y": 108.23810863494873,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "2162b779.2eb3a8"
+ "a074f76.b34de08"
]
]
},
{
- "id": "2162b779.2eb3a8",
+ "id": "a074f76.b34de08",
"type": "method",
"name": "method sdwan-vf-operation-wanport-deactivate",
"xml": "<method rpc='sdwan-vf-operation-wanport-deactivate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 264.4286193847656,
- "y": 188.00003814697266,
- "z": "4fee9402.f5c9bc",
+ "x": 237.89732360839844,
+ "y": 193.00003242492676,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "832591c7.4ef99"
+ "467c4bfc.2f5b64"
]
]
},
{
- "id": "7df3c0c6.f5b88",
+ "id": "1de0c391.b5a28c",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 834.53125,
- "y": 203.07812213897705,
- "z": "4fee9402.f5c9bc",
+ "x": 807.9999542236328,
+ "y": 208.07811641693115,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "112ac69c.661419"
+ "5ecb025.1081afc"
]
]
},
{
- "id": "112ac69c.661419",
+ "id": "5ecb025.1081afc",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 1086.5313415527344,
- "y": 201.7447853088379,
- "z": "4fee9402.f5c9bc",
+ "x": 1060.0000457763672,
+ "y": 206.744779586792,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "9fb48502.518d68"
+ "997362c3.0cc6a"
]
]
},
{
- "id": "e66ecc6.7152f3",
+ "id": "fdccb3cb.83cc4",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1458.1978302001953,
- "y": 203.74478816986084,
- "z": "4fee9402.f5c9bc",
+ "x": 1431.6665344238281,
+ "y": 208.74478244781494,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "9fb48502.518d68",
+ "id": "997362c3.0cc6a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1304.864658355713,
- "y": 203.74476718902588,
- "z": "4fee9402.f5c9bc",
+ "x": 1278.3333625793457,
+ "y": 208.74476146697998,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "e66ecc6.7152f3"
+ "fdccb3cb.83cc4"
]
]
},
{
- "id": "ff28f3d.3169d1",
+ "id": "5cb64270.b68bbc",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 848.9518432617188,
- "y": 158.5819911956787,
- "z": "4fee9402.f5c9bc",
+ "x": 822.4205474853516,
+ "y": 163.5819854736328,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "a6a2da6e.228e08"
+ "2713a7c6.86b758"
]
]
},
{
- "id": "a6a2da6e.228e08",
+ "id": "2713a7c6.86b758",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1035.618522644043,
- "y": 157.9152889251709,
- "z": "4fee9402.f5c9bc",
+ "x": 1009.0872268676758,
+ "y": 162.915283203125,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "c0d198d3.426068"
+ "a37833b2.185f8"
]
]
},
{
- "id": "c0d198d3.426068",
+ "id": "a37833b2.185f8",
"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=\"There are no VNFs in MD-SAL\" />\n",
"comments": "",
- "x": 1217.2851486206055,
- "y": 157.9152889251709,
- "z": "4fee9402.f5c9bc",
+ "x": 1190.7538528442383,
+ "y": 162.915283203125,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "61f42e0f.accb4",
+ "id": "8159840a.e34b38",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1487.5312576293945,
- "y": 373.0781125728972,
- "z": "4fee9402.f5c9bc",
+ "x": 1460.9999618530273,
+ "y": 378.0781068508513,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "ce0facb9.acf8f"
+ "2d5467cf.141cf8"
]
]
},
{
- "id": "d0cbbcf7.18e0c",
+ "id": "92550d61.5702c",
"type": "switchNode",
"name": "switch vf-module-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1906.8170928955078,
- "y": 375.6496305465698,
- "z": "4fee9402.f5c9bc",
+ "x": 1880.2857971191406,
+ "y": 380.6496248245239,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "ada2f692.ece248"
+ "e5b5e260.275be"
]
]
},
{
- "id": "bd278e04.68d68",
+ "id": "6e4eaafb.1605b4",
"type": "set",
"name": "set vf-module-length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1474.102882385254,
- "y": 336.8559989929199,
- "z": "4fee9402.f5c9bc",
+ "x": 1447.5715866088867,
+ "y": 341.855993270874,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "4efb1646.df29b8",
+ "id": "fb40ae0e.bbae5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1278.4042778015137,
- "y": 350.2368840877898,
- "z": "4fee9402.f5c9bc",
+ "x": 1251.8729820251465,
+ "y": 355.2368783657439,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "61f42e0f.accb4",
- "bd278e04.68d68",
- "49047f5d.3dde6"
+ "8159840a.e34b38",
+ "6e4eaafb.1605b4",
+ "3aa9d72d.eaee98"
]
]
},
{
- "id": "1c241e5.3b7e6e2",
+ "id": "338d154d.d328ea",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1134.047233581543,
- "y": 350.3003720943816,
- "z": "4fee9402.f5c9bc",
+ "x": 1107.5159378051758,
+ "y": 355.3003663723357,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "4efb1646.df29b8"
+ "fb40ae0e.bbae5"
]
]
},
{
- "id": "8e428583.69a8e8",
+ "id": "7e611b6d.db2764",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 898.047215461731,
- "y": 277.3003845214844,
- "z": "4fee9402.f5c9bc",
+ "x": 871.5159196853638,
+ "y": 282.3003787994385,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "1c241e5.3b7e6e2",
- "45b16795.1e16b8",
- "5c72c52f.a612dc"
+ "338d154d.d328ea",
+ "7a0a695.917c098",
+ "8d2d99ea.4b0448"
]
]
},
{
- "id": "45b16795.1e16b8",
+ "id": "7a0a695.917c098",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 1139.5312519073486,
- "y": 249.0781135559082,
- "z": "4fee9402.f5c9bc",
+ "x": 1112.9999561309814,
+ "y": 254.0781078338623,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "b89d0343.04bd1"
+ "589e99a4.cf28d8"
]
]
},
{
- "id": "5c72c52f.a612dc",
+ "id": "8d2d99ea.4b0448",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1141.5624408721924,
- "y": 286.10942459106445,
- "z": "4fee9402.f5c9bc",
+ "x": 1115.0311450958252,
+ "y": 291.10941886901855,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "b89d0343.04bd1"
+ "589e99a4.cf28d8"
]
]
},
{
- "id": "b89d0343.04bd1",
+ "id": "589e99a4.cf28d8",
"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=\"vf-module-operation-input.vf-module-request-input.vf-id not found in service-data\" />\n",
"comments": "",
- "x": 1299.3399562835693,
- "y": 266.9983730316162,
- "z": "4fee9402.f5c9bc",
+ "x": 1272.8086605072021,
+ "y": 271.9983673095703,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "ada2f692.ece248",
+ "id": "e5b5e260.275be",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2110.53133392334,
- "y": 374.0781369502656,
- "z": "4fee9402.f5c9bc",
+ "x": 2084.0000381469727,
+ "y": 379.0781312282197,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "8cb3d733.8b9cc8"
+ "9a9a684f.c7ffd8"
]
]
},
{
- "id": "8cb3d733.8b9cc8",
+ "id": "9a9a684f.c7ffd8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1872.8745422363281,
- "y": 476.16428661346436,
- "z": "4fee9402.f5c9bc",
+ "x": 1846.343246459961,
+ "y": 481.16428089141846,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "e9572390.a2ce1",
- "7be5423c.87235c",
- "39502de7.a9fc62"
+ "14405ad7.cb9e35",
+ "de34e0a1.fef5c",
+ "c4a0e771.25eac8"
]
]
},
{
- "id": "e9572390.a2ce1",
+ "id": "14405ad7.cb9e35",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
"comments": "",
- "x": 2114.7612342834473,
- "y": 446.50670051574707,
- "z": "4fee9402.f5c9bc",
+ "x": 2088.22993850708,
+ "y": 451.5066947937012,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "7be5423c.87235c",
+ "id": "de34e0a1.fef5c",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2118.207492828369,
- "y": 491.1643395423889,
- "z": "4fee9402.f5c9bc",
+ "x": 2091.676197052002,
+ "y": 496.164333820343,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "ce0facb9.acf8f",
+ "id": "2d5467cf.141cf8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1695.0313034057617,
- "y": 373.07812118530273,
- "z": "4fee9402.f5c9bc",
+ "x": 1668.5000076293945,
+ "y": 378.07811546325684,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "d0cbbcf7.18e0c"
+ "92550d61.5702c"
]
]
},
{
- "id": "2948d13a.1b821e",
+ "id": "816f2ae4.9e3938",
"type": "comment",
"name": "Get devices",
"info": "",
"comments": "",
- "x": 848.0315361022949,
- "y": 494.0781602859497,
- "z": "4fee9402.f5c9bc",
+ "x": 821.5002403259277,
+ "y": 499.0781545639038,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "49047f5d.3dde6",
+ "id": "3aa9d72d.eaee98",
"type": "set",
"name": "set prop.site.deviceId_length",
"xml": "<set>\n<parameter name='prop.site.deviceId_length' value='0' />\n",
"comments": "",
- "x": 1500.53125,
- "y": 301.07812213897705,
- "z": "4fee9402.f5c9bc",
+ "x": 1473.9999542236328,
+ "y": 306.07811641693115,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "832591c7.4ef99",
+ "id": "467c4bfc.2f5b64",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 405.52733993530273,
- "y": 405.0742197036743,
- "z": "4fee9402.f5c9bc",
+ "x": 378.99604415893555,
+ "y": 410.0742139816284,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "ff28f3d.3169d1",
- "7df3c0c6.f5b88",
- "8e428583.69a8e8",
- "e69423a5.584ae",
- "ce0e4f49.1217b",
- "16f0a729.f1f5a9",
- "d2d93614.7c8ad8",
- "2604b323.ea5f4c",
- "9139c857.0718b8",
- "c9d5923c.c3e6a",
- "4a67f6d4.3597f8",
- "7c127312.19825c",
- "1954d3bb.e0ec6c"
+ "5cb64270.b68bbc",
+ "1de0c391.b5a28c",
+ "7e611b6d.db2764",
+ "40773877.e7f878",
+ "b86dde81.b26fa",
+ "b01ccc1a.02731",
+ "9c618528.84c5b8",
+ "fc70c70a.583ef8",
+ "86a3ea09.776bc8",
+ "1e0c85ac.387e1a",
+ "6b522fc9.bd25d",
+ "c257767a.933bb8",
+ "c5d5b1d3.8c084"
]
]
},
{
- "id": "39502de7.a9fc62",
+ "id": "c4a0e771.25eac8",
"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": 2109.5039443969727,
- "y": 538.0039381980896,
- "z": "4fee9402.f5c9bc",
+ "x": 2082.9726486206055,
+ "y": 543.0039324760437,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
},
{
- "id": "9139c857.0718b8",
+ "id": "86a3ea09.776bc8",
"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": 893.2539443969727,
- "y": 444.75391960144043,
- "z": "4fee9402.f5c9bc",
+ "x": 866.7226486206055,
+ "y": 449.75391387939453,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "679a2fa0.7fa24",
- "db810e5a.69a4a",
- "b796d6f.b8abb28"
+ "cb360512.9f1c88",
+ "f1779f79.d3359",
+ "78cd1685.a056c8"
]
]
},
{
- "id": "679a2fa0.7fa24",
+ "id": "cb360512.9f1c88",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1125.2540283203125,
- "y": 408.753942489624,
- "z": "4fee9402.f5c9bc",
+ "x": 1098.7227325439453,
+ "y": 413.7539367675781,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "e1a99634.deb268"
+ "f23d61e0.62498"
]
]
},
{
- "id": "db810e5a.69a4a",
+ "id": "f1779f79.d3359",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1127.7449111938477,
- "y": 444.3279790878296,
- "z": "4fee9402.f5c9bc",
+ "x": 1101.2136154174805,
+ "y": 449.3279733657837,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "363ab1e2.2b5cce"
+ "399ac4f6.7a8eac"
]
]
},
{
- "id": "b796d6f.b8abb28",
+ "id": "78cd1685.a056c8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1123.0779190063477,
- "y": 480.661337852478,
- "z": "4fee9402.f5c9bc",
+ "x": 1096.5466232299805,
+ "y": 485.66133213043213,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "cdf3743a.490b68"
+ "3b8de765.32c6c8"
]
]
},
{
- "id": "cdf3743a.490b68",
+ "id": "3b8de765.32c6c8",
"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": 1276.8504104614258,
- "y": 478.1004247665405,
- "z": "4fee9402.f5c9bc",
+ "x": 1250.3191146850586,
+ "y": 483.10041904449463,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "363ab1e2.2b5cce",
+ "id": "399ac4f6.7a8eac",
"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": 1273.316307067871,
- "y": 442.6136665344238,
- "z": "4fee9402.f5c9bc",
+ "x": 1246.785011291504,
+ "y": 447.61366081237793,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "e1a99634.deb268",
+ "id": "f23d61e0.62498",
"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": 1280.7541427612305,
- "y": 407.75383472442627,
- "z": "4fee9402.f5c9bc",
+ "x": 1254.2228469848633,
+ "y": 412.75382900238037,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "c9d5923c.c3e6a",
+ "id": "1e0c85ac.387e1a",
"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.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
"comments": "",
"outputs": 1,
- "x": 907.7640762329102,
- "y": 532.4309215545654,
- "z": "4fee9402.f5c9bc",
+ "x": 881.232780456543,
+ "y": 537.4309158325195,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "80be9352.04481",
- "fdeb2c27.d10b4"
+ "77011d7.7b96ee4",
+ "12088398.76a01c"
]
]
},
{
- "id": "80be9352.04481",
+ "id": "77011d7.7b96ee4",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1142.76420211792,
- "y": 518.4309101104736,
- "z": "4fee9402.f5c9bc",
+ "x": 1116.2329063415527,
+ "y": 523.4309043884277,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "303f14f3.7822fc"
+ "44026cbb.b9e684"
]
]
},
{
- "id": "303f14f3.7822fc",
+ "id": "44026cbb.b9e684",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 1284.7642097473145,
- "y": 517.430911064148,
- "z": "4fee9402.f5c9bc",
+ "x": 1258.2329139709473,
+ "y": 522.430905342102,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "de3334dd.87a328",
+ "id": "9dced7bd.db4818",
"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": 1290.7642097473145,
- "y": 554.823899269104,
- "z": "4fee9402.f5c9bc",
+ "x": 1264.2329139709473,
+ "y": 559.8238935470581,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "fdeb2c27.d10b4",
+ "id": "12088398.76a01c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1142.01420211792,
- "y": 554.0738172531128,
- "z": "4fee9402.f5c9bc",
+ "x": 1115.4829063415527,
+ "y": 559.0738115310669,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "de3334dd.87a328"
+ "9dced7bd.db4818"
]
]
},
{
- "id": "4a67f6d4.3597f8",
+ "id": "6b522fc9.bd25d",
"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": 884.7638244628906,
- "y": 585.7639970779419,
- "z": "4fee9402.f5c9bc",
+ "x": 858.2325286865234,
+ "y": 590.763991355896,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
},
{
- "id": "2604b323.ea5f4c",
+ "id": "fc70c70a.583ef8",
"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": 849.8993644714355,
- "y": 1030.5663061141968,
- "z": "4fee9402.f5c9bc",
+ "x": 823.3680686950684,
+ "y": 1035.5663003921509,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "4c7ada40.e6d834",
+ "id": "4a80b28.10a884c",
"type": "update",
"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 = $vf-module-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vf-module-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
"comments": "",
"outputs": 1,
- "x": 969.2184829711914,
- "y": 990.3698863983154,
- "z": "4fee9402.f5c9bc",
+ "x": 942.6871871948242,
+ "y": 995.3698806762695,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
},
{
- "id": "ce0e4f49.1217b",
+ "id": "b86dde81.b26fa",
"type": "set",
"name": "copy input data to service data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
"comments": "",
- "x": 903.59619140625,
- "y": 864.7630681991577,
- "z": "4fee9402.f5c9bc",
+ "x": 877.0648956298828,
+ "y": 869.7630624771118,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "16f0a729.f1f5a9",
+ "id": "b01ccc1a.02731",
"type": "set",
"name": "set vf-module-id and vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
"comments": "",
- "x": 937.8993911743164,
- "y": 908.5661773681641,
- "z": "4fee9402.f5c9bc",
+ "x": 911.3680953979492,
+ "y": 913.5661716461182,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "d2d93614.7c8ad8",
+ "id": "9c618528.84c5b8",
"type": "set",
"name": "set vf-module-level-oper-status",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
"comments": "",
- "x": 904.8993911743164,
- "y": 944.5661773681641,
- "z": "4fee9402.f5c9bc",
+ "x": 878.3680953979492,
+ "y": 949.5661716461182,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "1954d3bb.e0ec6c",
+ "id": "c5d5b1d3.8c084",
"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.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 952.03125,
- "y": 770.078145980835,
- "z": "4fee9402.f5c9bc",
+ "x": 925.4999542236328,
+ "y": 775.0781402587891,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "5763133a.85c38c",
- "e2a71559.3f3e88"
+ "e2365777.226868",
+ "8c72c557.95eda8"
]
]
},
{
- "id": "5763133a.85c38c",
+ "id": "e2365777.226868",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1198.031234741211,
- "y": 808.0782346725464,
- "z": "4fee9402.f5c9bc",
+ "x": 1171.4999389648438,
+ "y": 813.0782289505005,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "c730322d.384d7"
+ "d7624ae6.474bb8"
]
]
},
{
- "id": "e2a71559.3f3e88",
+ "id": "8c72c557.95eda8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1194.0313148498535,
- "y": 762.0781497955322,
- "z": "4fee9402.f5c9bc",
+ "x": 1167.5000190734863,
+ "y": 767.0781440734863,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "33e8f10d.25726e"
+ "d7624ae6.474bb8"
]
]
},
{
- "id": "33e8f10d.25726e",
+ "id": "281f8a8d.8e3fc6",
"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": 1335.031406402588,
- "y": 762.0781507492065,
- "z": "4fee9402.f5c9bc",
+ "x": 1308.5001106262207,
+ "y": 767.0781450271606,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "c730322d.384d7",
+ "id": "d7624ae6.474bb8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1342.0311012268066,
- "y": 806.0781536102295,
- "z": "4fee9402.f5c9bc",
+ "x": 1315.4998054504395,
+ "y": 811.0781478881836,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
},
{
- "id": "7c127312.19825c",
+ "id": "c257767a.933bb8",
"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.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 947.0314178466797,
- "y": 664.0781440734863,
- "z": "4fee9402.f5c9bc",
+ "x": 920.5001220703125,
+ "y": 669.0781383514404,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "e0828ab7.60a978",
- "3d0c4f43.fce4d"
+ "ec710bf2.9c0a78",
+ "f07017bc.bc8a18"
]
]
},
{
- "id": "e0828ab7.60a978",
+ "id": "ec710bf2.9c0a78",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1235.0315132141113,
- "y": 696.0781135559082,
- "z": "4fee9402.f5c9bc",
+ "x": 1208.5002174377441,
+ "y": 701.0781078338623,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "aca8b9c6.d1fb58"
+ "7193fdca.aa45a4"
]
]
},
{
- "id": "3d0c4f43.fce4d",
+ "id": "f07017bc.bc8a18",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1239.031593322754,
- "y": 632.0781917572021,
- "z": "4fee9402.f5c9bc",
+ "x": 1212.5002975463867,
+ "y": 637.0781860351562,
+ "z": "b8fed42e.2d2888",
"wires": [
[
- "729b835e.b7b53c"
+ "7193fdca.aa45a4"
]
]
},
{
- "id": "729b835e.b7b53c",
+ "id": "64ee4cf2.79ceb4",
"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": 1384.0317649841309,
- "y": 634.0781917572021,
- "z": "4fee9402.f5c9bc",
+ "x": 1357.5004692077637,
+ "y": 639.0781860351562,
+ "z": "b8fed42e.2d2888",
"wires": []
},
{
- "id": "aca8b9c6.d1fb58",
+ "id": "7193fdca.aa45a4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1391.0313568115234,
- "y": 694.0781135559082,
- "z": "4fee9402.f5c9bc",
+ "x": 1364.5000610351562,
+ "y": 699.0781078338623,
+ "z": "b8fed42e.2d2888",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml index ab5d5b06..b0cccdf3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-deactivate.xml @@ -134,11 +134,7 @@ <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>
+ <block atomic="true"></block>
</outcome>
<outcome value='success'>
<block atomic="true"></block>
@@ -158,11 +154,7 @@ <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>
+ <block atomic="true"></block>
</outcome>
<outcome value='success'>
<block atomic="true"></block>
|