diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
12 files changed, 2752 insertions, 2145 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json index ca336093..d13570cc 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json @@ -1,20 +1,20 @@ [
{
- "id": "e2f973ad.8a873",
+ "id": "60f8bdf7.1ecdb4",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 167.00390625,
- "y": 86.41365623474121,
- "z": "62f71b5.55c86e4",
+ "x": 153,
+ "y": 59.413658142089844,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "7f6ab737.fa2438"
+ "443d0508.99432c"
]
]
},
{
- "id": "7f6ab737.fa2438",
+ "id": "443d0508.99432c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1230 +22,1230 @@ "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": 280.28961181640625,
- "y": 126.65176773071289,
- "z": "62f71b5.55c86e4",
+ "x": 266.28570556640625,
+ "y": 99.65176963806152,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "df90c884.26f4c8"
+ "eb94899e.b6b1a8"
]
]
},
{
- "id": "df90c884.26f4c8",
+ "id": "eb94899e.b6b1a8",
"type": "method",
"name": "method vf-module-topology-operation",
"xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 254.43253326416016,
- "y": 166.4136505126953,
- "z": "62f71b5.55c86e4",
+ "x": 240.42862701416016,
+ "y": 139.41365242004395,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "2b567398.54b65c"
+ "d840e5a2.3f7788"
]
]
},
{
- "id": "3f06cd40.babeb2",
+ "id": "e2dfb49b.0a0018",
"type": "comment",
"name": "vf-module-topology-operation",
"info": "",
"comments": "",
- "x": 484.34873962402344,
- "y": 68.99999809265137,
- "z": "62f71b5.55c86e4",
+ "x": 470.34483337402344,
+ "y": 42,
+ "z": "a72b1b1f.95ba58",
"wires": []
},
{
- "id": "2b567398.54b65c",
+ "id": "d840e5a2.3f7788",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 236.50394439697266,
- "y": 405.7738285064697,
- "z": "62f71b5.55c86e4",
+ "x": 222.50003814697266,
+ "y": 378.77383041381836,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "61e93cec.112784",
- "fa9f0d60.462fa",
- "d2d6e69c.591818"
+ "82c3b371.373ab",
+ "45744240.a8fecc",
+ "af8762d1.2370a"
]
]
},
{
- "id": "61e93cec.112784",
+ "id": "82c3b371.373ab",
"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": 522.0039367675781,
- "y": 579.2712173461914,
- "z": "62f71b5.55c86e4",
+ "x": 508.0000305175781,
+ "y": 552.27121925354,
+ "z": "a72b1b1f.95ba58",
"wires": []
},
{
- "id": "fa9f0d60.462fa",
+ "id": "45744240.a8fecc",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 532.9085464477539,
- "y": 403.98505306243896,
- "z": "62f71b5.55c86e4",
+ "x": 518.9046401977539,
+ "y": 376.9850549697876,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "218f133.db017ec",
- "ebbe7026.8821f",
- "37c0b9bd.94d7c6",
- "c54da833.e1f678",
- "47601bcd.b936b4",
- "86bac2cf.d6b39",
- "1207cb15.bda8a5",
- "5b101188.1d177"
+ "400fbd10.304f54",
+ "b423bb62.fc6a38",
+ "d0eb7f3.388888",
+ "5337ec3d.0febd4",
+ "37531078.1941c",
+ "1af62602.8b12ba",
+ "dcf909ef.aba7f8",
+ "c5e2d1b7.6be4b"
]
]
},
{
- "id": "218f133.db017ec",
+ "id": "400fbd10.304f54",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 742.3848266601562,
- "y": 294.2708902359009,
- "z": "62f71b5.55c86e4",
+ "x": 728.3809204101562,
+ "y": 267.2708921432495,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "b8e37d82.b39ed"
+ "826f3bce.8ed388"
]
]
},
{
- "id": "ebbe7026.8821f",
+ "id": "b423bb62.fc6a38",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 750.765811920166,
- "y": 440.4615821838379,
- "z": "62f71b5.55c86e4",
+ "x": 736.761905670166,
+ "y": 413.4615840911865,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "4071fcbf.00f444"
+ "671070dd.51814"
]
]
},
{
- "id": "37c0b9bd.94d7c6",
+ "id": "d0eb7f3.388888",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 690.4801864624023,
- "y": 1670.9851922988892,
- "z": "62f71b5.55c86e4",
+ "x": 676.4762802124023,
+ "y": 1643.9851942062378,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "ab03e6ef.4f7e98"
+ "cae0cae7.d054f8"
]
]
},
{
- "id": "ab03e6ef.4f7e98",
+ "id": "cae0cae7.d054f8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 884.6706123352051,
- "y": 1670.98526096344,
- "z": "62f71b5.55c86e4",
+ "x": 870.6667060852051,
+ "y": 1643.9852628707886,
+ "z": "a72b1b1f.95ba58",
"wires": []
},
{
- "id": "d2d6e69c.591818",
+ "id": "af8762d1.2370a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 652.0871887207031,
- "y": 243.7947130203247,
- "z": "62f71b5.55c86e4",
+ "x": 638.0832824707031,
+ "y": 216.79471492767334,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "b8e37d82.b39ed",
+ "id": "826f3bce.8ed388",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1114.527660369873,
- "y": 293.8423547744751,
- "z": "62f71b5.55c86e4",
+ "x": 1100.523754119873,
+ "y": 266.84235668182373,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "a7b23d9b.67752",
+ "id": "8b23074e.0b6df8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1126.5276184082031,
- "y": 390.5089979171753,
- "z": "62f71b5.55c86e4",
+ "x": 1112.5237121582031,
+ "y": 363.5089998245239,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "4071fcbf.00f444",
+ "id": "671070dd.51814",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1120.8608894348145,
- "y": 440.1757173538208,
- "z": "62f71b5.55c86e4",
+ "x": 1106.8569831848145,
+ "y": 413.17571926116943,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "9cef98f6.bb64a8",
+ "id": "2a162b8d.203e04",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 754.8609046936035,
- "y": 391.1756715774536,
- "z": "62f71b5.55c86e4",
+ "x": 740.8569984436035,
+ "y": 364.17567348480225,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "a7b23d9b.67752"
+ "8b23074e.0b6df8"
]
]
},
{
- "id": "c54da833.e1f678",
+ "id": "5337ec3d.0febd4",
"type": "outcome",
"name": "changeassign",
"xml": "<outcome value='changeassign'>\n",
"comments": "",
"outputs": 1,
- "x": 765.3372268676758,
- "y": 488.0803117752075,
- "z": "62f71b5.55c86e4",
+ "x": 751.3333206176758,
+ "y": 461.08031368255615,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "64ada87a.babb08"
+ "5fccb04e.7aca4"
]
]
},
{
- "id": "64ada87a.babb08",
+ "id": "5fccb04e.7aca4",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1134.4322967529297,
- "y": 487.79444789886475,
- "z": "62f71b5.55c86e4",
+ "x": 1120.4283905029297,
+ "y": 460.7944498062134,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "47601bcd.b936b4",
+ "id": "37531078.1941c",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 751.00390625,
- "y": 686.4136562347412,
- "z": "62f71b5.55c86e4",
+ "x": 737,
+ "y": 659.4136581420898,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "41360f4.fa56df"
+ "3ae69b6c.fc6664"
]
]
},
{
- "id": "24ce8e0e.e18a02",
+ "id": "cb85e946.697488",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 989.3375091552734,
- "y": 694.0000194013119,
- "z": "62f71b5.55c86e4",
+ "x": 975.3336029052734,
+ "y": 667.0000213086605,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "cd28feb2.78356",
- "b0c495a7.239ed8",
- "4e5328da.0fb598",
- "cf0037c3.323858",
- "9773ede5.0ea13",
- "d780b057.46e04"
+ "e1f46c8f.0f8ef",
+ "6d091724.521778",
+ "cd73a097.4d141",
+ "9c2f6ea9.9f71",
+ "32e42e81.923742",
+ "bb150aac.372ef8"
]
]
},
{
- "id": "b0c495a7.239ed8",
+ "id": "6d091724.521778",
"type": "outcome",
"name": "CreateSDWANSiteInstance",
"xml": "<outcome value='CreateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1279.8138275146484,
- "y": 602.4793882369995,
- "z": "62f71b5.55c86e4",
+ "x": 1265.8099212646484,
+ "y": 575.4793901443481,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "835bb83.144cf48"
+ "61f9f776.74e028"
]
]
},
{
- "id": "cd28feb2.78356",
+ "id": "e1f46c8f.0f8ef",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.7182922363281,
- "y": 777.8572826385498,
- "z": "62f71b5.55c86e4",
+ "x": 1175.7143859863281,
+ "y": 750.8572845458984,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "2ac9864e.b3ecca"
+ "e7075778.492688"
]
]
},
{
- "id": "41360f4.fa56df",
+ "id": "3ae69b6c.fc6664",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 937.3374252319336,
- "y": 614.000020980835,
- "z": "62f71b5.55c86e4",
+ "x": 923.3335189819336,
+ "y": 587.0000228881836,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "24ce8e0e.e18a02",
- "cf6851c.b8328b"
+ "cb85e946.697488",
+ "56c1945d.3e8c8c"
]
]
},
{
- "id": "835bb83.144cf48",
+ "id": "61f9f776.74e028",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1703.3376998901367,
- "y": 601.0001645088196,
- "z": "62f71b5.55c86e4",
+ "x": 1689.3337936401367,
+ "y": 574.0001664161682,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "2ac9864e.b3ecca",
+ "id": "e7075778.492688",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1343.0039443969727,
- "y": 777.9136791229248,
- "z": "62f71b5.55c86e4",
+ "x": 1329.0000381469727,
+ "y": 750.9136810302734,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "4e5328da.0fb598",
+ "id": "cd73a097.4d141",
"type": "outcome",
"name": "CreateSDWANPortInstance",
"xml": "<outcome value='CreateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1253.6706848144531,
- "y": 736.2471733093262,
- "z": "62f71b5.55c86e4",
+ "x": 1239.6667785644531,
+ "y": 709.2471752166748,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "60d39409.313dec"
+ "5c17a60.656ff5c"
]
]
},
{
- "id": "60d39409.313dec",
+ "id": "5c17a60.656ff5c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1726.1943817138672,
- "y": 735.7679252624512,
- "z": "62f71b5.55c86e4",
+ "x": 1712.1904754638672,
+ "y": 708.7679271697998,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "cf0037c3.323858",
+ "id": "9c2f6ea9.9f71",
"type": "outcome",
"name": "CreateSDWANDeviceInstance",
"xml": "<outcome value='CreateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1262.0350074768066,
- "y": 656.4451336860657,
- "z": "62f71b5.55c86e4",
+ "x": 1248.0311012268066,
+ "y": 629.4451355934143,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "aa20e20c.3c0b5"
+ "eea9f4ee.a0af98"
]
]
},
{
- "id": "aa20e20c.3c0b5",
+ "id": "eea9f4ee.a0af98",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1717.558795928955,
- "y": 655.9660029411316,
- "z": "62f71b5.55c86e4",
+ "x": 1703.554889678955,
+ "y": 628.9660048484802,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "9773ede5.0ea13",
+ "id": "32e42e81.923742",
"type": "outcome",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1292.0039253234863,
- "y": 555.4137082099915,
- "z": "62f71b5.55c86e4",
+ "x": 1278.0000190734863,
+ "y": 528.4137101173401,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "7667e896.f38bf8"
+ "28c101e9.f0aa4e"
]
]
},
{
- "id": "7667e896.f38bf8",
+ "id": "28c101e9.f0aa4e",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1700.5276985168457,
- "y": 552.9344754219055,
- "z": "62f71b5.55c86e4",
+ "x": 1686.5237922668457,
+ "y": 525.9344773292542,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "86bac2cf.d6b39",
+ "id": "1af62602.8b12ba",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 741.00390625,
- "y": 881.7469692230225,
- "z": "62f71b5.55c86e4",
+ "x": 727,
+ "y": 854.7469711303711,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "dcb59eb.f680a6"
+ "c0bc6360.1bcc6"
]
]
},
{
- "id": "7ef3c11c.de325",
+ "id": "75a4368f.b06cb8",
"type": "outcome",
"name": "ActivateSDWANSiteInstance",
"xml": "<outcome value='ActivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1271.146957397461,
- "y": 884.6459226608276,
- "z": "62f71b5.55c86e4",
+ "x": 1257.143051147461,
+ "y": 857.6459245681763,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "d260e542.de2768"
+ "a304d42c.96b1a8"
]
]
},
{
- "id": "dcb59eb.f680a6",
+ "id": "c0bc6360.1bcc6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 921.6706771850586,
- "y": 877.1666460037231,
- "z": "62f71b5.55c86e4",
+ "x": 907.6667709350586,
+ "y": 850.1666479110718,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "e18a049.97ec9f8"
+ "37ab676.385ac98"
]
]
},
{
- "id": "d260e542.de2768",
+ "id": "a304d42c.96b1a8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1683.6708450317383,
- "y": 878.1667051315308,
- "z": "62f71b5.55c86e4",
+ "x": 1669.6669387817383,
+ "y": 851.1667070388794,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "23af3ff8.e62a2",
+ "id": "1cc762ff.e3018d",
"type": "outcome",
"name": "ActivateSDWANDeviceInstance",
"xml": "<outcome value='ActivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1260.3373947143555,
- "y": 930.6667113304138,
- "z": "62f71b5.55c86e4",
+ "x": 1246.3334884643555,
+ "y": 903.6667132377625,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "d9fbf850.8eb808"
+ "16f3b753.49c909"
]
]
},
{
- "id": "d9fbf850.8eb808",
+ "id": "16f3b753.49c909",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1695.8610916137695,
- "y": 930.1874837875366,
- "z": "62f71b5.55c86e4",
+ "x": 1681.8571853637695,
+ "y": 903.1874856948853,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "f7b99e1b.e28fb",
+ "id": "4032b094.cc8d9",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1694.3372192382812,
- "y": 1015.6666655540466,
- "z": "62f71b5.55c86e4",
+ "x": 1680.3333129882812,
+ "y": 988.6666674613953,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "ddf229e7.82bf38",
+ "id": "fab9a958.f65228",
"type": "outcome",
"name": "ActivateSDWANPortInstance",
"xml": "<outcome value='ActivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1258.8135223388672,
- "y": 1016.1458930969238,
- "z": "62f71b5.55c86e4",
+ "x": 1244.8096160888672,
+ "y": 989.1458950042725,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "f7b99e1b.e28fb"
+ "4032b094.cc8d9"
]
]
},
{
- "id": "e18a049.97ec9f8",
+ "id": "37ab676.385ac98",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 998.00390625,
- "y": 943.7469692230225,
- "z": "62f71b5.55c86e4",
+ "x": 984,
+ "y": 916.7469711303711,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "7ef3c11c.de325",
- "23af3ff8.e62a2",
- "ddf229e7.82bf38",
- "d6b4380a.e6fc68",
- "bea21a7.81c0de8",
- "346cc8c9.1c2778"
+ "75a4368f.b06cb8",
+ "1cc762ff.e3018d",
+ "fab9a958.f65228",
+ "a8fd2164.39975",
+ "5e8479ea.a8f1a8",
+ "38b66458.dc919c"
]
]
},
{
- "id": "d6b4380a.e6fc68",
+ "id": "a8fd2164.39975",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1190.5753860473633,
- "y": 1064.9584784507751,
- "z": "62f71b5.55c86e4",
+ "x": 1176.5714797973633,
+ "y": 1037.9584803581238,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "6f89102d.f2093"
+ "596d0c66.ce00c4"
]
]
},
{
- "id": "bea21a7.81c0de8",
+ "id": "5e8479ea.a8f1a8",
"type": "outcome",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
"comments": "",
"outputs": 1,
- "x": 1274.00390625,
- "y": 839.7469692230225,
- "z": "62f71b5.55c86e4",
+ "x": 1260,
+ "y": 812.7469711303711,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "938a7e9e.1488b"
+ "75b93508.0a740c"
]
]
},
{
- "id": "938a7e9e.1488b",
+ "id": "75b93508.0a740c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1689.5277099609375,
- "y": 833.2677459716797,
- "z": "62f71b5.55c86e4",
+ "x": 1675.5238037109375,
+ "y": 806.2677478790283,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "1207cb15.bda8a5",
+ "id": "dcf909ef.aba7f8",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 725.0038986206055,
- "y": 1167.7470622062683,
- "z": "62f71b5.55c86e4",
+ "x": 710.9999923706055,
+ "y": 1140.747064113617,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "44d3e67.69f5d18"
+ "ddecd7f6.9ecef8"
]
]
},
{
- "id": "257dcf4a.baf63",
+ "id": "fa2b90a6.ddc62",
"type": "outcome",
"name": "DeactivateSDWANSiteInstance",
"xml": "<outcome value='DeactivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1263.1470184326172,
- "y": 1167.646032333374,
- "z": "62f71b5.55c86e4",
+ "x": 1249.1431121826172,
+ "y": 1140.6460342407227,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "762704d.9dc17fc"
+ "d468a55.f677158"
]
]
},
{
- "id": "44d3e67.69f5d18",
+ "id": "ddecd7f6.9ecef8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 905.6706695556641,
- "y": 1163.166738986969,
- "z": "62f71b5.55c86e4",
+ "x": 891.6667633056641,
+ "y": 1136.1667408943176,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "6d4f8b47.fe5794"
+ "e10a09ee.1e0d18"
]
]
},
{
- "id": "762704d.9dc17fc",
+ "id": "d468a55.f677158",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1680.670783996582,
- "y": 1169.16676902771,
- "z": "62f71b5.55c86e4",
+ "x": 1666.666877746582,
+ "y": 1142.1667709350586,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "75979eed.fc0b",
+ "id": "b5211acb.613d58",
"type": "outcome",
"name": "DeactivateSDWANDeviceInstance",
"xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1244.337387084961,
- "y": 1216.6668043136597,
- "z": "62f71b5.55c86e4",
+ "x": 1230.333480834961,
+ "y": 1189.6668062210083,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "e1999526.f6ec28"
+ "b45a3e18.c78af"
]
]
},
{
- "id": "e1999526.f6ec28",
+ "id": "b45a3e18.c78af",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1679.861083984375,
- "y": 1216.1875767707825,
- "z": "62f71b5.55c86e4",
+ "x": 1665.857177734375,
+ "y": 1189.187578678131,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "7940dddb.23f774",
+ "id": "6f5baedc.d1b98",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1677.3372955322266,
- "y": 1294.6667785644531,
- "z": "62f71b5.55c86e4",
+ "x": 1663.3333892822266,
+ "y": 1267.6667804718018,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "b7bae25f.1012c",
+ "id": "78ae2747.e70608",
"type": "outcome",
"name": "DeactivateSDWANPortInstance",
"xml": "<outcome value='DeactivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1241.8135986328125,
- "y": 1295.1460061073303,
- "z": "62f71b5.55c86e4",
+ "x": 1227.8096923828125,
+ "y": 1268.146008014679,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "7940dddb.23f774"
+ "6f5baedc.d1b98"
]
]
},
{
- "id": "6d4f8b47.fe5794",
+ "id": "e10a09ee.1e0d18",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 982.0038986206055,
- "y": 1229.7470622062683,
- "z": "62f71b5.55c86e4",
+ "x": 967.9999923706055,
+ "y": 1202.747064113617,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "257dcf4a.baf63",
- "75979eed.fc0b",
- "b7bae25f.1012c",
- "fcda1e4c.615a4",
- "8473a82c.4877f8",
- "1f1b01c5.6b73be"
+ "fa2b90a6.ddc62",
+ "b5211acb.613d58",
+ "78ae2747.e70608",
+ "f85122c3.f22fe",
+ "d175e790.8c0a68",
+ "e6ce30bc.2212e"
]
]
},
{
- "id": "fcda1e4c.615a4",
+ "id": "f85122c3.f22fe",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1177.5753326416016,
- "y": 1344.958568572998,
- "z": "62f71b5.55c86e4",
+ "x": 1163.5714263916016,
+ "y": 1317.9585704803467,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "33eff1fb.6065ee"
+ "27b59f76.ee972"
]
]
},
{
- "id": "8473a82c.4877f8",
+ "id": "d175e790.8c0a68",
"type": "outcome",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1258.0038986206055,
- "y": 1125.7470622062683,
- "z": "62f71b5.55c86e4",
+ "x": 1243.9999923706055,
+ "y": 1098.747064113617,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "4ad61465.b466cc"
+ "4dcb10ca.91b76"
]
]
},
{
- "id": "4ad61465.b466cc",
+ "id": "4dcb10ca.91b76",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1673.527702331543,
- "y": 1119.2678389549255,
- "z": "62f71b5.55c86e4",
+ "x": 1659.523796081543,
+ "y": 1092.2678408622742,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "33eff1fb.6065ee",
+ "id": "27b59f76.ee972",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1516.0040130615234,
- "y": 1345.413779258728,
- "z": "62f71b5.55c86e4",
+ "x": 1502.0001068115234,
+ "y": 1318.4137811660767,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "6f89102d.f2093",
+ "id": "596d0c66.ce00c4",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1521.0038986206055,
- "y": 1062.4136881828308,
- "z": "62f71b5.55c86e4",
+ "x": 1506.9999923706055,
+ "y": 1035.4136900901794,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "a47671f0.7d05a",
+ "id": "8c5c47e5.7d7ac8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1119.00386428833,
- "y": 341.4136438369751,
- "z": "62f71b5.55c86e4",
+ "x": 1104.99995803833,
+ "y": 314.41364574432373,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "3cda3fef.0d9d8",
+ "id": "92267a8e.9c90e8",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 747.003849029541,
- "y": 342.0803213119507,
- "z": "62f71b5.55c86e4",
+ "x": 732.999942779541,
+ "y": 315.0803232192993,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "a47671f0.7d05a"
+ "8c5c47e5.7d7ac8"
]
]
},
{
- "id": "5b101188.1d177",
+ "id": "c5e2d1b7.6be4b",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 688.0039443969727,
- "y": 1513.0803909301758,
- "z": "62f71b5.55c86e4",
+ "x": 674.0000381469727,
+ "y": 1486.0803928375244,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "114b4b9d.5295d4"
+ "efa2965.8f0dc68"
]
]
},
{
- "id": "ff0a1131.810f4",
+ "id": "44d29826.e75ef8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 927.3374633789062,
- "y": 1513.6667575836182,
- "z": "62f71b5.55c86e4",
+ "x": 913.3335571289062,
+ "y": 1486.6667594909668,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "1ad48c77.fd16f4",
- "c2daaecd.bf1de",
- "96d040fc.c73ab",
- "61982dc8.6271b4",
- "71ed2a12.125604",
- "c389a69c.23d3e8"
+ "b28c13f1.1d076",
+ "e39671f.04a299",
+ "bff79d49.ee60c",
+ "2a96734d.12075c",
+ "c0a6c4b4.41fcd8",
+ "ca85561c.80bf88"
]
]
},
{
- "id": "c2daaecd.bf1de",
+ "id": "e39671f.04a299",
"type": "outcome",
"name": "DeleteSDWANSiteInstance",
"xml": "<outcome value='DeleteSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1212.8140106201172,
- "y": 1447.1461572647095,
- "z": "62f71b5.55c86e4",
+ "x": 1198.8101043701172,
+ "y": 1420.146159172058,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "1180e635.2cc73a"
+ "c68b80f6.353d3"
]
]
},
{
- "id": "1ad48c77.fd16f4",
+ "id": "b28c13f1.1d076",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1126.7183303833008,
- "y": 1604.5240173339844,
- "z": "62f71b5.55c86e4",
+ "x": 1112.7144241333008,
+ "y": 1577.524019241333,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "f97fd7f3.6f7498"
+ "ddab3c2b.d8382"
]
]
},
{
- "id": "114b4b9d.5295d4",
+ "id": "efa2965.8f0dc68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 874.3374633789062,
- "y": 1440.6667556762695,
- "z": "62f71b5.55c86e4",
+ "x": 860.3335571289062,
+ "y": 1413.6667575836182,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "ff0a1131.810f4"
+ "44d29826.e75ef8"
]
]
},
{
- "id": "1180e635.2cc73a",
+ "id": "c68b80f6.353d3",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1616.3376235961914,
- "y": 1442.6670022010803,
- "z": "62f71b5.55c86e4",
+ "x": 1602.3337173461914,
+ "y": 1415.667004108429,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "f97fd7f3.6f7498",
+ "id": "ddab3c2b.d8382",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1280.0039825439453,
- "y": 1604.5804138183594,
- "z": "62f71b5.55c86e4",
+ "x": 1266.0000762939453,
+ "y": 1577.580415725708,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "96d040fc.c73ab",
+ "id": "bff79d49.ee60c",
"type": "outcome",
"name": "DeleteSDWANPortInstance",
"xml": "<outcome value='DeleteSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1190.6707229614258,
- "y": 1562.9139080047607,
- "z": "62f71b5.55c86e4",
+ "x": 1176.6668167114258,
+ "y": 1535.9139099121094,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "14aa28f6.f665e7"
+ "337fe6a3.136d9a"
]
]
},
{
- "id": "14aa28f6.f665e7",
+ "id": "337fe6a3.136d9a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1663.1944198608398,
- "y": 1562.4346599578857,
- "z": "62f71b5.55c86e4",
+ "x": 1649.1905136108398,
+ "y": 1535.4346618652344,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "61982dc8.6271b4",
+ "id": "2a96734d.12075c",
"type": "outcome",
"name": "DeleteSDWANDeviceInstance",
"xml": "<outcome value='DeleteSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1215.0351181030273,
- "y": 1486.1117959022522,
- "z": "62f71b5.55c86e4",
+ "x": 1201.0312118530273,
+ "y": 1459.1117978096008,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "18b71adb.f193b5"
+ "b031ab54.0032d8"
]
]
},
{
- "id": "18b71adb.f193b5",
+ "id": "b031ab54.0032d8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1629.558937072754,
- "y": 1481.6327004432678,
- "z": "62f71b5.55c86e4",
+ "x": 1615.555030822754,
+ "y": 1454.6327023506165,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "71ed2a12.125604",
+ "id": "c0a6c4b4.41fcd8",
"type": "outcome",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1219.0039749145508,
- "y": 1406.0804080963135,
- "z": "62f71b5.55c86e4",
+ "x": 1205.0000686645508,
+ "y": 1379.080410003662,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "f0f97b33.560518"
+ "b82dcb91.bd0a48"
]
]
},
{
- "id": "f0f97b33.560518",
+ "id": "b82dcb91.bd0a48",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1612.5277786254883,
- "y": 1406.6011757850647,
- "z": "62f71b5.55c86e4",
+ "x": 1598.5238723754883,
+ "y": 1379.6011776924133,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "cf6851c.b8328b",
+ "id": "56c1945d.3e8c8c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
"comments": "",
"outputs": 1,
- "x": 1078.75390625,
- "y": 563.0039056241512,
- "z": "62f71b5.55c86e4",
+ "x": 1064.75,
+ "y": 536.0039075314999,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "d780b057.46e04",
+ "id": "bb150aac.372ef8",
"type": "outcome",
"name": "CreateSDWANLanPortInstance",
"xml": "<outcome value='CreateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1255.7474060058594,
- "y": 697.2539067268372,
- "z": "62f71b5.55c86e4",
+ "x": 1241.7434997558594,
+ "y": 670.2539086341858,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "87c41ab9.dcc0d8"
+ "afa9c085.4aa7a"
]
]
},
{
- "id": "87c41ab9.dcc0d8",
+ "id": "afa9c085.4aa7a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1728.2711029052734,
- "y": 696.7746586799622,
- "z": "62f71b5.55c86e4",
+ "x": 1714.2671966552734,
+ "y": 669.7746605873108,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "346cc8c9.1c2778",
+ "id": "38b66458.dc919c",
"type": "outcome",
"name": "ActivateSDWANLanPortInstance",
"xml": "<outcome value='ActivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1267.7474060058594,
- "y": 974.5039067268372,
- "z": "62f71b5.55c86e4",
+ "x": 1253.7434997558594,
+ "y": 947.5039086341858,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "c932f0f5.6bc3c"
+ "807c782f.46b268"
]
]
},
{
- "id": "c932f0f5.6bc3c",
+ "id": "807c782f.46b268",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1685.2710571289062,
- "y": 974.0246682167053,
- "z": "62f71b5.55c86e4",
+ "x": 1671.2671508789062,
+ "y": 947.024670124054,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "1f1b01c5.6b73be",
+ "id": "e6ce30bc.2212e",
"type": "outcome",
"name": "DeactivateSDWANLanPortInstance",
"xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1253.7474060058594,
- "y": 1260.7539067268372,
- "z": "62f71b5.55c86e4",
+ "x": 1239.7434997558594,
+ "y": 1233.7539086341858,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "91614e8f.0048"
+ "226ea68a.974c4a"
]
]
},
{
- "id": "91614e8f.0048",
+ "id": "226ea68a.974c4a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1671.2710571289062,
- "y": 1260.2746682167053,
- "z": "62f71b5.55c86e4",
+ "x": 1657.2671508789062,
+ "y": 1233.274670124054,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
},
{
- "id": "c389a69c.23d3e8",
+ "id": "ca85561c.80bf88",
"type": "outcome",
"name": "DeleteSDWANLanPortInstance",
- "xml": "<outcome value='DleteSDWANLanPortInstance'>",
+ "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1217.7474060058594,
- "y": 1523.7539067268372,
- "z": "62f71b5.55c86e4",
+ "x": 1203.7434997558594,
+ "y": 1496.7539086341858,
+ "z": "a72b1b1f.95ba58",
"wires": [
[
- "9f681b9b.624d78"
+ "372e65c0.54946a"
]
]
},
{
- "id": "9f681b9b.624d78",
+ "id": "372e65c0.54946a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1635.2710571289062,
- "y": 1523.2746682167053,
- "z": "62f71b5.55c86e4",
+ "x": 1621.2671508789062,
+ "y": 1496.274670124054,
+ "z": "a72b1b1f.95ba58",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json index 710748fc..722e5c12 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json @@ -557,8 +557,8 @@ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1243.008186340332,
- "y": 773.003986954689,
+ "x": 1251.008171081543,
+ "y": 817.0040302276611,
"z": "8f678717.6ce918",
"wires": [
[
@@ -573,8 +573,8 @@ "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 889.0080261230469,
- "y": 740.0040270090103,
+ "x": 1256.0080871582031,
+ "y": 730.0041098594666,
"z": "8f678717.6ce918",
"wires": [
[
@@ -594,7 +594,7 @@ "z": "8f678717.6ce918",
"wires": [
[
- "752f257f.d5098c"
+ "f8bad303.dbe7d"
]
]
},
@@ -605,8 +605,8 @@ "xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1465.0081024169922,
- "y": 773.0040684938431,
+ "x": 1501.0082206726074,
+ "y": 811.0041122436523,
"z": "8f678717.6ce918",
"wires": [
[
@@ -2086,8 +2086,8 @@ "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1949.2583618164062,
- "y": 755.5041704177856,
+ "x": 1961.2583961486816,
+ "y": 799.5041923522949,
"z": "8f678717.6ce918",
"wires": [
[
@@ -2119,8 +2119,8 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1663.5312805175781,
- "y": 781.0312776565552,
+ "x": 1693.531337738037,
+ "y": 804.0312929153442,
"z": "8f678717.6ce918",
"wires": [
[
@@ -2241,5 +2241,69 @@ "y": 2197.2225341796875,
"z": "8f678717.6ce918",
"wires": []
+ },
+ {
+ "id": "f8bad303.dbe7d",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 875,
+ "y": 666.6666870117188,
+ "z": "8f678717.6ce918",
+ "wires": [
+ [
+ "8c2d8bf6.5cda78"
+ ]
+ ]
+ },
+ {
+ "id": "8c2d8bf6.5cda78",
+ "type": "switchNode",
+ "name": "switch vf-modules.vf-module_length",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 708.7500152587891,
+ "y": 790.9167098999023,
+ "z": "8f678717.6ce918",
+ "wires": [
+ [
+ "fd56a113.86307"
+ ]
+ ]
+ },
+ {
+ "id": "fd56a113.86307",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 877,
+ "y": 734.6666870117188,
+ "z": "8f678717.6ce918",
+ "wires": [
+ [
+ "341d8e5.7253272"
+ ]
+ ]
+ },
+ {
+ "id": "341d8e5.7253272",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1024.2500305175781,
+ "y": 733.416708946228,
+ "z": "8f678717.6ce918",
+ "wires": [
+ [
+ "752f257f.d5098c"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json index 3ce166ee..b09a059b 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json @@ -1,431 +1,431 @@ [
{
- "id": "3ecdadeb.18aa62",
+ "id": "f782e37.109032",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 432.00389862060547,
- "y": 378.9999885559082,
- "z": "dfb806d8.8899e8",
+ "x": 583,
+ "y": 401.1628177165985,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "b1de8da9.db8a2",
- "d704787.9944088",
- "c4e200e6.2e02b",
- "5f812e79.2be7e",
- "2b234f37.76666",
- "7dbca450.42794c",
- "7e93696e.840218",
- "676ec3b1.844d3c",
- "e3e05047.2e5b8",
- "91a71daa.ef5c2",
- "b3c3b183.55c72",
- "d01634bb.bb46b8",
- "43cde2b5.87e1ac",
- "c6fbc47.00d1938",
- "98c6c3b2.42b6b"
+ "3a0d40d2.1b88f",
+ "fdf59618.623758",
+ "d535f520.a2b4c8",
+ "5957a088.cf332",
+ "9afb8db9.2b0d5",
+ "1b22ffce.90ac5",
+ "9c073f69.f288d",
+ "8cc9cbda.e9db18",
+ "1db1621b.e18c6e",
+ "33fd1f45.d7ff5",
+ "2ebef402.b67dec",
+ "a78628f7.4e9428",
+ "9f1428de.0587b8",
+ "69722b7c.abba54",
+ "86d99a3f.07f208"
]
]
},
{
- "id": "b1de8da9.db8a2",
+ "id": "3a0d40d2.1b88f",
"type": "for",
"name": "for loop idx - VF input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 778.2540588378906,
- "y": 361.66665744781494,
- "z": "dfb806d8.8899e8",
+ "x": 929.2501602172852,
+ "y": 383.82948660850525,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "d245ffbf.59c6c"
+ "edd147b1.5a9678"
]
]
},
{
- "id": "d245ffbf.59c6c",
+ "id": "edd147b1.5a9678",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 993.0324020385742,
- "y": 359.22224140167236,
- "z": "dfb806d8.8899e8",
+ "x": 1144.0285034179688,
+ "y": 381.38507056236267,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "82c635c3.382618",
- "bcda53d8.f6893"
+ "239191e9.78691e",
+ "1a76d1a9.524ade"
]
]
},
{
- "id": "82c635c3.382618",
+ "id": "239191e9.78691e",
"type": "execute",
"name": "execute split parameterName",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-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": 1189.2886047363281,
- "y": 336.97037982940674,
- "z": "dfb806d8.8899e8",
+ "x": 1340.2847061157227,
+ "y": 359.13320899009705,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[]
]
},
{
- "id": "bcda53d8.f6893",
+ "id": "1a76d1a9.524ade",
"type": "set",
"name": "set parameterName",
"xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
"comments": "",
- "x": 1158.7330322265625,
- "y": 373.97049617767334,
- "z": "dfb806d8.8899e8",
+ "x": 1309.729133605957,
+ "y": 396.13332533836365,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "ac17a6a.af45258",
+ "id": "24f00d92.239812",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 816.2542610168457,
- "y": 318.3333249092102,
- "z": "dfb806d8.8899e8",
+ "x": 967.2503623962402,
+ "y": 340.4961540699005,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "c4e200e6.2e02b",
+ "id": "d535f520.a2b4c8",
"type": "set",
"name": "set new vf-module_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
"comments": "",
- "x": 757.190673828125,
- "y": 520.1629304885864,
- "z": "dfb806d8.8899e8",
+ "x": 908.1867752075195,
+ "y": 542.3257596492767,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "d704787.9944088",
+ "id": "fdf59618.623758",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
"comments": "",
- "x": 764.1902618408203,
- "y": 415.1541962623596,
- "z": "dfb806d8.8899e8",
+ "x": 915.1863632202148,
+ "y": 437.3170254230499,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "7e93696e.840218",
+ "id": "9c073f69.f288d",
"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[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].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[$vf-index].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[$vf-index].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[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->\n<!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].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[$vf-index].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[$vf-index].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[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",
"comments": "",
- "x": 769.3570175170898,
- "y": 628.3335423469543,
- "z": "dfb806d8.8899e8",
+ "x": 920.3531188964844,
+ "y": 650.4963715076447,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "676ec3b1.844d3c",
+ "id": "8cc9cbda.e9db18",
"type": "set",
"name": "set vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \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": 757.503942489624,
- "y": 679.8373885154724,
- "z": "dfb806d8.8899e8",
+ "x": 908.5000438690186,
+ "y": 702.0002176761627,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "e3e05047.2e5b8",
+ "id": "1db1621b.e18c6e",
"type": "save",
"name": "save sdwan lan-port-config resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
"comments": "",
"outputs": 1,
- "x": 812.5039215087891,
- "y": 772.3373708724976,
- "z": "dfb806d8.8899e8",
+ "x": 963.5000228881836,
+ "y": 794.5002000331879,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[]
]
},
{
- "id": "91a71daa.ef5c2",
+ "id": "33fd1f45.d7ff5",
"type": "save",
"name": "save service relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"lan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n",
"comments": "",
"outputs": 1,
- "x": 772.5038375854492,
- "y": 819.3373589515686,
- "z": "dfb806d8.8899e8",
+ "x": 923.4999389648438,
+ "y": 841.5001881122589,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[]
]
},
{
- "id": "b3c3b183.55c72",
+ "id": "2ebef402.b67dec",
"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": 723.2263832092285,
- "y": 866.5112180709839,
- "z": "dfb806d8.8899e8",
+ "x": 874.222484588623,
+ "y": 888.6740472316742,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "5f812e79.2be7e",
+ "id": "5957a088.cf332",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 733.424467086792,
- "y": 68.5038731098175,
- "z": "dfb806d8.8899e8",
+ "x": 884.4205684661865,
+ "y": 90.66670227050781,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "ecb5481e.49db98"
+ "26211aa4.6aca76"
]
]
},
{
- "id": "ecb5481e.49db98",
+ "id": "26211aa4.6aca76",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 920.0911464691162,
- "y": 67.83717083930969,
- "z": "dfb806d8.8899e8",
+ "x": 1071.0872478485107,
+ "y": 90,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "5cc69be0.888194"
+ "60b9b040.3db19"
]
]
},
{
- "id": "5cc69be0.888194",
+ "id": "60b9b040.3db19",
"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": 1101.7577724456787,
- "y": 67.83717083930969,
- "z": "dfb806d8.8899e8",
+ "x": 1252.7538738250732,
+ "y": 90,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "2b234f37.76666",
+ "id": "9afb8db9.2b0d5",
"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": 771.6744890213013,
- "y": 245.50386714935303,
- "z": "dfb806d8.8899e8",
+ "x": 922.6705904006958,
+ "y": 267.66669631004333,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "43b76269.61638c",
- "80f9fdd1.5acfa"
+ "925220d0.8e6e8",
+ "8d034f0b.c8c8d"
]
]
},
{
- "id": "43b76269.61638c",
+ "id": "925220d0.8e6e8",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1002.6744995117188,
- "y": 221.50386428833008,
- "z": "dfb806d8.8899e8",
+ "x": 1153.6706008911133,
+ "y": 243.66669344902039,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "30daa7e7.f7d908"
+ "f6929bd3.916468"
]
]
},
{
- "id": "80f9fdd1.5acfa",
+ "id": "8d034f0b.c8c8d",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1002.6744995117188,
- "y": 261.5038642883301,
- "z": "dfb806d8.8899e8",
+ "x": 1153.6706008911133,
+ "y": 283.6666934490204,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "15ffa14c.a3471f"
+ "28516ca8.58b9a4"
]
]
},
{
- "id": "30daa7e7.f7d908",
+ "id": "f6929bd3.916468",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1145.1744995117188,
- "y": 221.50386428833008,
- "z": "dfb806d8.8899e8",
+ "x": 1296.1706008911133,
+ "y": 243.66669344902039,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "15ffa14c.a3471f",
+ "id": "28516ca8.58b9a4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1147.0315437316895,
- "y": 261.4403762817383,
- "z": "dfb806d8.8899e8",
+ "x": 1298.027645111084,
+ "y": 283.6032054424286,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "81c65311.3e7fa",
- "1c59d473.dd26bc"
+ "fe45ce64.2ccb7",
+ "e4014c75.a1a78"
]
]
},
{
- "id": "1c59d473.dd26bc",
+ "id": "e4014c75.a1a78",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1299.7300186157227,
- "y": 231.05947497440502,
- "z": "dfb806d8.8899e8",
+ "x": 1450.7261199951172,
+ "y": 253.22230413509533,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "81c65311.3e7fa",
+ "id": "fe45ce64.2ccb7",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1356.1585235595703,
- "y": 284.2816047668457,
- "z": "dfb806d8.8899e8",
+ "x": 1507.1546249389648,
+ "y": 306.444433927536,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "aaf0ab5e.460008"
+ "c9dd9d48.363c4"
]
]
},
{
- "id": "85ce8231.1cc8f",
+ "id": "93986914.2633c8",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1579.809253692627,
- "y": 242.53566217422485,
- "z": "dfb806d8.8899e8",
+ "x": 1730.8053550720215,
+ "y": 264.69849133491516,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "aaf0ab5e.460008",
+ "id": "c9dd9d48.363c4",
"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": 1631.4442443847656,
- "y": 283.8531074523926,
- "z": "dfb806d8.8899e8",
+ "x": 1782.4403457641602,
+ "y": 306.0159366130829,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "1a7eae6b.66a2b2"
+ "3a28d2c1.9fee3e"
]
]
},
{
- "id": "1a7eae6b.66a2b2",
+ "id": "3a28d2c1.9fee3e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1532.1744422912598,
- "y": 342.4245386123657,
- "z": "dfb806d8.8899e8",
+ "x": 1683.1705436706543,
+ "y": 364.58736777305603,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "40223de2.189ee4"
+ "c7dfb468.8d2468"
]
]
},
{
- "id": "40223de2.189ee4",
+ "id": "c7dfb468.8d2468",
"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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
"comments": "",
- "x": 1679.924545288086,
- "y": 342.28173068119213,
- "z": "dfb806d8.8899e8",
+ "x": 1830.9206466674805,
+ "y": 364.44455984188244,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "7dbca450.42794c",
+ "id": "1b22ffce.90ac5",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 803.0039367675781,
- "y": 468.0000219345093,
- "z": "dfb806d8.8899e8",
+ "x": 954.0000381469727,
+ "y": 490.1628510951996,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[]
]
},
{
- "id": "d01634bb.bb46b8",
+ "id": "a78628f7.4e9428",
"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[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].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[$vf-index].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
"comments": "",
- "x": 774.00390625,
- "y": 722.00390625,
- "z": "dfb806d8.8899e8",
+ "x": 925.0000076293945,
+ "y": 744.1667354106903,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "80c0749d.c5b758",
+ "id": "ceaeb6e4.45d088",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 101.00390625,
- "y": 95.00390625,
- "z": "dfb806d8.8899e8",
+ "x": 252.00000762939453,
+ "y": 117.16673541069031,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "1e8e9be2.f38a84"
+ "b9aae3a1.4ae74"
]
]
},
{
- "id": "1e8e9be2.f38a84",
+ "id": "b9aae3a1.4ae74",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -433,146 +433,145 @@ "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": 215.50390434265137,
- "y": 202.00389766693115,
- "z": "dfb806d8.8899e8",
+ "x": 366.5000057220459,
+ "y": 224.16672682762146,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "441193b5.7a563c"
+ "486cfe7f.88b42"
]
]
},
{
- "id": "441193b5.7a563c",
+ "id": "486cfe7f.88b42",
"type": "method",
"name": "sdwan-vf-operation-lanport-create",
"xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 214.50390434265137,
- "y": 302.00389766693115,
- "z": "dfb806d8.8899e8",
+ "x": 365.5000057220459,
+ "y": 324.16672682762146,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "3ecdadeb.18aa62"
+ "f782e37.109032"
]
]
},
{
- "id": "43cde2b5.87e1ac",
+ "id": "9f1428de.0587b8",
"type": "execute",
"name": "execute generate-vf-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 756.0039520263672,
- "y": 576.5038995742798,
- "z": "dfb806d8.8899e8",
+ "x": 907.0000534057617,
+ "y": 598.6667287349701,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[]
]
},
{
- "id": "c6fbc47.00d1938",
+ "id": "69722b7c.abba54",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 723.0038871765137,
- "y": 123.00390815734863,
- "z": "dfb806d8.8899e8",
+ "x": 873.9999885559082,
+ "y": 145.16673731803894,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "a2640a51.5d0d78"
+ "c4314464.ea4888"
]
]
},
{
- "id": "a2640a51.5d0d78",
+ "id": "c4314464.ea4888",
"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": 974.0039825439453,
- "y": 118.67052865028381,
- "z": "dfb806d8.8899e8",
+ "x": 1125.0000839233398,
+ "y": 140.83335781097412,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "d22976f8.730608"
+ "7e2619a7.4c1a38"
]
]
},
{
- "id": "d22976f8.730608",
+ "id": "7e2619a7.4c1a38",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1192.3372993469238,
- "y": 120.6705105304718,
- "z": "dfb806d8.8899e8",
+ "x": 1343.3334007263184,
+ "y": 142.8333396911621,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "92022bc5.0cdcc8"
+ "e7b8aabb.779c28"
]
]
},
{
- "id": "92022bc5.0cdcc8",
+ "id": "e7b8aabb.779c28",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1345.6704711914062,
- "y": 120.67053151130676,
- "z": "dfb806d8.8899e8",
+ "x": 1496.6665725708008,
+ "y": 142.83336067199707,
+ "z": "5ddf8caa.1b92e4",
"wires": []
},
{
- "id": "98c6c3b2.42b6b",
+ "id": "86d99a3f.07f208",
"type": "switchNode",
"name": "switch vnf-index",
"xml": "<switch test='`$vnf-index`'>\n",
"comments": "",
"outputs": 1,
- "x": 737.00390625,
- "y": 184.00390625,
- "z": "dfb806d8.8899e8",
+ "x": 888.0000076293945,
+ "y": 206.1667354106903,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "681068c6.40fb78"
+ "885839d2.ea1b48"
]
]
},
{
- "id": "681068c6.40fb78",
+ "id": "885839d2.ea1b48",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 899.0039520263672,
- "y": 183.00390529632568,
- "z": "dfb806d8.8899e8",
+ "x": 1050.0000534057617,
+ "y": 205.166734457016,
+ "z": "5ddf8caa.1b92e4",
"wires": [
[
- "f9b4e412.cab938"
+ "1a2b1c2a.3b4624"
]
]
},
{
- "id": "f9b4e412.cab938",
+ "id": "1a2b1c2a.3b4624",
"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 not found in service-data\" />\n",
"comments": "",
- "x": 1048.2540435791016,
- "y": 180.78178310394287,
- "z": "dfb806d8.8899e8",
+ "x": 1199.250144958496,
+ "y": 202.94461226463318,
+ "z": "5ddf8caa.1b92e4",
"wires": []
}
-]
-
+]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json index 5178c07f..f299e172 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.json @@ -1,54 +1,54 @@ [
{
- "id": "5903e495.687e5c",
+ "id": "35bbf866.78a5e8",
"type": "method",
"name": "method sdwan-vf-operation-lanport-deactivate",
"xml": "<method rpc='sdwan-vf-operation-lanport-deactivate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 240.00390625,
- "y": 212.58634185791016,
- "z": "eb27f9f.1aaf508",
+ "x": 249.00390625,
+ "y": 220.58633995056152,
+ "z": "53bd9180.45e08",
"wires": [
[
- "4f6607f2.8abb38"
+ "25755a25.25e4a6"
]
]
},
{
- "id": "16a24c83.115633",
+ "id": "99c65fff.e6457",
"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": 622.0039138793945,
- "y": 363.99999046325684,
- "z": "eb27f9f.1aaf508",
+ "x": 646.0039138793945,
+ "y": 410.00000286102295,
+ "z": "53bd9180.45e08",
"wires": [
[
- "38ac049b.8f28ac",
- "918c4288.cf32",
- "e4bed2ad.0f579"
+ "9fd4d822.1e9bc8",
+ "5a6df27a.b5c33c",
+ "6ea0353d.247c0c"
]
]
},
{
- "id": "a6d98bd3.492e98",
+ "id": "4a63efcc.f1d8a",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 159.00391006469727,
- "y": 55,
- "z": "eb27f9f.1aaf508",
+ "x": 168.00391006469727,
+ "y": 62.99999809265137,
+ "z": "53bd9180.45e08",
"wires": [
[
- "1152c743.415d39"
+ "7d33035d.b0824c"
]
]
},
{
- "id": "1152c743.415d39",
+ "id": "7d33035d.b0824c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -56,1836 +56,2216 @@ "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": 228.28961181640625,
- "y": 118.23810958862305,
- "z": "eb27f9f.1aaf508",
+ "x": 237.28961181640625,
+ "y": 126.23810768127441,
+ "z": "53bd9180.45e08",
"wires": [
[
- "5903e495.687e5c"
+ "35bbf866.78a5e8"
]
]
},
{
- "id": "4f6607f2.8abb38",
+ "id": "25755a25.25e4a6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 240.6705780029297,
- "y": 468.666708946228,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "ee96d694.8e7de8",
- "ebce096c.09ff98",
- "16a24c83.115633",
- "8d9ec798.9077a8",
- "1c23a104.8b10df",
- "ea24678.936eb98",
- "1a442450.4a365c",
- "76875429.7977ec",
- "c0a9943e.0b6a78",
- "728a6387.ded5dc",
- "d768a494.487678",
- "24c5eb03.2a37b4",
- "37a0c49e.52f2ec",
- "88d74976.c878b8",
- "7eaf7940.931d68",
- "b028cd6d.5db14",
- "b07d774b.c67f18",
- "c2a2820.4e02d8",
- "6e845a3.14ef3a4",
- "715f7228.db42ac",
- "b36b6e5f.5d733"
- ]
- ]
- },
- {
- "id": "ebce096c.09ff98",
+ "x": 249.6705780029297,
+ "y": 476.6667070388794,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "cfe3e61f.155e78",
+ "e5e47d7b.5e2bd",
+ "99c65fff.e6457",
+ "f0379b33.897b78",
+ "b3b4dc97.18506",
+ "92ac4604.5a24c8",
+ "5d312c55.693bf4",
+ "b6bd8ed3.859c2",
+ "b9a7fd1a.5768b",
+ "e69ff5d3.246378",
+ "dacb223a.3b862",
+ "df8f9116.6cb59",
+ "3e7ff409.79880c",
+ "f569daa2.8f9b28",
+ "3dfde9c2.fe1616",
+ "8212e1ef.d576a",
+ "d319cb18.70bf18",
+ "4e34e7e4.f09c28",
+ "d52b4c36.b4383",
+ "898196c1.4be1c8",
+ "84308c74.6696",
+ "5399251a.d1c53c",
+ "7ffab63e.0ceec8",
+ "a8ac6552.309118"
+ ]
+ ]
+ },
+ {
+ "id": "e5e47d7b.5e2bd",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 582.0352668762207,
- "y": 221.26913261413574,
- "z": "eb27f9f.1aaf508",
+ "x": 591.0352668762207,
+ "y": 229.2691307067871,
+ "z": "53bd9180.45e08",
"wires": [
[
- "906e6ab4.d1bf48"
+ "abb41723.436e98"
]
]
},
{
- "id": "ee96d694.8e7de8",
+ "id": "cfe3e61f.155e78",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 593.0038986206055,
- "y": 159.99999332427979,
- "z": "eb27f9f.1aaf508",
+ "x": 602.0038986206055,
+ "y": 167.99999141693115,
+ "z": "53bd9180.45e08",
"wires": [
[
- "88ebf11b.dd6cf"
+ "5ecc4eea.38b52"
]
]
},
{
- "id": "88ebf11b.dd6cf",
+ "id": "5ecc4eea.38b52",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 773.0038795471191,
- "y": 158.9999828338623,
- "z": "eb27f9f.1aaf508",
+ "x": 782.0038795471191,
+ "y": 166.99998092651367,
+ "z": "53bd9180.45e08",
"wires": [
[
- "42b4e84a.5144c8"
+ "640fd5ea.dc5b5c"
]
]
},
{
- "id": "42b4e84a.5144c8",
+ "id": "640fd5ea.dc5b5c",
"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": 922.4326057434082,
- "y": 160.14290046691895,
- "z": "eb27f9f.1aaf508",
+ "x": 931.4326057434082,
+ "y": 168.1428985595703,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "906e6ab4.d1bf48",
+ "id": "abb41723.436e98",
"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": 811.0038948059082,
- "y": 221.99998903274536,
- "z": "eb27f9f.1aaf508",
+ "x": 820.0038948059082,
+ "y": 229.99998712539673,
+ "z": "53bd9180.45e08",
"wires": [
[
- "31ffe1c7.1814fe"
+ "b2038cfb.be4ff"
]
]
},
{
- "id": "31ffe1c7.1814fe",
+ "id": "b2038cfb.be4ff",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1026.0038795471191,
- "y": 219.9999828338623,
- "z": "eb27f9f.1aaf508",
+ "x": 1035.0038795471191,
+ "y": 227.99998092651367,
+ "z": "53bd9180.45e08",
"wires": [
[
- "e443968b.c056d8"
+ "d5665599.ce1f08"
]
]
},
{
- "id": "e443968b.c056d8",
+ "id": "d5665599.ce1f08",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1190.0038795471191,
- "y": 214.9999828338623,
- "z": "eb27f9f.1aaf508",
+ "x": 1199.0038795471191,
+ "y": 222.99998092651367,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "918c4288.cf32",
+ "id": "5a6df27a.b5c33c",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 844.00390625,
- "y": 398,
- "z": "eb27f9f.1aaf508",
+ "x": 897.0039176940918,
+ "y": 401.00000381469727,
+ "z": "53bd9180.45e08",
"wires": [
[
- "8a688447.06c508"
+ "6f3d1b55.996ac4"
]
]
},
{
- "id": "38ac049b.8f28ac",
+ "id": "9fd4d822.1e9bc8",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 849.0039024353027,
- "y": 344.9999990463257,
- "z": "eb27f9f.1aaf508",
+ "x": 893.0039176940918,
+ "y": 347.0000042915344,
+ "z": "53bd9180.45e08",
"wires": [
[
- "8a688447.06c508"
+ "6f3d1b55.996ac4"
]
]
},
{
- "id": "8a688447.06c508",
+ "id": "6f3d1b55.996ac4",
"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": 1007.00390625,
- "y": 358,
- "z": "eb27f9f.1aaf508",
+ "x": 1065.0038871765137,
+ "y": 363.0000047683716,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "e4bed2ad.0f579",
+ "id": "6ea0353d.247c0c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 844.00390625,
- "y": 459,
- "z": "eb27f9f.1aaf508",
+ "x": 853.00390625,
+ "y": 466.99999809265137,
+ "z": "53bd9180.45e08",
"wires": [
[
- "4a56c78a.01ddc8"
+ "c106227.8a742e"
]
]
},
{
- "id": "6a4e4809.c60518",
+ "id": "71fb1ae1.5a6d94",
"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",
"comments": "",
- "x": 1198.003921508789,
- "y": 457.0000139474869,
- "z": "eb27f9f.1aaf508",
+ "x": 1207.003921508789,
+ "y": 465.00001204013824,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "4a56c78a.01ddc8",
+ "id": "c106227.8a742e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1005.0039520263672,
- "y": 455.99999141693115,
- "z": "eb27f9f.1aaf508",
+ "x": 1014.0039520263672,
+ "y": 463.9999895095825,
+ "z": "53bd9180.45e08",
"wires": [
[
- "6a4e4809.c60518",
- "bc83d339.7a157"
+ "71fb1ae1.5a6d94",
+ "53e6b05c.c8062"
]
]
},
{
- "id": "bc83d339.7a157",
+ "id": "53e6b05c.c8062",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1217.0039367675781,
- "y": 506.0000123977661,
- "z": "eb27f9f.1aaf508",
+ "x": 1226.0039367675781,
+ "y": 514.0000104904175,
+ "z": "53bd9180.45e08",
"wires": [
[
- "f6f67e00.4f2d6"
+ "22133afc.a97b96"
]
]
},
{
- "id": "f6f67e00.4f2d6",
+ "id": "22133afc.a97b96",
"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": 1460.00390625,
- "y": 505,
- "z": "eb27f9f.1aaf508",
+ "x": 1469.00390625,
+ "y": 512.9999980926514,
+ "z": "53bd9180.45e08",
"wires": [
[
- "dd4f952e.96ea88"
+ "c42cf16b.ee598"
]
]
},
{
- "id": "dd4f952e.96ea88",
+ "id": "c42cf16b.ee598",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1658.0039348602295,
- "y": 492.0000066757202,
- "z": "eb27f9f.1aaf508",
+ "x": 1667.0039348602295,
+ "y": 500.0000047683716,
+ "z": "53bd9180.45e08",
"wires": [
[
- "daa971e2.4674d"
+ "52618d69.6a0a14"
]
]
},
{
- "id": "daa971e2.4674d",
+ "id": "52618d69.6a0a14",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1810.00390625,
- "y": 494,
- "z": "eb27f9f.1aaf508",
+ "x": 1819.00390625,
+ "y": 501.99999809265137,
+ "z": "53bd9180.45e08",
"wires": [
[
- "b77c5961.7e0078",
- "f6edb536.7a6928",
- "29517aa5.1b19a6"
+ "8df43c37.e421c",
+ "e47f4a77.f0aa38",
+ "37f7f248.465a3e"
]
]
},
{
- "id": "b77c5961.7e0078",
+ "id": "8df43c37.e421c",
"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": 2038.004020690918,
- "y": 436.00000381469727,
- "z": "eb27f9f.1aaf508",
+ "x": 2047.004020690918,
+ "y": 444.00000190734863,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "f6edb536.7a6928",
+ "id": "e47f4a77.f0aa38",
"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": 2042.004020690918,
- "y": 490.00000381469727,
- "z": "eb27f9f.1aaf508",
+ "x": 2051.004020690918,
+ "y": 498.00000190734863,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "8d9ec798.9077a8",
+ "id": "f0379b33.897b78",
"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": 541.0041198730469,
- "y": 1931.5012760162354,
- "z": "eb27f9f.1aaf508",
+ "x": 563.0041961669922,
+ "y": 2464.501329421997,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "29517aa5.1b19a6",
+ "id": "37f7f248.465a3e",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2072.4590454101562,
- "y": 541.0104961395264,
- "z": "eb27f9f.1aaf508",
+ "x": 2096.459159851074,
+ "y": 549.0105247497559,
+ "z": "53bd9180.45e08",
"wires": [
[]
]
},
{
- "id": "cc302ad2.335ad8",
- "type": "for",
- "name": "for vf-modules.vf-module_length",
- "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 879.2579803466797,
- "y": 546.0040225982666,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "58d4b8d7.026f28"
- ]
- ]
- },
- {
- "id": "ffc92a35.504858",
- "type": "switchNode",
- "name": "switch this deviceName == vf-input",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n \n",
- "comments": "",
- "outputs": 1,
- "x": 1152.2582244873047,
- "y": 632.0041282176971,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "753161a4.e4105"
- ]
- ]
- },
- {
- "id": "58d4b8d7.026f28",
- "type": "for",
- "name": "for vf-module-input-param length",
- "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1177.2578964233398,
- "y": 549.0040645599365,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "ffc92a35.504858"
- ]
- ]
- },
- {
- "id": "753161a4.e4105",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1366.2580375671387,
- "y": 629.0041129589081,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "530b71d0.67585"
- ]
- ]
- },
- {
- "id": "db40c5ed.6ed418",
- "type": "for",
- "name": "for vf-modules.vf-module_length",
- "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1755.258228302002,
- "y": 626.0042676925659,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "e3d2d09b.6274e"
- ]
- ]
- },
- {
- "id": "e3d2d09b.6274e",
- "type": "switchNode",
- "name": "switch deviceId == input vf-id",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n \n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2047.2581176757812,
- "y": 627.0042266845703,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "9b1b7b47.77c908"
- ]
- ]
- },
- {
- "id": "9b1b7b47.77c908",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2246.258285522461,
- "y": 625.0042266845703,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "6eb0efd.3e47b1"
- ]
- ]
- },
- {
- "id": "6eb0efd.3e47b1",
- "type": "set",
- "name": "set prop.lan.deviceId",
- "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
- "comments": "",
- "x": 2419.258289337158,
- "y": 625.0042676925659,
- "z": "eb27f9f.1aaf508",
- "wires": []
- },
- {
- "id": "1c23a104.8b10df",
- "type": "for",
- "name": "for service-data.vnfs.vnf_length",
- "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 625.2578277587891,
- "y": 481.00401973724365,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "cc302ad2.335ad8"
- ]
- ]
- },
- {
- "id": "427eb2b2.29a19c",
- "type": "switchNode",
- "name": "switch ActivateSDWANSiteInstance",
- "xml": "<!--switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\"-->\n<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 1220.0081939697266,
- "y": 753.0039882659912,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "d5fc4f12.f3715"
- ]
- ]
- },
- {
- "id": "9c314385.3cccd",
- "type": "for",
- "name": "for vf-modules.vf-module_length",
- "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 753.0080795288086,
- "y": 824.0040054321289,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "f0f279f1.f5aee8"
- ]
- ]
- },
- {
- "id": "c0a9943e.0b6a78",
- "type": "for",
- "name": "for service-data.vnfs.vnf_length",
- "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 617.0078887939453,
- "y": 651.0039081573486,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "a69a253a.e8e958"
- ]
- ]
- },
- {
- "id": "d5fc4f12.f3715",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1442.0081100463867,
- "y": 753.0040698051453,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "41fe08aa.15b428"
- ]
- ]
- },
- {
- "id": "41fe08aa.15b428",
- "type": "for",
- "name": "for vf-modules.vf-module_length",
- "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1523.2581176757812,
- "y": 827.5040712356567,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "687fd9fe.041c58"
- ]
- ]
- },
- {
- "id": "703289c8.f0d638",
- "type": "switchNode",
- "name": "switch siteId",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n \n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1906.2584762573242,
- "y": 834.5041785240173,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "b38ab304.d8ca8"
- ]
- ]
- },
- {
- "id": "b38ab304.d8ca8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2083.2584953308105,
- "y": 837.5040187835693,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "3a704ef2.91c232"
- ]
- ]
- },
- {
- "id": "97126ca9.bd5cb",
- "type": "set",
- "name": "set prop.attach.siteId",
- "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
- "comments": "",
- "x": 2467.259002685547,
- "y": 811.5040702819824,
- "z": "eb27f9f.1aaf508",
- "wires": []
- },
- {
- "id": "3a704ef2.91c232",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 2242.508686065674,
- "y": 833.0040588378906,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "97126ca9.bd5cb",
- "82be127b.4ba08",
- "e04e88b3.6b7888"
- ]
- ]
- },
- {
- "id": "37a0c49e.52f2ec",
+ "id": "dacb223a.3b862",
"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": 578.0078353881836,
- "y": 970.5039968490601,
- "z": "eb27f9f.1aaf508",
+ "x": 648.0079498291016,
+ "y": 1490.5041389465332,
+ "z": "53bd9180.45e08",
"wires": [
[
- "737a26fd.e1dab8",
- "dacb633c.487af",
- "48a17fc2.d83c5"
+ "c940f649.2f6038",
+ "e19a27.d3ada5d8",
+ "79fc4361.409b6c"
]
]
},
{
- "id": "737a26fd.e1dab8",
+ "id": "c940f649.2f6038",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 822.0078964233398,
- "y": 934.5039968490601,
- "z": "eb27f9f.1aaf508",
+ "x": 892.0080108642578,
+ "y": 1454.5041389465332,
+ "z": "53bd9180.45e08",
"wires": [
[
- "e7e7ee2.fc0eb1"
+ "81501425.48b828"
]
]
},
{
- "id": "dacb633c.487af",
+ "id": "e19a27.d3ada5d8",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 824.498779296875,
- "y": 970.0780334472656,
- "z": "eb27f9f.1aaf508",
+ "x": 894.498893737793,
+ "y": 1490.0781755447388,
+ "z": "53bd9180.45e08",
"wires": [
[
- "3d818670.7778da"
+ "d5f98dd5.bc10f"
]
]
},
{
- "id": "48a17fc2.d83c5",
+ "id": "79fc4361.409b6c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 819.831787109375,
- "y": 1006.4113922119141,
- "z": "eb27f9f.1aaf508",
+ "x": 889.831901550293,
+ "y": 1526.4115343093872,
+ "z": "53bd9180.45e08",
"wires": [
[
- "42fa81a1.deae7"
+ "46ccd480.5b967c"
]
]
},
{
- "id": "42fa81a1.deae7",
+ "id": "46ccd480.5b967c",
"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": 973.6042785644531,
- "y": 1003.8504791259766,
- "z": "eb27f9f.1aaf508",
+ "x": 1043.604393005371,
+ "y": 1523.8506212234497,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "3d818670.7778da",
+ "id": "d5f98dd5.bc10f",
"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": 970.0701751708984,
- "y": 968.3637208938599,
- "z": "eb27f9f.1aaf508",
+ "x": 1040.0702896118164,
+ "y": 1488.363862991333,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "e7e7ee2.fc0eb1",
+ "id": "81501425.48b828",
"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": 982.5080070495605,
- "y": 932.5039367675781,
- "z": "eb27f9f.1aaf508",
+ "x": 1052.5081214904785,
+ "y": 1452.5040788650513,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "88d74976.c878b8",
+ "id": "df8f9116.6cb59",
"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": 591.9460678100586,
- "y": 1073.62509059906,
- "z": "eb27f9f.1aaf508",
+ "x": 661.9461822509766,
+ "y": 1593.6252326965332,
+ "z": "53bd9180.45e08",
"wires": [
[
- "76d84be1.6ba5b4",
- "93f8c0dc.5b81e"
+ "75ba6457.55e20c",
+ "7c1891ac.de4b4"
]
]
},
{
- "id": "76d84be1.6ba5b4",
+ "id": "75ba6457.55e20c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 826.9461936950684,
- "y": 1059.6250791549683,
- "z": "eb27f9f.1aaf508",
+ "x": 896.9463081359863,
+ "y": 1579.6252212524414,
+ "z": "53bd9180.45e08",
"wires": [
[
- "f2b8e32a.bae75"
+ "2888a6db.27655a"
]
]
},
{
- "id": "93f8c0dc.5b81e",
+ "id": "7c1891ac.de4b4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 826.1961936950684,
- "y": 1095.2679862976074,
- "z": "eb27f9f.1aaf508",
+ "x": 896.1963081359863,
+ "y": 1615.2681283950806,
+ "z": "53bd9180.45e08",
"wires": [
[
- "f416c022.785c9"
+ "8ca3ace6.8f2fa"
]
]
},
{
- "id": "f416c022.785c9",
+ "id": "8ca3ace6.8f2fa",
"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": 974.9462013244629,
- "y": 1096.0180683135986,
- "z": "eb27f9f.1aaf508",
+ "x": 1044.9463157653809,
+ "y": 1616.0182104110718,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "f2b8e32a.bae75",
+ "id": "2888a6db.27655a",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 968.9462013244629,
- "y": 1058.6250801086426,
- "z": "eb27f9f.1aaf508",
+ "x": 1038.9463157653809,
+ "y": 1578.6252222061157,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "b028cd6d.5db14",
+ "id": "f569daa2.8f9b28",
"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 + '/sdlan-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": 618.0351638793945,
- "y": 1225.0782289505005,
- "z": "eb27f9f.1aaf508",
+ "x": 675.0353012084961,
+ "y": 1951.0783553123474,
+ "z": "53bd9180.45e08",
"wires": [
[
- "fb8d6372.3f4b4",
- "48c81a07.925bc4"
+ "4d91b121.93b57",
+ "75531b9b.e105c4"
]
]
},
{
- "id": "fb8d6372.3f4b4",
+ "id": "4d91b121.93b57",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 867.0352230072021,
- "y": 1239.0784349441528,
- "z": "eb27f9f.1aaf508",
+ "x": 941.0353107452393,
+ "y": 1965.0785331726074,
+ "z": "53bd9180.45e08",
"wires": [
[
- "a8972b96.6e4798"
+ "dd75e498.a44248"
]
]
},
{
- "id": "48c81a07.925bc4",
+ "id": "75531b9b.e105c4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 867.0352230072021,
- "y": 1201.0782704353333,
- "z": "eb27f9f.1aaf508",
+ "x": 941.0353107452393,
+ "y": 1927.0783686637878,
+ "z": "53bd9180.45e08",
"wires": [
[
- "2b546f30.f74b7"
+ "e4666bb9.655488"
]
]
},
{
- "id": "2b546f30.f74b7",
+ "id": "e4666bb9.655488",
"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": 1011.0355567932129,
- "y": 1200.078269958496,
- "z": "eb27f9f.1aaf508",
+ "x": 1085.03564453125,
+ "y": 1926.0783681869507,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "a8972b96.6e4798",
+ "id": "dd75e498.a44248",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1014.035234451294,
- "y": 1240.0782737731934,
- "z": "eb27f9f.1aaf508",
+ "x": 1088.035322189331,
+ "y": 1966.078372001648,
+ "z": "53bd9180.45e08",
"wires": [
[]
]
},
{
- "id": "7630dbec.718c24",
+ "id": "e75609bc.a3de38",
"type": "comment",
"name": "Delete port",
"info": "",
"comments": "",
- "x": 519.7011032104492,
- "y": 1191.522253036499,
- "z": "eb27f9f.1aaf508",
+ "x": 652.7012023925781,
+ "y": 1911.522358417511,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "7eaf7940.931d68",
+ "id": "3e7ff409.79880c",
"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": 566.7011032104492,
- "y": 1140.1886892318726,
- "z": "eb27f9f.1aaf508",
+ "x": 636.7012176513672,
+ "y": 1660.1888313293457,
+ "z": "53bd9180.45e08",
"wires": [
[]
]
},
{
- "id": "ea684fc6.056a2",
+ "id": "f13eba50.3d1838",
"type": "execute",
- "name": "execute RestApiCallNode bridge domain create",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\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=\"bridgeDomainResp\"/>\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`\" />",
+ "name": "execute RestApiCallNode bridge domain delete",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains/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=\"bridgeDomainResp\"/>\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": 1040.6854133605957,
- "y": 1320.188857793808,
- "z": "eb27f9f.1aaf508",
+ "x": 1080.6854934692383,
+ "y": 1843.1889221668243,
+ "z": "53bd9180.45e08",
"wires": [
[
- "3b59cd60.020932",
- "c2414827.1f0308"
+ "bc2da0e7.1ce4a",
+ "69e42e4a.84408"
]
]
},
{
- "id": "3b59cd60.020932",
+ "id": "bc2da0e7.1ce4a",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1361.6854400634766,
- "y": 1337.1891782283783,
- "z": "eb27f9f.1aaf508",
+ "x": 1401.6855201721191,
+ "y": 1860.1892426013947,
+ "z": "53bd9180.45e08",
"wires": [
[
- "ce1097ce.dee208"
+ "b57ce49e.88b5a8"
]
]
},
{
- "id": "c2414827.1f0308",
+ "id": "69e42e4a.84408",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1364.6854667663574,
- "y": 1302.1889598369598,
- "z": "eb27f9f.1aaf508",
+ "x": 1404.685546875,
+ "y": 1825.1890242099762,
+ "z": "53bd9180.45e08",
"wires": [
[
- "eb07b224.53901"
+ "9387ae8d.090e"
]
]
},
{
- "id": "eb07b224.53901",
+ "id": "9387ae8d.090e",
"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 bridge domain rest api\" />\n",
"comments": "",
- "x": 1567.6858558654785,
- "y": 1298.1890671253204,
- "z": "eb27f9f.1aaf508",
+ "x": 1607.685935974121,
+ "y": 1821.1891314983368,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "ce1097ce.dee208",
+ "id": "b57ce49e.88b5a8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1568.6854209899902,
- "y": 1333.1889336109161,
- "z": "eb27f9f.1aaf508",
+ "x": 1608.6855010986328,
+ "y": 1856.1889979839325,
+ "z": "53bd9180.45e08",
"wires": [
[]
]
},
{
- "id": "fb63c3bc.ee861",
+ "id": "4dae46d7.5c90d8",
"type": "comment",
"name": "Create bridge domain",
"info": "",
"comments": "",
- "x": 984.3513069152832,
- "y": 1286.6330835819244,
- "z": "eb27f9f.1aaf508",
+ "x": 1024.3513870239258,
+ "y": 1809.6331479549408,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "ea24678.936eb98",
+ "id": "b3b4dc97.18506",
"type": "switchNode",
"name": "switch portSwitch",
"xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 549.4629821777344,
- "y": 1335.855546951294,
- "z": "eb27f9f.1aaf508",
+ "x": 589.463062286377,
+ "y": 1858.8556113243103,
+ "z": "53bd9180.45e08",
"wires": [
[
- "3354418d.f828fe"
+ "20eebbbe.c7cef4"
]
]
},
{
- "id": "3354418d.f828fe",
+ "id": "20eebbbe.c7cef4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 737.4629096984863,
- "y": 1333.9668741226196,
- "z": "eb27f9f.1aaf508",
+ "x": 777.4629898071289,
+ "y": 1856.966938495636,
+ "z": "53bd9180.45e08",
"wires": [
[
- "ea684fc6.056a2"
+ "f13eba50.3d1838"
]
]
},
{
- "id": "1a442450.4a365c",
+ "id": "92ac4604.5a24c8",
"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.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",
"comments": "",
"outputs": 1,
- "x": 565.0078735351562,
- "y": 1421.7540397644043,
- "z": "eb27f9f.1aaf508",
+ "x": 633.0079803466797,
+ "y": 1710.754201889038,
+ "z": "53bd9180.45e08",
"wires": [
[
- "9d1d8447.931768",
- "a4c1e51b.fe66b8"
+ "83755f92.869b3",
+ "d8dc34d5.644498"
]
]
},
{
- "id": "a4c1e51b.fe66b8",
+ "id": "d8dc34d5.644498",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 766.0078926086426,
- "y": 1399.7540311813354,
- "z": "eb27f9f.1aaf508",
+ "x": 834.007999420166,
+ "y": 1688.7541933059692,
+ "z": "53bd9180.45e08",
"wires": [
[
- "1daa2649.cf0d8a"
+ "800919b7.c0b4e8"
]
]
},
{
- "id": "9d1d8447.931768",
+ "id": "83755f92.869b3",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 766.0078964233398,
- "y": 1440.7540349960327,
- "z": "eb27f9f.1aaf508",
+ "x": 834.0080032348633,
+ "y": 1729.7541971206665,
+ "z": "53bd9180.45e08",
"wires": [
[
- "77f9f3ef.24297c"
+ "8fbc1d19.f0f92"
]
]
},
{
- "id": "1daa2649.cf0d8a",
+ "id": "800919b7.c0b4e8",
"type": "set",
"name": "set ipAddress prefixLength",
"xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
"comments": "",
- "x": 963.0079116821289,
- "y": 1397.7540311813354,
- "z": "eb27f9f.1aaf508",
+ "x": 1031.0080184936523,
+ "y": 1686.7541933059692,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "77f9f3ef.24297c",
+ "id": "8fbc1d19.f0f92",
"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": 921.0079040527344,
- "y": 1437.7540340423584,
- "z": "eb27f9f.1aaf508",
+ "x": 989.0080108642578,
+ "y": 1726.7541961669922,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "623ff011.75e11",
+ "id": "535f90ba.81c84",
"type": "comment",
"name": "TODO: split ip/mask",
"info": "",
"comments": "",
- "x": 962.0175437927246,
- "y": 1359.9343032836914,
- "z": "eb27f9f.1aaf508",
+ "x": 1002.0176239013672,
+ "y": 1882.9343676567078,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "b07d774b.c67f18",
+ "id": "3dfde9c2.fe1616",
"type": "execute",
"name": "execute RestApiCallNode IPSubnets delete",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/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=\"lanPortResp\"/>\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": 623.7792434692383,
- "y": 1497.8749294281006,
- "z": "eb27f9f.1aaf508",
+ "x": 673.7793731689453,
+ "y": 1783.8751149177551,
+ "z": "53bd9180.45e08",
"wires": [
[
- "fb6426f0.aef3a8",
- "334c3bc2.ea5ee4"
+ "99c4d00e.08671",
+ "a2e86398.f1731"
]
]
},
{
- "id": "334c3bc2.ea5ee4",
+ "id": "a2e86398.f1731",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 892.7792739868164,
- "y": 1484.8749017715454,
- "z": "eb27f9f.1aaf508",
+ "x": 942.7794036865234,
+ "y": 1770.8750872612,
+ "z": "53bd9180.45e08",
"wires": [
[
- "1de305ac.79165a"
+ "af4f8529.170688"
]
]
},
{
- "id": "fb6426f0.aef3a8",
+ "id": "99c4d00e.08671",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 889.7792472839355,
- "y": 1519.8751201629639,
- "z": "eb27f9f.1aaf508",
+ "x": 939.7793769836426,
+ "y": 1805.8753056526184,
+ "z": "53bd9180.45e08",
"wires": [
[
- "e16c200f.f574"
+ "5fda12d3.42df1c"
]
]
},
{
- "id": "1de305ac.79165a",
+ "id": "af4f8529.170688",
"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": 1045.779655456543,
- "y": 1480.8751277923584,
- "z": "eb27f9f.1aaf508",
+ "x": 1095.77978515625,
+ "y": 1766.875313282013,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "e16c200f.f574",
+ "id": "5fda12d3.42df1c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1036.7792282104492,
- "y": 1520.8748760223389,
- "z": "eb27f9f.1aaf508",
+ "x": 1086.7793579101562,
+ "y": 1806.8750615119934,
+ "z": "53bd9180.45e08",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "5d312c55.693bf4",
+ "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": 588.2896728515625,
+ "y": 755.333324432373,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "8212e1ef.d576a",
+ "type": "update",
+ "name": "update SDWAN VPN status to AAI",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 627.3210525512695,
+ "y": 2405.031599998474,
+ "z": "53bd9180.45e08",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "b6bd8ed3.859c2",
+ "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": 615.0040740966797,
+ "y": 2257.2531147003174,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "b9a7fd1a.5768b",
+ "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": 649.3072738647461,
+ "y": 2301.0562238693237,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "e69ff5d3.246378",
+ "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": 616.307300567627,
+ "y": 2354.0562658309937,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "d319cb18.70bf18",
+ "type": "switchNode",
+ "name": "switch vnf-index",
+ "xml": "<switch test='`$vnf-index`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 605.00390625,
+ "y": 295.00390434265137,
+ "z": "53bd9180.45e08",
"wires": [
[
- "3689e594.d6f2aa"
+ "ef16bfb5.32205"
]
]
},
{
- "id": "3689e594.d6f2aa",
- "type": "set",
- "name": "set prop.lan.lanPortId",
- "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
+ "id": "ef16bfb5.32205",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
"comments": "",
- "x": 1243.6683311462402,
- "y": 1523.208342552185,
- "z": "eb27f9f.1aaf508",
+ "outputs": 1,
+ "x": 767.0039520263672,
+ "y": 294.00390338897705,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "533d6edf.10cb2"
+ ]
+ ]
+ },
+ {
+ "id": "533d6edf.10cb2",
+ "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 not found in service-data\" />\n",
+ "comments": "",
+ "x": 916.2540435791016,
+ "y": 291.78178119659424,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "6e845a3.14ef3a4",
+ "id": "4e34e7e4.f09c28",
"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.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`\" />",
+ "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": 613.0039138793945,
+ "y": 339.00391387939453,
+ "z": "53bd9180.45e08",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "77c41cd6.2372d4",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 640.2896423339844,
- "y": 1656.3338270187378,
- "z": "eb27f9f.1aaf508",
+ "x": 1353.0002746582031,
+ "y": 673.9999980926514,
+ "z": "53bd9180.45e08",
"wires": [
[
- "f2309f9f.30389",
- "436824e6.cfd19c"
+ "21611c6f.dff1a4"
]
]
},
{
- "id": "436824e6.cfd19c",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "6125a2b2.49651c",
+ "type": "switchNode",
+ "name": "switch this deviceName == vf-input",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1243.00048828125,
+ "y": 737.0001811981201,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "68612c50.e30414"
+ ]
+ ]
+ },
+ {
+ "id": "21611c6f.dff1a4",
+ "type": "for",
+ "name": "for vf-module-input-param length",
+ "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1639.0001220703125,
+ "y": 676.0000820159912,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "d87e69ee.1345e8"
+ ]
+ ]
+ },
+ {
+ "id": "68612c50.e30414",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 886.2895774841309,
- "y": 1692.3331775665283,
- "z": "eb27f9f.1aaf508",
+ "x": 1463.0002117156982,
+ "y": 738.0001888275146,
+ "z": "53bd9180.45e08",
"wires": [
[
- "cc161513.6096e8"
+ "edcb51f3.2237"
]
]
},
{
- "id": "cc161513.6096e8",
+ "id": "960703be.78273",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1889.0002899169922,
+ "y": 748.0000529289246,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "7bbeeb0c.35b8f4"
+ ]
+ ]
+ },
+ {
+ "id": "7bbeeb0c.35b8f4",
+ "type": "switchNode",
+ "name": "switch deviceId == input vf-id",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n \n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2197.0005645751953,
+ "y": 731.000020980835,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "e133b219.33252"
+ ]
+ ]
+ },
+ {
+ "id": "e133b219.33252",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2406.000602722168,
+ "y": 733.0000133514404,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "e0137def.ca4f7"
+ ]
+ ]
+ },
+ {
+ "id": "cfb82eaa.9abd5",
+ "type": "set",
+ "name": "set prop.lan.deviceId",
+ "xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
+ "comments": "",
+ "x": 2779.000629425049,
+ "y": 669.0001910924911,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "d87e69ee.1345e8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
- "comments": "",
"outputs": 1,
- "x": 1058.2895183563232,
- "y": 1706.333193898201,
- "z": "eb27f9f.1aaf508",
+ "x": 1868.2461585998535,
+ "y": 673.9998292922974,
+ "z": "53bd9180.45e08",
"wires": [
- []
+ [
+ "6125a2b2.49651c"
+ ]
]
},
{
- "id": "f1b7a0fd.a1f56",
- "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",
+ "id": "e0137def.ca4f7",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 2567.2461738586426,
+ "y": 697.7498325109482,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "cfb82eaa.9abd5",
+ "d20ef7d4.f5f0b8"
+ ]
+ ]
+ },
+ {
+ "id": "d20ef7d4.f5f0b8",
+ "type": "set",
+ "name": "set site-vnf-index",
+ "xml": "<set>\n<parameter name='site-vnf-index' value='`$vnfidx`' />\n",
"comments": "",
- "x": 1058.2896404266357,
- "y": 1662.333193898201,
- "z": "eb27f9f.1aaf508",
+ "x": 2776.24609375,
+ "y": 715.749822974205,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "f2309f9f.30389",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
+ "id": "b9bc4317.89e3e",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
"outputs": 1,
- "x": 890.2894954681396,
- "y": 1650.333176612854,
- "z": "eb27f9f.1aaf508",
+ "x": 1124.496078491211,
+ "y": 675.9998455047607,
+ "z": "53bd9180.45e08",
"wires": [
[
- "f1b7a0fd.a1f56"
+ "77c41cd6.2372d4"
]
]
},
{
- "id": "c2a2820.4e02d8",
- "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.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`\" />",
+ "id": "b2d8abb3.217c58",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 607.2880249023438,
- "y": 1589.832929611206,
- "z": "eb27f9f.1aaf508",
+ "x": 972.24609375,
+ "y": 679.2498235702515,
+ "z": "53bd9180.45e08",
"wires": [
[
- "5dca5344.cc070c",
- "f5dbcc17.8c2d6"
+ "b9bc4317.89e3e"
]
]
},
{
- "id": "f5dbcc17.8c2d6",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f078c09.b7bad4",
+ "type": "switchNode",
+ "name": "switch vf-modules.vf-module_length",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
"comments": "",
"outputs": 1,
- "x": 832.2879238128662,
- "y": 1609.8328419923782,
- "z": "eb27f9f.1aaf508",
+ "x": 866.2460784912109,
+ "y": 628.2498235702515,
+ "z": "53bd9180.45e08",
"wires": [
[
- "ffd8c00c.52d8c"
+ "b2d8abb3.217c58"
]
]
},
{
- "id": "ffd8c00c.52d8c",
+ "id": "c16816f9.ad7738",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
+ "outputs": 1,
+ "x": 666.4961013793945,
+ "y": 588.99982213974,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "f078c09.b7bad4"
+ ]
+ ]
+ },
+ {
+ "id": "d52b4c36.b4383",
+ "type": "for",
+ "name": "for service-data.vnfs.vnf_length",
+ "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1002.28786277771,
- "y": 1612.8328419923782,
- "z": "eb27f9f.1aaf508",
+ "x": 607,
+ "y": 540.9999599456787,
+ "z": "53bd9180.45e08",
"wires": [
- []
+ [
+ "c16816f9.ad7738"
+ ]
]
},
{
- "id": "60415.0a145bec",
- "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",
+ "id": "edcb51f3.2237",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1630.6666259765625,
+ "y": 743.9999980926514,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "960703be.78273",
+ "4982b8e3.7bf018"
+ ]
+ ]
+ },
+ {
+ "id": "4982b8e3.7bf018",
+ "type": "set",
+ "name": "set prop.vnf-id",
+ "xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",
"comments": "",
- "x": 1002.2879848480225,
- "y": 1568.8328419923782,
- "z": "eb27f9f.1aaf508",
+ "x": 1838.666603088379,
+ "y": 710.9999837875366,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "5dca5344.cc070c",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
+ "id": "76c5dda5.a20724",
+ "type": "switchNode",
+ "name": "switch ActivateSDWANSiteInstance",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1204.000015258789,
+ "y": 984.9999885559082,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "8cda715e.63dfe"
+ ]
+ ]
+ },
+ {
+ "id": "54e7e0d7.ec4c7",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 835.28786277771,
- "y": 1568.8328419923782,
- "z": "eb27f9f.1aaf508",
+ "x": 849.9998550415039,
+ "y": 952.0000286102295,
+ "z": "53bd9180.45e08",
"wires": [
[
- "60415.0a145bec"
+ "df9b68f3.e58818"
]
]
},
{
- "id": "55cb7e10.b843e",
+ "id": "8cda715e.63dfe",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1425.9999313354492,
+ "y": 985.0000700950623,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "3b6a7f.d02b6582"
+ ]
+ ]
+ },
+ {
+ "id": "7bec1948.27ddc8",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2978.2502937316895,
+ "y": 1072.500097155571,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "d5a6d636.c92678"
+ ]
+ ]
+ },
+ {
+ "id": "b505ce84.b2b46",
+ "type": "set",
+ "name": "set prop.attach.siteId",
+ "xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\n",
+ "comments": "",
+ "x": 3369.2509765625,
+ "y": 1025.5001991987228,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "d5a6d636.c92678",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 3137.5004844665527,
+ "y": 1068.0001372098923,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "b505ce84.b2b46",
+ "4da0fe6e.eebe4",
+ "17807948.b29547"
+ ]
+ ]
+ },
+ {
+ "id": "73df7c27.84ca64",
"type": "switchNode",
"name": "switch ActivateSDWANVpnInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1198.2898483276367,
- "y": 874.3332567214966,
- "z": "eb27f9f.1aaf508",
+ "x": 1001.2816162109375,
+ "y": 1147.3292617797852,
+ "z": "53bd9180.45e08",
"wires": [
[
- "35e81d22.6ca8a2"
+ "acb8bfa5.0f71a"
]
]
},
{
- "id": "f0f279f1.f5aee8",
+ "id": "df9b68f3.e58818",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 955.6229515075684,
- "y": 803.3333368301392,
- "z": "eb27f9f.1aaf508",
+ "x": 939.6147727966309,
+ "y": 1035.3293371200562,
+ "z": "53bd9180.45e08",
"wires": [
[
- "427eb2b2.29a19c",
- "55cb7e10.b843e",
- "ee6738c4.de8eb8"
+ "76c5dda5.a20724"
]
]
},
{
- "id": "35e81d22.6ca8a2",
+ "id": "acb8bfa5.0f71a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1293.9563598632812,
- "y": 948.3333377838135,
- "z": "eb27f9f.1aaf508",
+ "x": 1234.9482421875,
+ "y": 1165.3293838500977,
+ "z": "53bd9180.45e08",
"wires": [
[
- "50c0c92c.64de28"
+ "afc867ac.84f698"
]
]
},
{
- "id": "50c0c92c.64de28",
+ "id": "afc867ac.84f698",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1508.2062454223633,
- "y": 949.8333144187927,
- "z": "eb27f9f.1aaf508",
+ "x": 1478.1981353759766,
+ "y": 1178.8293342590332,
+ "z": "53bd9180.45e08",
"wires": [
[
- "759cda21.f2dc74"
+ "3989a47c.b3eb0c"
]
]
},
{
- "id": "759cda21.f2dc74",
+ "id": "8e8a391c.6736c8",
"type": "switchNode",
"name": "switch vpn-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 1755.206283569336,
- "y": 944.8333973884583,
- "z": "eb27f9f.1aaf508",
+ "x": 1917.1982345581055,
+ "y": 1230.8293769359589,
+ "z": "53bd9180.45e08",
"wires": [
[
- "848c4744.1c01a8"
+ "837b3b44.ef6fa8"
]
]
},
{
- "id": "848c4744.1c01a8",
+ "id": "837b3b44.ef6fa8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1905.9562377929688,
- "y": 946.3333129882812,
- "z": "eb27f9f.1aaf508",
+ "x": 2067.9481887817383,
+ "y": 1232.3292925357819,
+ "z": "53bd9180.45e08",
"wires": [
[
- "3b552595.502b8a"
+ "f9c5d7e8.6fe0f8"
]
]
},
{
- "id": "3b552595.502b8a",
+ "id": "f9c5d7e8.6fe0f8",
"type": "set",
"name": "set prop.vpn1Id",
- "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
+ "xml": "<set>\n<parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
"comments": "",
- "x": 2079.956985473633,
- "y": 946.3333714008331,
- "z": "eb27f9f.1aaf508",
+ "x": 2241.9489364624023,
+ "y": 1232.3293509483337,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "82be127b.4ba08",
+ "id": "4da0fe6e.eebe4",
"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": 2510.2903594970703,
- "y": 852.3333714008331,
- "z": "eb27f9f.1aaf508",
+ "x": 3405.2822265625,
+ "y": 1080.3294657468796,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "e04e88b3.6b7888",
+ "id": "17807948.b29547",
"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": 2541.290252685547,
- "y": 895.3333377838135,
- "z": "eb27f9f.1aaf508",
- "wires": []
- },
- {
- "id": "76875429.7977ec",
- "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": 627.2896270751953,
- "y": 600.333330154419,
- "z": "eb27f9f.1aaf508",
+ "x": 3436.282051086426,
+ "y": 1130.3294161558151,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "687fd9fe.041c58",
- "type": "block",
- "name": "block atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1740.6232833862305,
- "y": 828.3333358764648,
- "z": "eb27f9f.1aaf508",
- "wires": [
- [
- "703289c8.f0d638",
- "7c3e64c6.118e7c",
- "fd5e762b.9175c8"
- ]
- ]
- },
- {
- "id": "7c3e64c6.118e7c",
+ "id": "f9ac8f47.1e9e6",
"type": "switchNode",
"name": "switch role",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 1902.9562149047852,
- "y": 759.3333349227905,
- "z": "eb27f9f.1aaf508",
+ "x": 2147.948272705078,
+ "y": 968.329355597496,
+ "z": "53bd9180.45e08",
"wires": [
[
- "9d3d23c.1af69e"
+ "5c967566.19521c"
]
]
},
{
- "id": "9d3d23c.1af69e",
+ "id": "5c967566.19521c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2065.9562187194824,
- "y": 754.3333358764648,
- "z": "eb27f9f.1aaf508",
+ "x": 2311.9482765197754,
+ "y": 968.329355597496,
+ "z": "53bd9180.45e08",
"wires": [
[
- "b50c3782.0e6ad8"
+ "3f851d36.3fe612"
]
]
},
{
- "id": "b50c3782.0e6ad8",
+ "id": "3f851d36.3fe612",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2233.9562606811523,
- "y": 748.3333339691162,
- "z": "eb27f9f.1aaf508",
+ "x": 2499.948444366455,
+ "y": 953.3293546438217,
+ "z": "53bd9180.45e08",
"wires": [
[
- "1dffa18.8cf065f",
- "4b307f30.7cc1"
+ "45f33203.c0930c",
+ "7bf54e32.503a7",
+ "8e7a27c3.580478"
]
]
},
{
- "id": "4b307f30.7cc1",
+ "id": "7bf54e32.503a7",
"type": "switchNode",
"name": "switch sd-wan-edge",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2428.9563903808594,
- "y": 709.3333253860474,
- "z": "eb27f9f.1aaf508",
+ "x": 2694.948574066162,
+ "y": 914.3293460607529,
+ "z": "53bd9180.45e08",
"wires": [
[
- "fcbf0bd1.06d8d8"
+ "777af33b.674edc"
]
]
},
{
- "id": "1dffa18.8cf065f",
+ "id": "45f33203.c0930c",
"type": "switchNode",
"name": "switch dsvpn-hub",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n \n\n\n",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 2425.956497192383,
- "y": 764.333340883255,
- "z": "eb27f9f.1aaf508",
+ "x": 2691.9486808776855,
+ "y": 969.3293615579605,
+ "z": "53bd9180.45e08",
"wires": [
[
- "99c61a76.666788"
+ "caa4c354.afd2"
]
]
},
{
- "id": "4a479c02.0630f4",
+ "id": "fdf6d987.e37e68",
"type": "set",
"name": "set spoke role",
"xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
"comments": "",
- "x": 2758.956512451172,
- "y": 703.3333711624146,
- "z": "eb27f9f.1aaf508",
+ "x": 3024.9486961364746,
+ "y": 908.32939183712,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "5e79562c.63b268",
+ "id": "17e33b60.b53685",
"type": "set",
"name": "set hub role",
"xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
"comments": "",
- "x": 2757.956272125244,
- "y": 758.3333549499512,
- "z": "eb27f9f.1aaf508",
+ "x": 3023.948455810547,
+ "y": 963.3293756246567,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "fcbf0bd1.06d8d8",
+ "id": "777af33b.674edc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2598.9563598632812,
- "y": 705,
- "z": "eb27f9f.1aaf508",
+ "x": 2864.948543548584,
+ "y": 909.9960206747055,
+ "z": "53bd9180.45e08",
"wires": [
[
- "4a479c02.0630f4"
+ "fdf6d987.e37e68"
]
]
},
{
- "id": "99c61a76.666788",
+ "id": "caa4c354.afd2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2602.9563598632812,
- "y": 760,
- "z": "eb27f9f.1aaf508",
+ "x": 2868.948543548584,
+ "y": 964.9960206747055,
+ "z": "53bd9180.45e08",
"wires": [
[
- "5e79562c.63b268"
+ "17e33b60.b53685"
]
]
},
{
- "id": "715f7228.db42ac",
- "type": "update",
- "name": "update SDWAN VPN status to AAI",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",
+ "id": "709b059b.1a3b4c",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 605.3209762573242,
- "y": 1872.0315465927124,
- "z": "eb27f9f.1aaf508",
+ "x": 707.606761932373,
+ "y": 1287.9920058250427,
+ "z": "53bd9180.45e08",
"wires": [
- []
+ [
+ "82979871.cd6fd8"
+ ]
]
},
{
- "id": "fd5e762b.9175c8",
- "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/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",
+ "id": "82979871.cd6fd8",
+ "type": "switchNode",
+ "name": "switch ActivateSDWANSiteInstance",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1898.3208618164062,
- "y": 703.53125,
- "z": "eb27f9f.1aaf508",
+ "x": 971.9920043945312,
+ "y": 1237.6626572608948,
+ "z": "53bd9180.45e08",
"wires": [
- []
+ [
+ "f8c88c15.90092"
+ ]
]
},
{
- "id": "ee6738c4.de8eb8",
- "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/svclogic24.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\n",
+ "id": "f8c88c15.90092",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1141.3210792541504,
- "y": 704.5313692092896,
- "z": "eb27f9f.1aaf508",
+ "x": 1193.9919204711914,
+ "y": 1237.6627388000488,
+ "z": "53bd9180.45e08",
"wires": [
- []
+ [
+ "1c164ecd.76b921"
+ ]
]
},
{
- "id": "5ab12293.b61a8c",
- "type": "comment",
- "name": "**revert the changes",
- "info": "",
+ "id": "1c164ecd.76b921",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
- "x": 1299.320888519287,
- "y": 709.0312824249268,
- "z": "eb27f9f.1aaf508",
- "wires": []
+ "outputs": 1,
+ "x": 1275.241928100586,
+ "y": 1312.1627402305603,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "c8fa5a58.80db78"
+ ]
+ ]
+ },
+ {
+ "id": "c8fa5a58.80db78",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1492.6070938110352,
+ "y": 1312.9920048713684,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "aa284cfd.de3c"
+ ]
+ ]
+ },
+ {
+ "id": "aa284cfd.de3c",
+ "type": "switchNode",
+ "name": "switch siteId",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n \n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1658.242286682129,
+ "y": 1319.162847518921,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "f702cf2b.aacec"
+ ]
+ ]
+ },
+ {
+ "id": "f702cf2b.aacec",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1835.2423057556152,
+ "y": 1322.162687778473,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "b76df1d4.d74b6"
+ ]
+ ]
},
{
- "id": "530b71d0.67585",
+ "id": "b76df1d4.d74b6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1524.3372802734375,
- "y": 626.2530469894409,
- "z": "eb27f9f.1aaf508",
+ "x": 1994.4924964904785,
+ "y": 1317.6627278327942,
+ "z": "53bd9180.45e08",
"wires": [
[
- "db40c5ed.6ed418",
- "68d688c3.70e818"
+ "b312ede7.48d31"
]
]
},
{
- "id": "68d688c3.70e818",
+ "id": "b312ede7.48d31",
"type": "set",
- "name": "set prop.vnf-id",
- "xml": "<set>\n<parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />\n\n",
+ "name": "set prop.attach.siteId",
+ "xml": "<set>\n<parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
"comments": "",
- "x": 1716.0039558410645,
- "y": 556.2530250549316,
- "z": "eb27f9f.1aaf508",
+ "x": 2219.2428131103516,
+ "y": 1296.162739276886,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "a69a253a.e8e958",
+ "id": "3989a47c.b3eb0c",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1716.9918365478516,
+ "y": 1179.3293342590332,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "8e8a391c.6736c8",
+ "d0a786b4.a86d48",
+ "56d8edb1.dcf524"
+ ]
+ ]
+ },
+ {
+ "id": "d0a786b4.a86d48",
+ "type": "switchNode",
+ "name": "switch name",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`\">\n \n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1917.991844177246,
+ "y": 1179.3293232917786,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "3ed84db0.ad5f32"
+ ]
+ ]
+ },
+ {
+ "id": "3ed84db0.ad5f32",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2068.741798400879,
+ "y": 1180.8292388916016,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "8a23eec9.2e81d"
+ ]
+ ]
+ },
+ {
+ "id": "8a23eec9.2e81d",
+ "type": "set",
+ "name": "set prop.name",
+ "xml": "<set>\n<parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
+ "comments": "",
+ "x": 2242.742546081543,
+ "y": 1180.8292973041534,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "506103c9.e594dc",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1910.2501907348633,
+ "y": 967.5001720190048,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "f9ac8f47.1e9e6"
+ ]
+ ]
+ },
+ {
+ "id": "6f32456b.72586c",
+ "type": "switchNode",
+ "name": "switch siteId",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`\">\n \n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2801.250274658203,
+ "y": 1069.500256896019,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "7bec1948.27ddc8"
+ ]
+ ]
+ },
+ {
+ "id": "3b6a7f.d02b6582",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1624.5231094360352,
+ "y": 993.0272792577744,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "506103c9.e594dc"
+ ]
+ ]
+ },
+ {
+ "id": "8e7a27c3.580478",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2554.5228729248047,
+ "y": 1063.02727496624,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "6f32456b.72586c"
+ ]
+ ]
+ },
+ {
+ "id": "56d8edb1.dcf524",
+ "type": "switchNode",
+ "name": "switch topology",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`\">\n \n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1916.495735168457,
+ "y": 1119.7499059438705,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "d01e6e11.a971d"
+ ]
+ ]
+ },
+ {
+ "id": "d01e6e11.a971d",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2067.24568939209,
+ "y": 1121.2498215436935,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "6ddbdfd6.cc626"
+ ]
+ ]
+ },
+ {
+ "id": "6ddbdfd6.cc626",
+ "type": "set",
+ "name": "set prop.topology",
+ "xml": "<set>\n<parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
+ "comments": "",
+ "x": 2241.246437072754,
+ "y": 1121.2498799562454,
+ "z": "53bd9180.45e08",
+ "wires": []
+ },
+ {
+ "id": "84308c74.6696",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 605.9918594360352,
+ "y": 1191.662724018097,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "709b059b.1a3b4c"
+ ]
+ ]
+ },
+ {
+ "id": "898196c1.4be1c8",
+ "type": "for",
+ "name": "for service-data.vnfs.vnf_length",
+ "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 600.9997100830078,
+ "y": 882.9999084472656,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "1312e19.ff3371e"
+ ]
+ ]
+ },
+ {
+ "id": "1312e19.ff3371e",
"type": "switchNode",
"name": "switch prop.vnf-id match",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-id == $prop.vnf-id`\">",
"comments": "",
"outputs": 1,
- "x": 874.0042572021484,
- "y": 677.5863618850708,
- "z": "eb27f9f.1aaf508",
+ "x": 862.0000152587891,
+ "y": 888.9999885559082,
+ "z": "53bd9180.45e08",
"wires": [
[
- "5ecfed21.a77fb4"
+ "e5973ada.69f578"
]
]
},
{
- "id": "5ecfed21.a77fb4",
+ "id": "e5973ada.69f578",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 662.0044097900391,
- "y": 752.5863652229309,
- "z": "eb27f9f.1aaf508",
+ "x": 1066.0001983642578,
+ "y": 891.9999885559082,
+ "z": "53bd9180.45e08",
"wires": [
[
- "9c314385.3cccd"
+ "54e7e0d7.ec4c7"
]
]
},
{
- "id": "efed662f.81b6a8",
+ "id": "3b1cdfc0.3a554",
"type": "comment",
"name": "if device-name match with the incomming device-name, sites in this service vnf should not be included",
"info": "",
"comments": "",
- "x": 737.0039978027344,
- "y": 849.5863828659058,
- "z": "eb27f9f.1aaf508",
+ "x": 1016.0000152587891,
+ "y": 846.9999885559082,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "728a6387.ded5dc",
- "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",
+ "id": "5399251a.d1c53c",
+ "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.vpnId + '/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.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": "",
- "x": 593.0039978027344,
- "y": 1724.2530612945557,
- "z": "eb27f9f.1aaf508",
- "wires": []
+ "outputs": 1,
+ "x": 658.5039520263672,
+ "y": 2143.5038986206055,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "fe03e503.9b1f18",
+ "3b9440a6.e7886"
+ ]
+ ]
},
{
- "id": "d768a494.487678",
- "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",
+ "id": "3b9440a6.e7886",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
"comments": "",
- "x": 627.3071975708008,
- "y": 1768.056170463562,
- "z": "eb27f9f.1aaf508",
- "wires": []
+ "outputs": 1,
+ "x": 919.5038585662842,
+ "y": 2170.503242611885,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "818c55d3.807c68"
+ ]
+ ]
},
{
- "id": "24c5eb03.2a37b4",
- "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`' />",
+ "id": "818c55d3.807c68",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1089.503797531128,
+ "y": 2173.503242611885,
+ "z": "53bd9180.45e08",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fe431e88.b86a8",
+ "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": 594.3072242736816,
- "y": 1821.056212425232,
- "z": "eb27f9f.1aaf508",
+ "x": 1089.5039196014404,
+ "y": 2129.503242611885,
+ "z": "53bd9180.45e08",
"wires": []
},
{
- "id": "b36b6e5f.5d733",
- "type": "switchNode",
- "name": "switch vnf-index",
- "xml": "<switch test='`$vnf-index`'>\n",
+ "id": "fe03e503.9b1f18",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 596.00390625,
- "y": 287.00390625,
- "z": "eb27f9f.1aaf508",
+ "x": 922.5037975311279,
+ "y": 2129.503242611885,
+ "z": "53bd9180.45e08",
"wires": [
[
- "eab1927d.01f0a"
+ "fe431e88.b86a8"
]
]
},
{
- "id": "eab1927d.01f0a",
- "type": "other",
- "name": "Null",
- "xml": "<outcome value=''>\n",
+ "id": "a8ac6552.309118",
+ "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.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": 640.5022888183594,
+ "y": 2053.0029220581055,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "ee15b935.f63c98",
+ "c139232f.6bd6e"
+ ]
+ ]
+ },
+ {
+ "id": "c139232f.6bd6e",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 758.0039520263672,
- "y": 286.0039052963257,
- "z": "eb27f9f.1aaf508",
+ "x": 863.5022029876709,
+ "y": 2077.0028907060623,
+ "z": "53bd9180.45e08",
"wires": [
[
- "a638e200.1e293"
+ "fbcee124.bb586"
]
]
},
{
- "id": "a638e200.1e293",
+ "id": "fbcee124.bb586",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1033.5021419525146,
+ "y": 2080.0028907060623,
+ "z": "53bd9180.45e08",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "8f294b6c.2dfef8",
"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 not found in service-data\" />\n",
+ "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": 907.2540435791016,
- "y": 283.78178310394287,
- "z": "eb27f9f.1aaf508",
+ "x": 1033.5022640228271,
+ "y": 2036.0028907060623,
+ "z": "53bd9180.45e08",
"wires": []
+ },
+ {
+ "id": "ee15b935.f63c98",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 866.5021419525146,
+ "y": 2036.0028907060623,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "8f294b6c.2dfef8"
+ ]
+ ]
+ },
+ {
+ "id": "7ffab63e.0ceec8",
+ "type": "for",
+ "name": "for service-data.vnfs.vnf_length",
+ "xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 593.75390625,
+ "y": 1018.7539043426514,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "f2ff74c6.2d66c8"
+ ]
+ ]
+ },
+ {
+ "id": "f2ff74c6.2d66c8",
+ "type": "for",
+ "name": "for vf-modules.vf-module_length",
+ "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 728.7540435791016,
+ "y": 1087.754051208496,
+ "z": "53bd9180.45e08",
+ "wires": [
+ [
+ "73df7c27.84ca64"
+ ]
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json index d66530dd..74c64fd7 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json @@ -1,22 +1,22 @@ [
{
- "id": "5b377527.318dfc",
+ "id": "ec163be6.3f3848",
"type": "method",
"name": "method sdwan-vf-operation-lanport-delete",
"xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 289.00390625,
- "y": 239.5863505601883,
- "z": "6e499246.1345bc",
+ "x": 257,
+ "y": 184.58635187149048,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "b6ef6d6.088219"
+ "4793fbaf.4f8194"
]
]
},
{
- "id": "5fa9c4d6.4ec86c",
+ "id": "1bec69d8.54d756",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -24,707 +24,707 @@ "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": 277.28961181640625,
- "y": 140.23810827732086,
- "z": "6e499246.1345bc",
+ "x": 245.28570556640625,
+ "y": 85.23810958862305,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "5b377527.318dfc"
+ "ec163be6.3f3848"
]
]
},
{
- "id": "3e4efa76.6244b6",
+ "id": "8b3450fa.11be1",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 198.00390625,
- "y": 77.99999868869781,
- "z": "6e499246.1345bc",
+ "x": 166,
+ "y": 23,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "5fa9c4d6.4ec86c"
+ "1bec69d8.54d756"
]
]
},
{
- "id": "b6ef6d6.088219",
+ "id": "4793fbaf.4f8194",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 305.6706085205078,
- "y": 468.6667181253433,
- "z": "6e499246.1345bc",
+ "x": 273.6667022705078,
+ "y": 413.6667194366455,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "71f387b9.003178",
- "a6a43527.61a1e8",
- "4d09affd.63ec7",
- "158609f4.fc8936",
- "7132f9a1.7bd008",
- "379a2e2e.3a8382",
- "6e5f86e6.881a38",
- "13d12ad9.b40a25",
- "50901066.93c6f",
- "71b32013.3584b",
- "c59a5d45.5b06a",
- "4315ff0e.d57d4",
- "cd89e451.16b298"
+ "9dfafdb.c466",
+ "a32b04df.766888",
+ "1b926ba7.620a94",
+ "d56abb49.55c298",
+ "dcdd31d0.479e7",
+ "fb17bb23.b22de8",
+ "4443f52d.bb0e4c",
+ "3673a6e1.e30cca",
+ "2bcb08d.42550f8",
+ "48c6ddd.4092a24",
+ "96d011a.ebe42f",
+ "279f2432.3dd51c",
+ "9d4a1934.79a7a8"
]
]
},
{
- "id": "a6a43527.61a1e8",
+ "id": "a32b04df.766888",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 640.0352554321289,
- "y": 249.26914072036743,
- "z": "6e499246.1345bc",
+ "x": 608.0313491821289,
+ "y": 194.26914203166962,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "5c4cd934.c95538"
+ "f4a89702.3708f8"
]
]
},
{
- "id": "71f387b9.003178",
+ "id": "9dfafdb.c466",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 645.0039100646973,
- "y": 188.00001001358032,
- "z": "6e499246.1345bc",
+ "x": 613.0000038146973,
+ "y": 133.0000113248825,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "ec17d276.93fee"
+ "58b9bfe5.41c97"
]
]
},
{
- "id": "ec17d276.93fee",
+ "id": "58b9bfe5.41c97",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 825.0038909912109,
- "y": 186.99999952316284,
- "z": "6e499246.1345bc",
+ "x": 792.9999847412109,
+ "y": 132.00000083446503,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "2a49b970.30fb16"
+ "2d04caf9.98dff6"
]
]
},
{
- "id": "2a49b970.30fb16",
+ "id": "2d04caf9.98dff6",
"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": 974.4326171875,
- "y": 188.14291715621948,
- "z": "6e499246.1345bc",
+ "x": 942.4287109375,
+ "y": 133.14291846752167,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "5c4cd934.c95538",
+ "id": "f4a89702.3708f8",
"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": 863.00390625,
- "y": 250.0000057220459,
- "z": "6e499246.1345bc",
+ "x": 831,
+ "y": 195.00000703334808,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "2a4d20b9.66aac"
+ "4ee74d2f.481124"
]
]
},
{
- "id": "2a4d20b9.66aac",
+ "id": "4ee74d2f.481124",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1078.003890991211,
- "y": 247.99999952316284,
- "z": "6e499246.1345bc",
+ "x": 1045.999984741211,
+ "y": 193.00000083446503,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "991cadde.a1c2"
+ "864b8c78.81cb3"
]
]
},
{
- "id": "991cadde.a1c2",
+ "id": "864b8c78.81cb3",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1242.003890991211,
- "y": 242.99999952316284,
- "z": "6e499246.1345bc",
+ "x": 1209.999984741211,
+ "y": 188.00000083446503,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "4d09affd.63ec7",
+ "id": "1b926ba7.620a94",
"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": 692.0039405822754,
- "y": 391.00002348423004,
- "z": "6e499246.1345bc",
+ "x": 660.0000343322754,
+ "y": 336.0000247955322,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "7db8009f.80aa9",
- "7fce8758.381048",
- "58a4a3cc.ac1abc"
+ "f160fe58.60ceb",
+ "c6dbecb6.3daf1",
+ "78728405.050dbc"
]
]
},
{
- "id": "7fce8758.381048",
+ "id": "c6dbecb6.3daf1",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 914.0039329528809,
- "y": 425.0000330209732,
- "z": "6e499246.1345bc",
+ "x": 882.0000267028809,
+ "y": 370.0000343322754,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "c31ea383.0d2c3"
+ "8b2c8779.a3f058"
]
]
},
{
- "id": "7db8009f.80aa9",
+ "id": "f160fe58.60ceb",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 919.0039291381836,
- "y": 372.0000320672989,
- "z": "6e499246.1345bc",
+ "x": 887.0000228881836,
+ "y": 317.0000333786011,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "c31ea383.0d2c3"
+ "8b2c8779.a3f058"
]
]
},
{
- "id": "c31ea383.0d2c3",
+ "id": "8b2c8779.a3f058",
"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": 1077.0039329528809,
- "y": 385.0000330209732,
- "z": "6e499246.1345bc",
+ "x": 1045.0000267028809,
+ "y": 330.0000343322754,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "58a4a3cc.ac1abc",
+ "id": "78728405.050dbc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 914.0039329528809,
- "y": 486.0000330209732,
- "z": "6e499246.1345bc",
+ "x": 882.0000267028809,
+ "y": 431.0000343322754,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "d3465076.36c57"
+ "3894cc60.de2194"
]
]
},
{
- "id": "b0e78257.0ab82",
+ "id": "70ed1707.f5ee78",
"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",
"comments": "",
- "x": 1268.00394821167,
- "y": 484.0000469684601,
- "z": "6e499246.1345bc",
+ "x": 1236.00004196167,
+ "y": 429.00004827976227,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "d3465076.36c57",
+ "id": "3894cc60.de2194",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1075.003978729248,
- "y": 483.00002443790436,
- "z": "6e499246.1345bc",
+ "x": 1043.000072479248,
+ "y": 428.00002574920654,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "b0e78257.0ab82",
- "d9692dd.614b9d"
+ "70ed1707.f5ee78",
+ "ec070549.11ed28"
]
]
},
{
- "id": "d9692dd.614b9d",
+ "id": "ec070549.11ed28",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1287.0039176940918,
- "y": 537.00002348423,
- "z": "6e499246.1345bc",
+ "x": 1255.0000114440918,
+ "y": 482.0000247955322,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "45a4bb37.a28924"
+ "fcb13450.487cd8"
]
]
},
{
- "id": "45a4bb37.a28924",
+ "id": "fcb13450.487cd8",
"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": 1558.0039367675781,
- "y": 538.0000606775284,
- "z": "6e499246.1345bc",
+ "x": 1526.0000305175781,
+ "y": 483.00006198883057,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "a0aa45d1.8fe618"
+ "f167edc3.b2418"
]
]
},
{
- "id": "a0aa45d1.8fe618",
+ "id": "f167edc3.b2418",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1771.0040607452393,
- "y": 525.0000301599503,
- "z": "6e499246.1345bc",
+ "x": 1739.0001544952393,
+ "y": 470.00003147125244,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "e8f5881c.0d1318"
+ "3335b07e.93a8c"
]
]
},
{
- "id": "e8f5881c.0d1318",
+ "id": "3335b07e.93a8c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1923.0040321350098,
- "y": 527.00002348423,
- "z": "6e499246.1345bc",
+ "x": 1891.0001258850098,
+ "y": 472.0000247955322,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "f7c8637f.374ce",
- "c9be57ad.3da878",
- "26312e31.67daa2"
+ "3d815800.695568",
+ "da733ba9.b543b8",
+ "ab8c2e99.50d5d"
]
]
},
{
- "id": "f7c8637f.374ce",
+ "id": "3d815800.695568",
"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": 2145.0040321350098,
- "y": 523.00002348423,
- "z": "6e499246.1345bc",
+ "x": 2113.0001258850098,
+ "y": 468.0000247955322,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "c9be57ad.3da878",
+ "id": "da733ba9.b543b8",
"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": 2151.0040321350098,
- "y": 572.00002348423,
- "z": "6e499246.1345bc",
+ "x": 2119.0001258850098,
+ "y": 517.0000247955322,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "26312e31.67daa2",
+ "id": "ab8c2e99.50d5d",
"type": "call",
"name": "call sdwan-get-vf-module-lan-param",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' >\n",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2179.004253387451,
- "y": 620.0000292062759,
- "z": "6e499246.1345bc",
+ "x": 2147.000347137451,
+ "y": 565.0000305175781,
+ "z": "1c424bc5.8e5824",
"wires": [
[]
]
},
{
- "id": "158609f4.fc8936",
+ "id": "d56abb49.55c298",
"type": "switchNode",
"name": "switch tmp.vidx ",
"xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 631.0351524353027,
- "y": 564.0161062479019,
- "z": "6e499246.1345bc",
+ "x": 599.0312461853027,
+ "y": 509.0161075592041,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "cbb03bf0.425b98"
+ "a2f7bc45.7d854"
]
]
},
{
- "id": "cbb03bf0.425b98",
+ "id": "a2f7bc45.7d854",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 778.463794708252,
- "y": 563.5875164270401,
- "z": "6e499246.1345bc",
+ "x": 746.459888458252,
+ "y": 508.5875177383423,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "6af4136a.19a86c"
+ "a5b6de1f.319b7"
]
]
},
{
- "id": "6af4136a.19a86c",
+ "id": "a5b6de1f.319b7",
"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": 927.892520904541,
- "y": 564.7304340600967,
- "z": "6e499246.1345bc",
+ "x": 895.888614654541,
+ "y": 509.7304353713989,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "7132f9a1.7bd008",
+ "id": "9d4a1934.79a7a8",
"type": "switchNode",
"name": "switch vf-module-oper-status",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 675.3333129882812,
- "y": 634.3333116769791,
- "z": "6e499246.1345bc",
+ "x": 643.3294067382812,
+ "y": 579.3333129882812,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "32ea7a53.265046",
- "d6d3b52a.3f5ab8"
+ "88c55560.ea56c8",
+ "5f573696.518908"
]
]
},
{
- "id": "32ea7a53.265046",
+ "id": "88c55560.ea56c8",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 966.1665802001953,
- "y": 638.444434762001,
- "z": "6e499246.1345bc",
+ "x": 930.1627044677734,
+ "y": 562.4444751739502,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "6b31ad53.5727b4"
+ "ddef1b.d5ace0e8"
]
]
},
{
- "id": "d6d3b52a.3f5ab8",
+ "id": "5f573696.518908",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 933.1667175292969,
- "y": 690.444487452507,
- "z": "6e499246.1345bc",
+ "x": 914.1628684997559,
+ "y": 608.4445171356201,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "148355e2.614e0a"
+ "d2e1da0b.14c268"
]
]
},
{
- "id": "148355e2.614e0a",
+ "id": "d2e1da0b.14c268",
"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`\" />",
"comments": "",
- "x": 1092.6664848327637,
- "y": 693.4444864988327,
- "z": "6e499246.1345bc",
+ "x": 1131.6626281738281,
+ "y": 607.4444761276245,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "6b31ad53.5727b4",
+ "id": "ddef1b.d5ace0e8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1163.4729804992676,
- "y": 648.7695890665054,
- "z": "6e499246.1345bc",
+ "x": 1144.4691066741943,
+ "y": 560.7696704864502,
+ "z": "1c424bc5.8e5824",
"wires": [
[]
]
},
{
- "id": "13d12ad9.b40a25",
+ "id": "4443f52d.bb0e4c",
"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": 646.4445304870605,
- "y": 1081.2221623659134,
- "z": "6e499246.1345bc",
+ "x": 614.4406242370605,
+ "y": 1026.2221636772156,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "71b32013.3584b",
+ "id": "2bcb08d.42550f8",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
"comments": "",
- "x": 653.531177520752,
- "y": 705.3334804773331,
- "z": "6e499246.1345bc",
+ "x": 621.527271270752,
+ "y": 650.3334817886353,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "50901066.93c6f",
+ "id": "3673a6e1.e30cca",
"type": "for",
"name": "for lidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 729.5310974121094,
- "y": 759.3333555459976,
- "z": "6e499246.1345bc",
+ "x": 697.5271911621094,
+ "y": 704.3333568572998,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "18389e8.0583e62"
+ "811b86b3.145198"
]
]
},
{
- "id": "379a2e2e.3a8382",
+ "id": "dcdd31d0.479e7",
"type": "set",
"name": "set new vnf length",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
"comments": "",
- "x": 653.6324691772461,
- "y": 812.1375733613968,
- "z": "6e499246.1345bc",
+ "x": 621.6285629272461,
+ "y": 757.137574672699,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "c59a5d45.5b06a",
+ "id": "48c6ddd.4092a24",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
"comments": "",
- "x": 694.531135559082,
- "y": 859.333486199379,
- "z": "6e499246.1345bc",
+ "x": 662.527229309082,
+ "y": 804.3334875106812,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "18389e8.0583e62",
+ "id": "811b86b3.145198",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 989.5310878753662,
- "y": 766.3332153558731,
- "z": "6e499246.1345bc",
+ "x": 957.5271816253662,
+ "y": 711.3332166671753,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "a366647e.22aaf8"
+ "1e6e592d.12c717"
]
]
},
{
- "id": "4315ff0e.d57d4",
+ "id": "96d011a.ebe42f",
"type": "delete",
"name": "delete lanport vf instance configuration in AAI",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
"comments": "",
"outputs": 1,
- "x": 728.5315055847168,
- "y": 1028.5948683023453,
- "z": "6e499246.1345bc",
+ "x": 696.5275993347168,
+ "y": 973.5948696136475,
+ "z": "1c424bc5.8e5824",
"wires": [
[]
]
},
{
- "id": "a366647e.22aaf8",
+ "id": "1e6e592d.12c717",
"type": "switchNode",
"name": "switch vnf-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1175.5311546325684,
- "y": 766.3333760499954,
- "z": "6e499246.1345bc",
+ "x": 1143.5272483825684,
+ "y": 711.3333773612976,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "c7c20dda.52c1b"
+ "33904649.f29baa"
]
]
},
{
- "id": "c7c20dda.52c1b",
+ "id": "33904649.f29baa",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1344.531162261963,
- "y": 765.3332134485245,
- "z": "6e499246.1345bc",
+ "x": 1312.527256011963,
+ "y": 710.3332147598267,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "72fa222d.49f9ac"
+ "feb2eba6.9b1178"
]
]
},
{
- "id": "72fa222d.49f9ac",
+ "id": "feb2eba6.9b1178",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1498.5310010910034,
- "y": 757.3332144021988,
- "z": "6e499246.1345bc",
+ "x": 1466.5270948410034,
+ "y": 702.333215713501,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "ed2c94b0.3c96e8",
- "f18820dc.cc2b"
+ "1c71b1a3.8a840e",
+ "76b09d29.70bbf4"
]
]
},
{
- "id": "ed2c94b0.3c96e8",
+ "id": "1c71b1a3.8a840e",
"type": "set",
"name": "set vnf data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />\n",
"comments": "",
- "x": 1663.531096458435,
- "y": 732.3333698511124,
- "z": "6e499246.1345bc",
+ "x": 1631.527190208435,
+ "y": 677.3333711624146,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "f18820dc.cc2b",
+ "id": "76b09d29.70bbf4",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
"comments": "",
- "x": 1685.531096458435,
- "y": 788.3333336114883,
- "z": "6e499246.1345bc",
+ "x": 1653.527190208435,
+ "y": 733.3333349227905,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "6e5f86e6.881a38",
+ "id": "fb17bb23.b22de8",
"type": "set",
"name": "set 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": 670.333366394043,
- "y": 975.6666570901871,
- "z": "6e499246.1345bc",
+ "x": 638.329460144043,
+ "y": 920.6666584014893,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "8ba40e29.5c2bb",
+ "id": "c43a3a93.767aa8",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].\" value=\"\"/>\n",
"comments": "",
- "x": 684.3372116088867,
- "y": 909.5862270593643,
- "z": "6e499246.1345bc",
+ "x": 652.3333053588867,
+ "y": 854.5862283706665,
+ "z": "1c424bc5.8e5824",
"wires": []
},
{
- "id": "cd89e451.16b298",
+ "id": "279f2432.3dd51c",
"type": "switchNode",
"name": "switch vnf-index",
"xml": "<switch test='`$vnf-index`'>\n",
"comments": "",
"outputs": 1,
- "x": 649.00390625,
- "y": 314.00390625,
- "z": "6e499246.1345bc",
+ "x": 617,
+ "y": 259.0039075613022,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "ccd2db16.3151b8"
+ "145975f0.e3dbaa"
]
]
},
{
- "id": "ccd2db16.3151b8",
+ "id": "145975f0.e3dbaa",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 811.0039520263672,
- "y": 313.0039052963257,
- "z": "6e499246.1345bc",
+ "x": 779.0000457763672,
+ "y": 258.00390660762787,
+ "z": "1c424bc5.8e5824",
"wires": [
[
- "2eb95e60.9609a2"
+ "3cec081f.179438"
]
]
},
{
- "id": "2eb95e60.9609a2",
+ "id": "3cec081f.179438",
"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 not found in service-data\" />\n",
"comments": "",
- "x": 960.2540435791016,
- "y": 310.78178310394287,
- "z": "6e499246.1345bc",
+ "x": 928.2501373291016,
+ "y": 255.78178441524506,
+ "z": "1c424bc5.8e5824",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json index 65c2f0ec..3414cb9e 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json @@ -1,36 +1,36 @@ [
{
- "id": "4d340fd2.1d47a",
+ "id": "aeae6125.a8d28",
"type": "method",
"name": "method vnf-topology-operation-vpn-site-resource-create",
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 251.00390625,
- "y": 191.9999925820157,
- "z": "b6e8aa45.a03d48",
+ "x": 265,
+ "y": 223.9999925820157,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "dd995ca6.5527c"
+ "10f15a6d.ba1d76"
]
]
},
{
- "id": "83ce2cf0.a21b",
+ "id": "3eb5635c.ae734c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 127.57528686523438,
- "y": 44,
- "z": "b6e8aa45.a03d48",
+ "x": 141.57138061523438,
+ "y": 76,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "d4e5788.5ad9988"
+ "1821ad11.5dad23"
]
]
},
{
- "id": "d4e5788.5ad9988",
+ "id": "1821ad11.5dad23",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,337 +38,432 @@ "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.86099243164062,
- "y": 102.23810407798737,
- "z": "b6e8aa45.a03d48",
+ "x": 243.85708618164062,
+ "y": 134.23810407798737,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "4d340fd2.1d47a"
+ "aeae6125.a8d28"
]
]
},
{
- "id": "dd995ca6.5527c",
+ "id": "10f15a6d.ba1d76",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 231.24195098876953,
- "y": 363.6666643349454,
- "z": "b6e8aa45.a03d48",
+ "x": 245.23804473876953,
+ "y": 395.6666643349454,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "9e4483c6.3ac77",
- "a13164e4.2addc8",
- "3a6751cb.2db1fe",
- "deb0deb9.10aa8",
- "8f8480.f469fb8",
- "f27c92ed.2a351",
- "4152c1db.9724f",
- "34769e57.986742",
- "27f27223.64947e",
- "5e423ee5.be879",
- "dfdcb682.501ff8"
+ "175dc57.fde8c3b",
+ "3afb3c65.1ca3a4",
+ "fadde341.82f5a",
+ "9885c8cf.ded0d8",
+ "a5e91b3d.29e478",
+ "6e79157a.cf280c",
+ "fff46357.6f3ad",
+ "5da9f931.70bc48",
+ "df8e278a.898b28",
+ "3a3acb9a.529fc4",
+ "ff8a3cb6.2dc93",
+ "1bd26429.61c74c"
]
]
},
{
- "id": "a13164e4.2addc8",
+ "id": "3afb3c65.1ca3a4",
"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": 665.3887023925781,
- "y": 617.6705932617188,
- "z": "b6e8aa45.a03d48",
+ "x": 667.3848571777344,
+ "y": 759.670597076416,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "9e4483c6.3ac77",
+ "id": "175dc57.fde8c3b",
"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.' />\n\n",
"comments": "",
- "x": 657.2418899536133,
- "y": 512.6668453216553,
- "z": "b6e8aa45.a03d48",
+ "x": 659.2380447387695,
+ "y": 654.6668491363525,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "8f8480.f469fb8",
+ "id": "a5e91b3d.29e478",
"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-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 645.5753936767578,
- "y": 462.33342933654785,
- "z": "b6e8aa45.a03d48",
+ "x": 647.5715484619141,
+ "y": 604.3334331512451,
+ "z": "3deddfaf.57c2f",
"wires": [
[]
]
},
{
- "id": "dfdcb682.501ff8",
+ "id": "ff8a3cb6.2dc93",
"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-id`' />\n",
"comments": "",
- "x": 656.5754699707031,
- "y": 569.3334331512451,
- "z": "b6e8aa45.a03d48",
+ "x": 658.5716247558594,
+ "y": 711.3334369659424,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "3a6751cb.2db1fe",
+ "id": "fadde341.82f5a",
"type": "switchNode",
"name": "switch service-data.vnfs.vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 660.5752716064453,
- "y": 242.3333559036255,
- "z": "b6e8aa45.a03d48",
+ "x": 674.5713653564453,
+ "y": 274.3333559036255,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "2c3f6b93.ddbca4",
- "29bbdb18.cfe584"
+ "fe0779f6.a341a8",
+ "9f0ded05.d925c"
]
]
},
{
- "id": "2c3f6b93.ddbca4",
+ "id": "fe0779f6.a341a8",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 895.2896575927734,
- "y": 237.47617626190186,
- "z": "b6e8aa45.a03d48",
+ "x": 909.2857513427734,
+ "y": 269.47617626190186,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "8e783130.b1886"
+ "e3b683ce.f47fd"
]
]
},
{
- "id": "8e783130.b1886",
+ "id": "e3b683ce.f47fd",
"type": "set",
"name": "set vnf-index=0",
"xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
"comments": "",
- "x": 1055.5753631591797,
- "y": 237.47626781463623,
- "z": "b6e8aa45.a03d48",
+ "x": 1069.5714569091797,
+ "y": 269.47626781463623,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "29bbdb18.cfe584",
+ "id": "9f0ded05.d925c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 891.7181968688965,
- "y": 270.76200771331787,
- "z": "b6e8aa45.a03d48",
+ "x": 905.7142906188965,
+ "y": 302.76200771331787,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "64bc2d84.970e54"
+ "411ddf99.4fbb3"
]
]
},
{
- "id": "c816157.792fce8",
+ "id": "b6024395.bc24",
"type": "set",
"name": "set vnf-index = vnf_length",
"xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
"comments": "",
- "x": 1284.575439453125,
- "y": 249.04773330688477,
- "z": "b6e8aa45.a03d48",
+ "x": 1298.571533203125,
+ "y": 281.04773330688477,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "a9c0fb1a.4ae688",
+ "id": "3b57b625.74c07a",
"type": "for",
"name": "for each existing VNF",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1273.0040588378906,
- "y": 284.04770517349243,
- "z": "b6e8aa45.a03d48",
+ "x": 1287.0001525878906,
+ "y": 316.04770517349243,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "e4810c54.16f7c"
+ "a7076dba.f36af"
]
]
},
{
- "id": "64bc2d84.970e54",
+ "id": "411ddf99.4fbb3",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1026.4324798583984,
- "y": 272.76197719573975,
- "z": "b6e8aa45.a03d48",
+ "x": 1040.4285736083984,
+ "y": 304.76197719573975,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "c816157.792fce8",
- "a9c0fb1a.4ae688"
+ "b6024395.bc24",
+ "3b57b625.74c07a"
]
]
},
{
- "id": "e4810c54.16f7c",
+ "id": "a7076dba.f36af",
"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": 1666.289794921875,
- "y": 284.61918926239014,
- "z": "b6e8aa45.a03d48",
+ "x": 1680.285888671875,
+ "y": 316.61918926239014,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "d88564b1.978518"
+ "b4dc78a5.d896c8"
]
]
},
{
- "id": "d88564b1.978518",
+ "id": "b4dc78a5.d896c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1947.575496673584,
- "y": 283.19059467315674,
- "z": "b6e8aa45.a03d48",
+ "x": 1961.571590423584,
+ "y": 315.19059467315674,
+ "z": "3deddfaf.57c2f",
"wires": [
[
- "eb2d673c.26d6e8"
+ "51ac74f.88fd58c"
]
]
},
{
- "id": "5a4256cd.31fdd8",
+ "id": "4be264b1.270e6c",
"type": "comment",
"name": "make sure this vnf-id doesn't exist already",
"info": "",
"comments": "",
- "x": 1635.4324111938477,
- "y": 248.1905813217163,
- "z": "b6e8aa45.a03d48",
+ "x": 1649.4285049438477,
+ "y": 280.1905813217163,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "deb0deb9.10aa8",
+ "id": "9885c8cf.ded0d8",
"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.5753936767578,
- "y": 410.33342599868774,
- "z": "b6e8aa45.a03d48",
+ "x": 619.5715484619141,
+ "y": 552.333429813385,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "f27c92ed.2a351",
+ "id": "6e79157a.cf280c",
"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": 604.5753555297852,
- "y": 880.59694480896,
- "z": "b6e8aa45.a03d48",
+ "x": 606.5715103149414,
+ "y": 1022.5969486236572,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "5e423ee5.be879",
+ "id": "3a3acb9a.529fc4",
"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=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 667.2421264648438,
- "y": 827.5968379974365,
- "z": "b6e8aa45.a03d48",
+ "x": 669.23828125,
+ "y": 969.5968418121338,
+ "z": "3deddfaf.57c2f",
"wires": [
[]
]
},
{
- "id": "4152c1db.9724f",
+ "id": "fff46357.6f3ad",
"type": "set",
"name": "set vnf-index 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": 658.5753860473633,
- "y": 658.5968637466431,
- "z": "b6e8aa45.a03d48",
+ "x": 660.5715408325195,
+ "y": 800.5968675613403,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "34769e57.986742",
+ "id": "5da9f931.70bc48",
"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": 623.5750274658203,
- "y": 361.3247985839844,
- "z": "b6e8aa45.a03d48",
+ "x": 625.5711822509766,
+ "y": 503.32480239868164,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "eb2d673c.26d6e8",
+ "id": "51ac74f.88fd58c",
"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": 2076.1468658447266,
- "y": 334.1906089782715,
- "z": "b6e8aa45.a03d48",
+ "x": 2090.1429595947266,
+ "y": 366.1906089782715,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "6aca9b4.e7d1e64",
- "type": "comment",
- "name": "Take the parameter names by removing prefix",
- "info": "",
+ "id": "df8e278a.898b28",
+ "type": "save",
+ "name": "save AnAI - vnf-instance.orchestration-status",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
"comments": "",
- "x": 1369.5754776000977,
- "y": 337.66667556762695,
- "z": "b6e8aa45.a03d48",
- "wires": []
+ "outputs": 1,
+ "x": 715.5458450317383,
+ "y": 910.2470846176147,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ []
+ ]
},
{
- "id": "301883bc.025f5c",
+ "id": "6f579a3f.d15af4",
"type": "comment",
"name": "TODO: change AAI models",
"info": "",
"comments": "",
- "x": 647.1859512329102,
- "y": 727.9742965698242,
- "z": "b6e8aa45.a03d48",
+ "x": 649.1821060180664,
+ "y": 869.9743003845215,
+ "z": "3deddfaf.57c2f",
"wires": []
},
{
- "id": "27f27223.64947e",
- "type": "save",
- "name": "save AnAI - vnf-instance.orchestration-status",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+ "id": "1bd26429.61c74c",
+ "type": "switchNode",
+ "name": "switch service-data.vnf-request-input.vnf-name",
+ "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 693.0000152587891,
+ "y": 393.0000114440918,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ [
+ "33ff6eed.504462",
+ "e2af6995.223f28",
+ "cc14ee3a.bceeb"
+ ]
+ ]
+ },
+ {
+ "id": "33ff6eed.504462",
+ "type": "outcomeTrue",
+ "name": "SDWAN-vpn",
+ "xml": "<outcome value='SDWAN-vpn'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 990.6667137145996,
+ "y": 378.0000114440918,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ [
+ "55868aa1.2254e4"
+ ]
+ ]
+ },
+ {
+ "id": "e2af6995.223f28",
+ "type": "outcomeTrue",
+ "name": "SDWAN-site",
+ "xml": "<outcome value='SDWAN-site'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 983.6666870117188,
+ "y": 428,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ [
+ "496e33ab.398b4c"
+ ]
+ ]
+ },
+ {
+ "id": "cc14ee3a.bceeb",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 966.6666870117188,
+ "y": 478,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ [
+ "c9a98bce.5a8c88"
+ ]
+ ]
+ },
+ {
+ "id": "c9a98bce.5a8c88",
+ "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: vnf-name should be either SDWAN-vpn or SDWAN-site.\" />\n",
"comments": "",
+ "x": 1137.333366394043,
+ "y": 476.00001335144043,
+ "z": "3deddfaf.57c2f",
+ "wires": []
+ },
+ {
+ "id": "55868aa1.2254e4",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1172,
+ "y": 379,
+ "z": "3deddfaf.57c2f",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "496e33ab.398b4c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
"outputs": 1,
- "x": 713.549690246582,
- "y": 768.2470808029175,
- "z": "b6e8aa45.a03d48",
+ "x": 1163,
+ "y": 427,
+ "z": "3deddfaf.57c2f",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml index e9b3965c..e2e986fa 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml @@ -1,6 +1,6 @@ <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}'>
+ 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='vf-module-topology-operation' mode='sync'>
<block atomic="true">
<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
@@ -104,7 +104,7 @@ <outcome value='DeleteSDWANDeviceInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' ></call>
</outcome>
- <outcome value='DleteSDWANLanPortInstance'>
+ <outcome value='DeleteSDWANLanPortInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
</outcome>
<outcome value='DeleteSDWANPortInstance'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml index d13b5db5..7a6c7273 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml @@ -1,6 +1,6 @@ <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}'>
+ 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-vf-operation-lanport-activate' mode='sync'>
<block atomic="true">
<switch test='`$service-data.vnfs.vnf_length`'>
@@ -104,46 +104,55 @@ <parameter name='prop.siteIds_length' value='0' />
</set>
<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
- <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
- <block>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
- <outcome value='true'>
- <block atomic="true">
- <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">
+ <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->
+ <outcome value='true'>
+ <block atomic="true">
+ <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+ <block>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
<outcome value='true'>
<block atomic="true">
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.role' value="spoke" />
- </set>
- </outcome>
- </switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.role' value="hub" />
- </set>
- </outcome>
- </switch>
- <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">
<outcome value='true'>
<block atomic="true">
- <set>
- <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />
- </set>
- <set>
- <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
- <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
- </set>
- <set>
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
- <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
- </set>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.role' value="spoke" />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.role' value="hub" />
+ </set>
+ </outcome>
+ </switch>
+ <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />
+ </set>
+ <set>
+ <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
+ <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
+ </set>
+ <set>
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
+ <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
</block>
</outcome>
</switch>
@@ -151,41 +160,41 @@ </block>
</outcome>
</switch>
- </for>
- </block>
- </outcome>
- </switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
- <outcome value='true'>
- <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <block atomic="true">
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
<outcome value='true'>
- <set>
- <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
</outcome>
</switch>
</block>
</for>
- </outcome>
- </switch>
- </block>
- </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
</for>
<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >
<block>
@@ -225,11 +234,11 @@ </return>
</outcome>
</execute>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="esr-thirdparty-sdnc"
- key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="esr-thirdparty-sdnc"
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
depth = '1'"
- pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+ 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`" />
@@ -447,13 +456,13 @@ + $vf-module-topology-operation-input.vf-module-information.vf-module-id
+ '/vf-module-data/vf-module-topology/'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/vnfs/vnf/'
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
+ '/vnf-data/vnf-topology/'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
@@ -462,8 +471,8 @@ <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`' />
<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`' />
</set>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
<parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
<parameter name='operational-status' value='Active' />
<!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml index d2538710..d1578ec5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml @@ -1,6 +1,6 @@ <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}'>
+ 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-vf-operation-lanport-create' mode='sync'>
<block atomic="true">
<switch test='`$service-data.vnfs.vnf_length`'>
@@ -85,8 +85,8 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
- <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->
- <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
</set>
<set>
<parameter name='vf-module-id' value='`$prop.vf-id`'/>
@@ -98,13 +98,13 @@ + $vf-module-topology-operation-input.vf-module-information.vf-module-id
+ '/vf-module-data/vf-module-topology/'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/vnfs/vnf/'
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
+ '/vnf-data/vnf-topology/'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
@@ -113,8 +113,8 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='lan-port-config.lan-port-config-id = $prop.vf-id' >
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
+ key='lan-port-config.lan-port-config-id = $prop.vf-id' >
<parameter name="lan-port-config-id" value="`$prop.vf-id`" />
<parameter name="device-id" value='`$prop.lan.deviceName`' />
<parameter name="port-switch" value='`$prop.lan.portSwitch`' />
@@ -128,9 +128,9 @@ <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
<parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
</save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
- key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
- force="true" pfx="tmp.AnAI-data">
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
+ key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
+ force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="lan-port-config" />
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />
@@ -143,5 +143,4 @@ </return>
</block>
</method>
-</service-logic>
-
+</service-logic>
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml index 2a0a3af1..9a814918 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-deactivate.xml @@ -1,6 +1,6 @@ <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}'>
+ 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-vf-operation-lanport-deactivate' mode='sync'>
<block atomic="true">
<switch test='`$service-data.vnfs.vnf_length`'>
@@ -30,6 +30,10 @@ </return>
</outcome>
</switch>
+ <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>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value='0'>
<return status='failure'>
@@ -70,28 +74,44 @@ </outcome>
</switch>
<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
- <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
- <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />
- </set>
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">
+ <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->
+ <outcome value='true'>
+ <block atomic="true">
+ <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
- </outcome>
- </switch>
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.vnf-id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-id`' />
+ </set>
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ <set>
+ <parameter name='site-vnf-index' value='`$vnfidx`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
</for>
- </block>
- </outcome>
- </switch>
- </for>
- </for>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
</for>
<set>
<parameter name='prop.siteAttachements_length' value='0' />
@@ -102,23 +122,10 @@ <outcome value='false'>
<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
<block>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="request-action"/>
- <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>
- </record>
- <!--switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`"-->
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
<outcome value='true'>
- <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <block atomic="true">
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic23.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="param-name"/>
- <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>
- </record>
+ <block atomic="true">
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
<switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">
<outcome value='true'>
<block atomic="true">
@@ -129,50 +136,39 @@ </set>
</outcome>
</switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">
<outcome value='true'>
<set>
<parameter name='prop.role' value="hub" />
</set>
</outcome>
</switch>
+ <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />
+ </set>
+ <set>
+ <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
+ <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
+ </set>
+ <set>
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
+ <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
+ <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
</block>
</outcome>
</switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
- <set>
- <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
- <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
- </set>
- <set>
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
- <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
- <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
- </set>
- </block>
- </outcome>
- </switch>
- </block>
- </for>
- </outcome>
- </switch>
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
- <outcome value='true'>
- <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
- <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
- </set>
- </outcome>
- </switch>
- </for>
+ </for>
+ </block>
</outcome>
</switch>
</block>
@@ -180,11 +176,65 @@ </outcome>
</switch>
</for>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="esr-thirdparty-sdnc"
- key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND
+ <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
+ <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
+ <outcome value='true'>
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </outcome>
+ </switch>
+ </for>
+ </for>
+ <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >
+ <block>
+ <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
+ <outcome value='true'>
+ <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+ <block atomic="true">
+ <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="esr-thirdparty-sdnc"
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND
depth = '1'"
- pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+ 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`" />
@@ -231,14 +281,31 @@ </outcome>
</execute>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$prop.lan.ipAddress`'/>
+ <parameter name="regex" value="/"/>
+ <parameter name="ctx_memory_result_key" value="ipandMask"/>
+ <outcome value='success'>
+ <set>
+ <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
+ <parameter name='prop.lan.prefixLength' value='`$ipandMask[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>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port-del.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports/action/batch-delete'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/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="responsePrefix" value="lanPortResp"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
@@ -258,8 +325,8 @@ <switch test="`$prop.lan.portSwitch == 'layer2-port'`">
<outcome value='true'>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-bridge-domain-del.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains/action/batch-delete'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
@@ -283,31 +350,14 @@ </execute>
</outcome>
</switch>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$prop.lan.ipAddress`'/>
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="ipandMask"/>
- <outcome value='success'>
- <set>
- <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
- <parameter name='prop.lan.prefixLength' value='`$ipandMask[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>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets-del.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets/action/batch-delete'`" />
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-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="lanPortResp"/>
+ <parameter name="responsePrefix" value="portResp"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
@@ -321,11 +371,7 @@ </return>
</outcome>
<outcome value='success'>
- <block atomic="true">
- <set>
- <parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />
- </set>
- </block>
+ <block atomic="true"></block>
</outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
@@ -354,7 +400,7 @@ </execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
@@ -391,13 +437,13 @@ + $vf-module-topology-operation-input.vf-module-information.vf-module-id
+ '/vf-module-data/vf-module-topology/'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/vnfs/vnf/'
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
+ '/vnf-data/vnf-topology/'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
@@ -406,8 +452,8 @@ <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`' />
<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`' />
</set>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
+ key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
<parameter name='operational-status' value='PendingDelete' />
<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml index 30df6e08..7a7dba27 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml @@ -1,6 +1,6 @@ <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}'>
+ 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-vf-operation-lanport-delete' mode='sync'>
<block atomic="true">
<switch test='`$service-data.vnfs.vnf_length`'>
@@ -61,7 +61,7 @@ <set>
<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
</block>
</outcome>
</switch>
@@ -99,8 +99,8 @@ <outcome value='false'>
<block atomic="true">
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />
</set>
<set>
<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />
@@ -125,18 +125,18 @@ + $vf-module-topology-operation-input.vf-module-information.vf-module-id
+ '/vf-module-data/vf-module-topology/'`"/>
<parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/vnfs/vnf/'
+ $service-data.vnfs.vnf[$vnf-index].vnf-id
+ '/vnf-data/vnf-topology/'`"/>
<parameter name='service-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ $vf-module-topology-operation-input.service-information.service-instance-id
+ '/service-data/service-topology/'`"/>
</set>
- <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'
- key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></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/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml index b730b324..3e8b537b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml @@ -1,6 +1,6 @@ <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}'>
+ 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='vnf-topology-operation-vpn-site-resource-create' mode='sync'>
<block atomic="true">
<switch test='`$service-data.vnfs.vnf_length`'>
@@ -29,6 +29,21 @@ </block>
</outcome>
</switch>
+ <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>
+ <outcome value='SDWAN-vpn'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='SDWAN-site'>
+ <block atomic="true"></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="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />
+ </return>
+ </outcome>
+ </switch>
<set>
<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
</set>
@@ -58,17 +73,17 @@ <parameter name='vnfId' value='`$prop.vnf-id`' />
<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/'` " />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="generic-vnf"
- key="generic-vnf.vnf-id = $prop.vnf-id" >
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $prop.vnf-id" >
<parameter name="orchestration-status" value="create" />
<parameter name="vnf-type" value="some vnf-type" />
</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">
+ <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="generic-vnf" />
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
|