diff options
10 files changed, 1676 insertions, 1441 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 b8819dd3..ca336093 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": "8a97ec5a.e8724",
+ "id": "e2f973ad.8a873",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 147.01040649414062,
- "y": 86.41365575790405,
- "z": "85ee3913.3987f8",
+ "x": 167.00390625,
+ "y": 86.41365623474121,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "7092e500.65d96c"
+ "7f6ab737.fa2438"
]
]
},
{
- "id": "7092e500.65d96c",
+ "id": "7f6ab737.fa2438",
"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": 260.2961120605469,
- "y": 126.65176725387573,
- "z": "85ee3913.3987f8",
+ "x": 280.28961181640625,
+ "y": 126.65176773071289,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "975074db.12b248"
+ "df90c884.26f4c8"
]
]
},
{
- "id": "975074db.12b248",
+ "id": "df90c884.26f4c8",
"type": "method",
"name": "method vf-module-topology-operation",
"xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 234.43903350830078,
- "y": 166.41365003585815,
- "z": "85ee3913.3987f8",
+ "x": 254.43253326416016,
+ "y": 166.4136505126953,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "6ba66072.d698d"
+ "2b567398.54b65c"
]
]
},
{
- "id": "c5d72244.65ac2",
+ "id": "3f06cd40.babeb2",
"type": "comment",
"name": "vf-module-topology-operation",
"info": "",
"comments": "",
- "x": 541.3552627563477,
- "y": 33.99999952316284,
- "z": "85ee3913.3987f8",
+ "x": 484.34873962402344,
+ "y": 68.99999809265137,
+ "z": "62f71b5.55c86e4",
"wires": []
},
{
- "id": "6ba66072.d698d",
+ "id": "2b567398.54b65c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 216.51044464111328,
- "y": 405.77382802963257,
- "z": "85ee3913.3987f8",
+ "x": 236.50394439697266,
+ "y": 405.7738285064697,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "bff84223.52b62",
- "bb77dcde.97b13",
- "71a0804b.8983d"
+ "61e93cec.112784",
+ "fa9f0d60.462fa",
+ "d2d6e69c.591818"
]
]
},
{
- "id": "bff84223.52b62",
+ "id": "61e93cec.112784",
"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": 502.01043701171875,
- "y": 579.2712168693542,
- "z": "85ee3913.3987f8",
+ "x": 522.0039367675781,
+ "y": 579.2712173461914,
+ "z": "62f71b5.55c86e4",
"wires": []
},
{
- "id": "bb77dcde.97b13",
+ "id": "fa9f0d60.462fa",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 512.9150466918945,
- "y": 403.9850525856018,
- "z": "85ee3913.3987f8",
+ "x": 532.9085464477539,
+ "y": 403.98505306243896,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "d56401a4.01d66",
- "ad92b387.5520d",
- "9ce981c8.a135f",
- "aabf716e.1d0df",
- "4bf064de.ff298c",
- "a756f30b.6c1cb",
- "201f4d37.e91032",
- "2b26c4c1.602edc"
+ "218f133.db017ec",
+ "ebbe7026.8821f",
+ "37c0b9bd.94d7c6",
+ "c54da833.e1f678",
+ "47601bcd.b936b4",
+ "86bac2cf.d6b39",
+ "1207cb15.bda8a5",
+ "5b101188.1d177"
]
]
},
{
- "id": "d56401a4.01d66",
+ "id": "218f133.db017ec",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 722.3913269042969,
- "y": 294.2708897590637,
- "z": "85ee3913.3987f8",
+ "x": 742.3848266601562,
+ "y": 294.2708902359009,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "481f6fe3.cdf5a"
+ "b8e37d82.b39ed"
]
]
},
{
- "id": "ad92b387.5520d",
+ "id": "ebbe7026.8821f",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 730.7723121643066,
- "y": 440.46158170700073,
- "z": "85ee3913.3987f8",
+ "x": 750.765811920166,
+ "y": 440.4615821838379,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "bb1cd6a8.6e06d8"
+ "4071fcbf.00f444"
]
]
},
{
- "id": "9ce981c8.a135f",
+ "id": "37c0b9bd.94d7c6",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 670.486686706543,
- "y": 1670.985191822052,
- "z": "85ee3913.3987f8",
+ "x": 690.4801864624023,
+ "y": 1670.9851922988892,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "c834b9f2.d6f188"
+ "ab03e6ef.4f7e98"
]
]
},
{
- "id": "c834b9f2.d6f188",
+ "id": "ab03e6ef.4f7e98",
"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": 864.6771125793457,
- "y": 1670.9852604866028,
- "z": "85ee3913.3987f8",
+ "x": 884.6706123352051,
+ "y": 1670.98526096344,
+ "z": "62f71b5.55c86e4",
"wires": []
},
{
- "id": "71a0804b.8983d",
+ "id": "d2d6e69c.591818",
"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": 632.0936889648438,
- "y": 243.79471254348755,
- "z": "85ee3913.3987f8",
+ "x": 652.0871887207031,
+ "y": 243.7947130203247,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "481f6fe3.cdf5a",
+ "id": "b8e37d82.b39ed",
"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": 1094.5341606140137,
- "y": 293.84235429763794,
- "z": "85ee3913.3987f8",
+ "x": 1114.527660369873,
+ "y": 293.8423547744751,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "a7175f3d.aa415",
+ "id": "a7b23d9b.67752",
"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": 1106.5341186523438,
- "y": 390.50899744033813,
- "z": "85ee3913.3987f8",
+ "x": 1126.5276184082031,
+ "y": 390.5089979171753,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "bb1cd6a8.6e06d8",
+ "id": "4071fcbf.00f444",
"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": 1100.867389678955,
- "y": 440.17571687698364,
- "z": "85ee3913.3987f8",
+ "x": 1120.8608894348145,
+ "y": 440.1757173538208,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "a7404f76.f0514",
+ "id": "9cef98f6.bb64a8",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 734.8674049377441,
- "y": 391.17567110061646,
- "z": "85ee3913.3987f8",
+ "x": 754.8609046936035,
+ "y": 391.1756715774536,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "a7175f3d.aa415"
+ "a7b23d9b.67752"
]
]
},
{
- "id": "aabf716e.1d0df",
+ "id": "c54da833.e1f678",
"type": "outcome",
"name": "changeassign",
"xml": "<outcome value='changeassign'>\n",
"comments": "",
"outputs": 1,
- "x": 745.3437271118164,
- "y": 488.08031129837036,
- "z": "85ee3913.3987f8",
+ "x": 765.3372268676758,
+ "y": 488.0803117752075,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "8e6a8b07.9cfd08"
+ "64ada87a.babb08"
]
]
},
{
- "id": "8e6a8b07.9cfd08",
+ "id": "64ada87a.babb08",
"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": 1114.4387969970703,
- "y": 487.7944474220276,
- "z": "85ee3913.3987f8",
+ "x": 1134.4322967529297,
+ "y": 487.79444789886475,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "4bf064de.ff298c",
+ "id": "47601bcd.b936b4",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 731.0104064941406,
- "y": 686.413655757904,
- "z": "85ee3913.3987f8",
+ "x": 751.00390625,
+ "y": 686.4136562347412,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "856b20f2.dd3e"
+ "41360f4.fa56df"
]
]
},
{
- "id": "4a0f3f1f.e154f",
+ "id": "24ce8e0e.e18a02",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 969.3440093994141,
- "y": 694.0000189244747,
- "z": "85ee3913.3987f8",
+ "x": 989.3375091552734,
+ "y": 694.0000194013119,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "61a8036d.49151c",
- "9df20938.7cb218",
- "e668ec20.ba224",
- "e9946938.94da68",
- "17aebe0e.08da62",
- "6c28f181.61b7c"
+ "cd28feb2.78356",
+ "b0c495a7.239ed8",
+ "4e5328da.0fb598",
+ "cf0037c3.323858",
+ "9773ede5.0ea13",
+ "d780b057.46e04"
]
]
},
{
- "id": "9df20938.7cb218",
+ "id": "b0c495a7.239ed8",
"type": "outcome",
- "name": "CreateSiteInstance",
- "xml": "<outcome value='CreateSiteInstance'>",
+ "name": "CreateSDWANSiteInstance",
+ "xml": "<outcome value='CreateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1226.8203773498535,
- "y": 603.4793815612793,
- "z": "85ee3913.3987f8",
+ "x": 1279.8138275146484,
+ "y": 602.4793882369995,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "c35bc84f.6dd758"
+ "835bb83.144cf48"
]
]
},
{
- "id": "61a8036d.49151c",
+ "id": "cd28feb2.78356",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1169.7247924804688,
- "y": 777.8572821617126,
- "z": "85ee3913.3987f8",
+ "x": 1189.7182922363281,
+ "y": 777.8572826385498,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "35631ae7.723fc6"
+ "2ac9864e.b3ecca"
]
]
},
{
- "id": "856b20f2.dd3e",
+ "id": "41360f4.fa56df",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 917.3439254760742,
- "y": 614.0000205039978,
- "z": "85ee3913.3987f8",
+ "x": 937.3374252319336,
+ "y": 614.000020980835,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "4a0f3f1f.e154f",
- "e795cb52.6c6f98"
+ "24ce8e0e.e18a02",
+ "cf6851c.b8328b"
]
]
},
{
- "id": "c35bc84f.6dd758",
+ "id": "835bb83.144cf48",
"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": 1683.3442001342773,
- "y": 601.0001640319824,
- "z": "85ee3913.3987f8",
+ "x": 1703.3376998901367,
+ "y": 601.0001645088196,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "35631ae7.723fc6",
+ "id": "2ac9864e.b3ecca",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1323.0104446411133,
- "y": 777.9136786460876,
- "z": "85ee3913.3987f8",
+ "x": 1343.0039443969727,
+ "y": 777.9136791229248,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "e668ec20.ba224",
+ "id": "4e5328da.0fb598",
"type": "outcome",
"name": "CreateSDWANPortInstance",
"xml": "<outcome value='CreateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1233.6771850585938,
- "y": 736.247172832489,
- "z": "85ee3913.3987f8",
+ "x": 1253.6706848144531,
+ "y": 736.2471733093262,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "93c38881.fc6c68"
+ "60d39409.313dec"
]
]
},
{
- "id": "93c38881.fc6c68",
+ "id": "60d39409.313dec",
"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": 1706.2008819580078,
- "y": 735.767924785614,
- "z": "85ee3913.3987f8",
+ "x": 1726.1943817138672,
+ "y": 735.7679252624512,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "e9946938.94da68",
+ "id": "cf0037c3.323858",
"type": "outcome",
"name": "CreateSDWANDeviceInstance",
"xml": "<outcome value='CreateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1242.0415077209473,
- "y": 656.4451332092285,
- "z": "85ee3913.3987f8",
+ "x": 1262.0350074768066,
+ "y": 656.4451336860657,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "f8aa9b06.01e4b8"
+ "aa20e20c.3c0b5"
]
]
},
{
- "id": "f8aa9b06.01e4b8",
+ "id": "aa20e20c.3c0b5",
"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": 1697.5652961730957,
- "y": 655.9660024642944,
- "z": "85ee3913.3987f8",
+ "x": 1717.558795928955,
+ "y": 655.9660029411316,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "17aebe0e.08da62",
+ "id": "9773ede5.0ea13",
"type": "outcome",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1272.010425567627,
- "y": 555.4137077331543,
- "z": "85ee3913.3987f8",
+ "x": 1292.0039253234863,
+ "y": 555.4137082099915,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "3571e5b5.b5fc8a"
+ "7667e896.f38bf8"
]
]
},
{
- "id": "3571e5b5.b5fc8a",
+ "id": "7667e896.f38bf8",
"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": 1680.5341987609863,
- "y": 552.9344749450684,
- "z": "85ee3913.3987f8",
+ "x": 1700.5276985168457,
+ "y": 552.9344754219055,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "a756f30b.6c1cb",
+ "id": "86bac2cf.d6b39",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 721.0104064941406,
- "y": 881.7469687461853,
- "z": "85ee3913.3987f8",
+ "x": 741.00390625,
+ "y": 881.7469692230225,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "3edd603.8e265a"
+ "dcb59eb.f680a6"
]
]
},
{
- "id": "a5f22e70.04f1a",
+ "id": "7ef3c11c.de325",
"type": "outcome",
- "name": "ActivateSiteInstance",
- "xml": "<outcome value='ActivateSiteInstance'>",
+ "name": "ActivateSDWANSiteInstance",
+ "xml": "<outcome value='ActivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1212.153434753418,
- "y": 881.6458888053894,
- "z": "85ee3913.3987f8",
+ "x": 1271.146957397461,
+ "y": 884.6459226608276,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "ce7332d1.0ac03"
+ "d260e542.de2768"
]
]
},
{
- "id": "3edd603.8e265a",
+ "id": "dcb59eb.f680a6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 901.6771774291992,
- "y": 877.166645526886,
- "z": "85ee3913.3987f8",
+ "x": 921.6706771850586,
+ "y": 877.1666460037231,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "91a235a8.4c9e08"
+ "e18a049.97ec9f8"
]
]
},
{
- "id": "ce7332d1.0ac03",
+ "id": "d260e542.de2768",
"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": 1585.6772384643555,
- "y": 880.1666712760925,
- "z": "85ee3913.3987f8",
+ "x": 1683.6708450317383,
+ "y": 878.1667051315308,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "f2fcfc7e.d1ffa",
+ "id": "23af3ff8.e62a2",
"type": "outcome",
"name": "ActivateSDWANDeviceInstance",
"xml": "<outcome value='ActivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1240.343894958496,
- "y": 930.6667108535767,
- "z": "85ee3913.3987f8",
+ "x": 1260.3373947143555,
+ "y": 930.6667113304138,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "c9db1dea.dfbf5"
+ "d9fbf850.8eb808"
]
]
},
{
- "id": "c9db1dea.dfbf5",
+ "id": "d9fbf850.8eb808",
"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": 1675.8675918579102,
- "y": 930.1874833106995,
- "z": "85ee3913.3987f8",
+ "x": 1695.8610916137695,
+ "y": 930.1874837875366,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "f410619e.7b2af",
+ "id": "f7b99e1b.e28fb",
"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": 1674.3437194824219,
- "y": 1015.6666650772095,
- "z": "85ee3913.3987f8",
+ "x": 1694.3372192382812,
+ "y": 1015.6666655540466,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "b65d5517.761218",
+ "id": "ddf229e7.82bf38",
"type": "outcome",
"name": "ActivateSDWANPortInstance",
"xml": "<outcome value='ActivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1238.8200225830078,
- "y": 1016.1458926200867,
- "z": "85ee3913.3987f8",
+ "x": 1258.8135223388672,
+ "y": 1016.1458930969238,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "f410619e.7b2af"
+ "f7b99e1b.e28fb"
]
]
},
{
- "id": "91a235a8.4c9e08",
+ "id": "e18a049.97ec9f8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 978.0104064941406,
- "y": 943.7469687461853,
- "z": "85ee3913.3987f8",
+ "x": 998.00390625,
+ "y": 943.7469692230225,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "a5f22e70.04f1a",
- "f2fcfc7e.d1ffa",
- "b65d5517.761218",
- "631e788a.5ef948",
- "b5cf8a8f.31ae38",
- "25d6d260.b0230e"
+ "7ef3c11c.de325",
+ "23af3ff8.e62a2",
+ "ddf229e7.82bf38",
+ "d6b4380a.e6fc68",
+ "bea21a7.81c0de8",
+ "346cc8c9.1c2778"
]
]
},
{
- "id": "631e788a.5ef948",
+ "id": "d6b4380a.e6fc68",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1170.581886291504,
- "y": 1064.958477973938,
- "z": "85ee3913.3987f8",
+ "x": 1190.5753860473633,
+ "y": 1064.9584784507751,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "c987f934.5e8db8"
+ "6f89102d.f2093"
]
]
},
{
- "id": "b5cf8a8f.31ae38",
+ "id": "bea21a7.81c0de8",
"type": "outcome",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
"comments": "",
"outputs": 1,
- "x": 1254.0104064941406,
- "y": 839.7469687461853,
- "z": "85ee3913.3987f8",
+ "x": 1274.00390625,
+ "y": 839.7469692230225,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "e540db1.fcd5d28"
+ "938a7e9e.1488b"
]
]
},
{
- "id": "e540db1.fcd5d28",
+ "id": "938a7e9e.1488b",
"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": 1669.5342102050781,
- "y": 833.2677454948425,
- "z": "85ee3913.3987f8",
+ "x": 1689.5277099609375,
+ "y": 833.2677459716797,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "201f4d37.e91032",
+ "id": "1207cb15.bda8a5",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 705.0103988647461,
- "y": 1167.7470617294312,
- "z": "85ee3913.3987f8",
+ "x": 725.0038986206055,
+ "y": 1167.7470622062683,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "389867bf.2284f8"
+ "44d3e67.69f5d18"
]
]
},
{
- "id": "c7aad7d3.fb5618",
+ "id": "257dcf4a.baf63",
"type": "outcome",
- "name": "DeactivateSiteInstance",
- "xml": "<outcome value='DeactivateSiteInstance'>",
+ "name": "DeactivateSDWANSiteInstance",
+ "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1196.1534271240234,
- "y": 1167.6459817886353,
- "z": "85ee3913.3987f8",
+ "x": 1263.1470184326172,
+ "y": 1167.646032333374,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "4675b373.48835c"
+ "762704d.9dc17fc"
]
]
},
{
- "id": "389867bf.2284f8",
+ "id": "44d3e67.69f5d18",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 885.6771697998047,
- "y": 1163.1667385101318,
- "z": "85ee3913.3987f8",
+ "x": 905.6706695556641,
+ "y": 1163.166738986969,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "80dc1053.718dc"
+ "6d4f8b47.fe5794"
]
]
},
{
- "id": "4675b373.48835c",
+ "id": "762704d.9dc17fc",
"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": 1569.677230834961,
- "y": 1166.1667642593384,
- "z": "85ee3913.3987f8",
+ "x": 1680.670783996582,
+ "y": 1169.16676902771,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "f75c0513.6c8168",
+ "id": "75979eed.fc0b",
"type": "outcome",
"name": "DeactivateSDWANDeviceInstance",
"xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1224.3438873291016,
- "y": 1216.6668038368225,
- "z": "85ee3913.3987f8",
+ "x": 1244.337387084961,
+ "y": 1216.6668043136597,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "85958e69.f32bb"
+ "e1999526.f6ec28"
]
]
},
{
- "id": "85958e69.f32bb",
+ "id": "e1999526.f6ec28",
"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": 1659.8675842285156,
- "y": 1216.1875762939453,
- "z": "85ee3913.3987f8",
+ "x": 1679.861083984375,
+ "y": 1216.1875767707825,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "73d40202.c78c6c",
+ "id": "7940dddb.23f774",
"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": 1657.3437957763672,
- "y": 1294.666778087616,
- "z": "85ee3913.3987f8",
+ "x": 1677.3372955322266,
+ "y": 1294.6667785644531,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "da717258.8698a",
+ "id": "b7bae25f.1012c",
"type": "outcome",
"name": "DeactivateSDWANPortInstance",
"xml": "<outcome value='DeactivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1221.8200988769531,
- "y": 1295.1460056304932,
- "z": "85ee3913.3987f8",
+ "x": 1241.8135986328125,
+ "y": 1295.1460061073303,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "73d40202.c78c6c"
+ "7940dddb.23f774"
]
]
},
{
- "id": "80dc1053.718dc",
+ "id": "6d4f8b47.fe5794",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 962.0103988647461,
- "y": 1229.7470617294312,
- "z": "85ee3913.3987f8",
+ "x": 982.0038986206055,
+ "y": 1229.7470622062683,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "c7aad7d3.fb5618",
- "f75c0513.6c8168",
- "da717258.8698a",
- "903da395.919c3",
- "82d33324.e23e3",
- "1b1f1da6.c2e872"
+ "257dcf4a.baf63",
+ "75979eed.fc0b",
+ "b7bae25f.1012c",
+ "fcda1e4c.615a4",
+ "8473a82c.4877f8",
+ "1f1b01c5.6b73be"
]
]
},
{
- "id": "903da395.919c3",
+ "id": "fcda1e4c.615a4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1157.5818328857422,
- "y": 1344.958568096161,
- "z": "85ee3913.3987f8",
+ "x": 1177.5753326416016,
+ "y": 1344.958568572998,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "e8c4be82.d0b16"
+ "33eff1fb.6065ee"
]
]
},
{
- "id": "82d33324.e23e3",
+ "id": "8473a82c.4877f8",
"type": "outcome",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1238.010398864746,
- "y": 1125.7470617294312,
- "z": "85ee3913.3987f8",
+ "x": 1258.0038986206055,
+ "y": 1125.7470622062683,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "2b4b6274.20abbe"
+ "4ad61465.b466cc"
]
]
},
{
- "id": "2b4b6274.20abbe",
+ "id": "4ad61465.b466cc",
"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": 1653.5342025756836,
- "y": 1119.2678384780884,
- "z": "85ee3913.3987f8",
+ "x": 1673.527702331543,
+ "y": 1119.2678389549255,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "e8c4be82.d0b16",
+ "id": "33eff1fb.6065ee",
"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": 1496.010513305664,
- "y": 1345.4137787818909,
- "z": "85ee3913.3987f8",
+ "x": 1516.0040130615234,
+ "y": 1345.413779258728,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "c987f934.5e8db8",
+ "id": "6f89102d.f2093",
"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": 1501.010398864746,
- "y": 1062.4136877059937,
- "z": "85ee3913.3987f8",
+ "x": 1521.0038986206055,
+ "y": 1062.4136881828308,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "9ee92290.b08c",
+ "id": "a47671f0.7d05a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1099.0103645324707,
- "y": 341.41364336013794,
- "z": "85ee3913.3987f8",
+ "x": 1119.00386428833,
+ "y": 341.4136438369751,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "d58a6905.f3a7f8",
+ "id": "3cda3fef.0d9d8",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 727.0103492736816,
- "y": 342.0803208351135,
- "z": "85ee3913.3987f8",
+ "x": 747.003849029541,
+ "y": 342.0803213119507,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "9ee92290.b08c"
+ "a47671f0.7d05a"
]
]
},
{
- "id": "2b26c4c1.602edc",
+ "id": "5b101188.1d177",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 668.0104446411133,
- "y": 1513.0803904533386,
- "z": "85ee3913.3987f8",
+ "x": 688.0039443969727,
+ "y": 1513.0803909301758,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "b6813743.434d08"
+ "114b4b9d.5295d4"
]
]
},
{
- "id": "325c1f9a.af3de",
+ "id": "ff0a1131.810f4",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 907.3439636230469,
- "y": 1513.666757106781,
- "z": "85ee3913.3987f8",
+ "x": 927.3374633789062,
+ "y": 1513.6667575836182,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "f978524b.49dc8",
- "ee8589f0.103678",
- "ef71212e.bc228",
- "c42f06a0.286dc8",
- "c4490e9c.34e51",
- "747ce36c.3de7fc"
+ "1ad48c77.fd16f4",
+ "c2daaecd.bf1de",
+ "96d040fc.c73ab",
+ "61982dc8.6271b4",
+ "71ed2a12.125604",
+ "c389a69c.23d3e8"
]
]
},
{
- "id": "ee8589f0.103678",
+ "id": "c2daaecd.bf1de",
"type": "outcome",
- "name": "DeleteSiteInstance",
- "xml": "<outcome value='DeleteSiteInstance'>",
+ "name": "DeleteSDWANSiteInstance",
+ "xml": "<outcome value='DeleteSDWANSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1176.820457458496,
- "y": 1447.1461582183838,
- "z": "85ee3913.3987f8",
+ "x": 1212.8140106201172,
+ "y": 1447.1461572647095,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "e685df53.12b53"
+ "1180e635.2cc73a"
]
]
},
{
- "id": "f978524b.49dc8",
+ "id": "1ad48c77.fd16f4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1106.7248306274414,
- "y": 1604.5240168571472,
- "z": "85ee3913.3987f8",
+ "x": 1126.7183303833008,
+ "y": 1604.5240173339844,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "9ea10b9d.acf658"
+ "f97fd7f3.6f7498"
]
]
},
{
- "id": "b6813743.434d08",
+ "id": "114b4b9d.5295d4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 854.3439636230469,
- "y": 1440.6667551994324,
- "z": "85ee3913.3987f8",
+ "x": 874.3374633789062,
+ "y": 1440.6667556762695,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "325c1f9a.af3de"
+ "ff0a1131.810f4"
]
]
},
{
- "id": "e685df53.12b53",
+ "id": "1180e635.2cc73a",
"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": 1596.344123840332,
- "y": 1442.6670017242432,
- "z": "85ee3913.3987f8",
+ "x": 1616.3376235961914,
+ "y": 1442.6670022010803,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "9ea10b9d.acf658",
+ "id": "f97fd7f3.6f7498",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1260.010482788086,
- "y": 1604.5804133415222,
- "z": "85ee3913.3987f8",
+ "x": 1280.0039825439453,
+ "y": 1604.5804138183594,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "ef71212e.bc228",
+ "id": "96d040fc.c73ab",
"type": "outcome",
"name": "DeleteSDWANPortInstance",
"xml": "<outcome value='DeleteSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1170.6772232055664,
- "y": 1562.9139075279236,
- "z": "85ee3913.3987f8",
+ "x": 1190.6707229614258,
+ "y": 1562.9139080047607,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "64a82c2b.8bd464"
+ "14aa28f6.f665e7"
]
]
},
{
- "id": "64a82c2b.8bd464",
+ "id": "14aa28f6.f665e7",
"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": 1643.2009201049805,
- "y": 1562.4346594810486,
- "z": "85ee3913.3987f8",
+ "x": 1663.1944198608398,
+ "y": 1562.4346599578857,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "c42f06a0.286dc8",
+ "id": "61982dc8.6271b4",
"type": "outcome",
"name": "DeleteSDWANDeviceInstance",
"xml": "<outcome value='DeleteSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1195.041618347168,
- "y": 1486.111795425415,
- "z": "85ee3913.3987f8",
+ "x": 1215.0351181030273,
+ "y": 1486.1117959022522,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "4d9adbda.eda754"
+ "18b71adb.f193b5"
]
]
},
{
- "id": "4d9adbda.eda754",
+ "id": "18b71adb.f193b5",
"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": 1609.5654373168945,
- "y": 1481.6326999664307,
- "z": "85ee3913.3987f8",
+ "x": 1629.558937072754,
+ "y": 1481.6327004432678,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "c4490e9c.34e51",
+ "id": "71ed2a12.125604",
"type": "outcome",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1199.0104751586914,
- "y": 1406.0804076194763,
- "z": "85ee3913.3987f8",
+ "x": 1219.0039749145508,
+ "y": 1406.0804080963135,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "8af6e006.bfec5"
+ "f0f97b33.560518"
]
]
},
{
- "id": "8af6e006.bfec5",
+ "id": "f0f97b33.560518",
"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": 1592.534278869629,
- "y": 1406.6011753082275,
- "z": "85ee3913.3987f8",
+ "x": 1612.5277786254883,
+ "y": 1406.6011757850647,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "e795cb52.6c6f98",
+ "id": "cf6851c.b8328b",
"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": 1058.7604064941406,
- "y": 563.0039051473141,
- "z": "85ee3913.3987f8",
+ "x": 1078.75390625,
+ "y": 563.0039056241512,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "6c28f181.61b7c",
+ "id": "d780b057.46e04",
"type": "outcome",
"name": "CreateSDWANLanPortInstance",
"xml": "<outcome value='CreateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1235.75390625,
- "y": 697.25390625,
- "z": "85ee3913.3987f8",
+ "x": 1255.7474060058594,
+ "y": 697.2539067268372,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "1169c073.b7816"
+ "87c41ab9.dcc0d8"
]
]
},
{
- "id": "1169c073.b7816",
+ "id": "87c41ab9.dcc0d8",
"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": 1708.277603149414,
- "y": 696.774658203125,
- "z": "85ee3913.3987f8",
+ "x": 1728.2711029052734,
+ "y": 696.7746586799622,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "25d6d260.b0230e",
+ "id": "346cc8c9.1c2778",
"type": "outcome",
"name": "ActivateSDWANLanPortInstance",
"xml": "<outcome value='ActivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1247.75390625,
- "y": 974.50390625,
- "z": "85ee3913.3987f8",
+ "x": 1267.7474060058594,
+ "y": 974.5039067268372,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "ec26a8f0.36bb88"
+ "c932f0f5.6bc3c"
]
]
},
{
- "id": "ec26a8f0.36bb88",
+ "id": "c932f0f5.6bc3c",
"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": 1665.2775573730469,
- "y": 974.0246677398682,
- "z": "85ee3913.3987f8",
+ "x": 1685.2710571289062,
+ "y": 974.0246682167053,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "1b1f1da6.c2e872",
+ "id": "1f1b01c5.6b73be",
"type": "outcome",
"name": "DeactivateSDWANLanPortInstance",
"xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1233.75390625,
- "y": 1260.75390625,
- "z": "85ee3913.3987f8",
+ "x": 1253.7474060058594,
+ "y": 1260.7539067268372,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "dabaac5b.2c0a7"
+ "91614e8f.0048"
]
]
},
{
- "id": "dabaac5b.2c0a7",
+ "id": "91614e8f.0048",
"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": 1651.2775573730469,
- "y": 1260.2746677398682,
- "z": "85ee3913.3987f8",
+ "x": 1671.2710571289062,
+ "y": 1260.2746682167053,
+ "z": "62f71b5.55c86e4",
"wires": [
[]
]
},
{
- "id": "747ce36c.3de7fc",
+ "id": "c389a69c.23d3e8",
"type": "outcome",
"name": "DeleteSDWANLanPortInstance",
"xml": "<outcome value='DleteSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1197.75390625,
- "y": 1523.75390625,
- "z": "85ee3913.3987f8",
+ "x": 1217.7474060058594,
+ "y": 1523.7539067268372,
+ "z": "62f71b5.55c86e4",
"wires": [
[
- "19220770.af1c39"
+ "9f681b9b.624d78"
]
]
},
{
- "id": "19220770.af1c39",
+ "id": "9f681b9b.624d78",
"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": 1615.2775573730469,
- "y": 1523.2746677398682,
- "z": "85ee3913.3987f8",
+ "x": 1635.2710571289062,
+ "y": 1523.2746682167053,
+ "z": "62f71b5.55c86e4",
"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 dfb0b20c..ca09d528 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 @@ -1,38 +1,38 @@ [
{
- "id": "449f76b2.35ecd8",
+ "id": "62a2b375.b0142c",
"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": 651.00390625,
- "y": 351.99999046325684,
- "z": "a60b8cc5.55e8f",
+ "x": 631.00390625,
+ "y": 358.9999910593033,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "398bb19.252604e",
- "b6d1d1d8.bb9ed",
- "62a6e293.8703bc"
+ "2ce296c7.89a92a",
+ "286b40a1.270d8",
+ "a5e09c26.33e85"
]
]
},
{
- "id": "3ae00491.8f60fc",
+ "id": "274a6c23.93af74",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 188.00390243530273,
- "y": 43,
- "z": "a60b8cc5.55e8f",
+ "x": 185.00391006469727,
+ "y": 38.00000190734863,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "cd3d997.ba35068"
+ "d19a3d29.13e6c"
]
]
},
{
- "id": "cd3d997.ba35068",
+ "id": "d19a3d29.13e6c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -40,2064 +40,2145 @@ "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": 257.2896041870117,
- "y": 106.23810958862305,
- "z": "a60b8cc5.55e8f",
+ "x": 237.28960418701172,
+ "y": 113.2381101846695,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "42625ee9.60cf8"
+ "f2cc8408.469028"
]
]
},
{
- "id": "42625ee9.60cf8",
+ "id": "f2cc8408.469028",
"type": "method",
"name": "method sdwan-vf-operation-lanport-activate",
"xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 269.00389862060547,
- "y": 200.58634185791016,
- "z": "a60b8cc5.55e8f",
+ "x": 249.00389862060547,
+ "y": 207.5863424539566,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "3ec2bae1.a772e6"
+ "b1463b24.6fe0e8"
]
]
},
{
- "id": "3ec2bae1.a772e6",
+ "id": "b1463b24.6fe0e8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 269.67057037353516,
- "y": 456.666708946228,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "788af4bb.4d81cc",
- "1b2b5acf.fbd5d5",
- "449f76b2.35ecd8",
- "9c153d6a.4cf43",
- "46f7cea6.503f1",
- "fcbf2fc7.b018d",
- "505ed63f.24baa8",
- "94404e6f.e8fde",
- "16a0b0ad.e2c3df",
- "e352097b.fa56f8",
- "ea89a3cd.96c6c",
- "b4355150.f8381",
- "23f60fe.f5fa6f",
- "9f914b2c.f63948",
- "3174dd24.ba8ab2",
- "455e901d.d7497",
- "41672a48.274fe4",
- "58693560.f55b6c",
- "69c506db.344ae8",
- "3c1e06fc.eec57a",
- "b87c5ca2.4198d",
- "13f149d1.1db0a6",
- "97edc5d7.68c598",
- "deaed14.de5b43"
- ]
- ]
- },
- {
- "id": "1b2b5acf.fbd5d5",
+ "x": 249.67057037353516,
+ "y": 463.6667095422745,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "303d2cf.b399dd4",
+ "d51e952d.52f938",
+ "62a2b375.b0142c",
+ "c2a7f215.4af7c",
+ "e1a9154.b1471e8",
+ "67323544.ab409c",
+ "b8bc82a8.8f71c",
+ "af677f19.b868e",
+ "5684b01b.2cc86",
+ "3b06c257.27b87e",
+ "f005bd73.83921",
+ "e03228a1.7c0b08",
+ "b83326ad.562c28",
+ "d5b2bc3d.8d9a6",
+ "292717fc.ce9118",
+ "a812fb94.72ecd8",
+ "b9762c75.21e69",
+ "c04f18a6.eec778",
+ "bb7f5a63.9f3828",
+ "a98e7add.71df78",
+ "955e1b88.3ac648",
+ "f78f25c0.9e44a8",
+ "e3c5f502.462e18",
+ "2a5aae1a.c1b0a2",
+ "b74ec81a.384238"
+ ]
+ ]
+ },
+ {
+ "id": "d51e952d.52f938",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 616.0352668762207,
- "y": 222.26914596557617,
- "z": "a60b8cc5.55e8f",
+ "x": 596.0352668762207,
+ "y": 229.26914656162262,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7ea5c9a1.849a58"
+ "1705b3b3.be9e2c"
]
]
},
{
- "id": "788af4bb.4d81cc",
+ "id": "303d2cf.b399dd4",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 621.0039215087891,
- "y": 161.00001525878906,
- "z": "a60b8cc5.55e8f",
+ "x": 601.0039215087891,
+ "y": 168.0000158548355,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "eddbe91d.071158"
+ "ae5f28f0.d5a908"
]
]
},
{
- "id": "eddbe91d.071158",
+ "id": "ae5f28f0.d5a908",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 801.0039024353027,
- "y": 160.00000476837158,
- "z": "a60b8cc5.55e8f",
+ "x": 781.0039024353027,
+ "y": 167.00000536441803,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "43ffd7ae.190158"
+ "60302d9b.78d214"
]
]
},
{
- "id": "43ffd7ae.190158",
+ "id": "60302d9b.78d214",
"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": 950.4326286315918,
- "y": 161.14292240142822,
- "z": "a60b8cc5.55e8f",
+ "x": 930.4326286315918,
+ "y": 168.14292299747467,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "7ea5c9a1.849a58",
+ "id": "1705b3b3.be9e2c",
"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": 839.0039176940918,
- "y": 223.00001096725464,
- "z": "a60b8cc5.55e8f",
+ "x": 819.0039176940918,
+ "y": 230.0000115633011,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "63b5b6be.7bb648"
+ "1f9e74ab.0ce8fb"
]
]
},
{
- "id": "63b5b6be.7bb648",
+ "id": "1f9e74ab.0ce8fb",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1054.0039024353027,
- "y": 221.00000476837158,
- "z": "a60b8cc5.55e8f",
+ "x": 1034.0039024353027,
+ "y": 228.00000536441803,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "395d7249.60aa0e"
+ "67d2b453.3ade6c"
]
]
},
{
- "id": "395d7249.60aa0e",
+ "id": "67d2b453.3ade6c",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1218.0039024353027,
- "y": 216.00000476837158,
- "z": "a60b8cc5.55e8f",
+ "x": 1198.0039024353027,
+ "y": 223.00000536441803,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "b6d1d1d8.bb9ed",
+ "id": "286b40a1.270d8",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 873.0038986206055,
- "y": 386,
- "z": "a60b8cc5.55e8f",
+ "x": 853.0038986206055,
+ "y": 393.00000059604645,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "284a993a.df0816"
+ "9beeb53f.32d368"
]
]
},
{
- "id": "398bb19.252604e",
+ "id": "2ce296c7.89a92a",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 878.0038948059082,
- "y": 332.9999990463257,
- "z": "a60b8cc5.55e8f",
+ "x": 858.0038948059082,
+ "y": 339.99999964237213,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "284a993a.df0816"
+ "9beeb53f.32d368"
]
]
},
{
- "id": "284a993a.df0816",
+ "id": "9beeb53f.32d368",
"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": 1036.0038986206055,
- "y": 346,
- "z": "a60b8cc5.55e8f",
+ "x": 1016.0038986206055,
+ "y": 353.00000059604645,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "62a6e293.8703bc",
+ "id": "a5e09c26.33e85",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 873.0038986206055,
- "y": 447,
- "z": "a60b8cc5.55e8f",
+ "x": 853.0038986206055,
+ "y": 454.00000059604645,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f366b8b5.961cc8"
+ "e1d84972.4ad0c8"
]
]
},
{
- "id": "cb04cf04.061eb",
+ "id": "fd2ead86.4408b",
"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": 1227.0039138793945,
- "y": 445.0000139474869,
- "z": "a60b8cc5.55e8f",
+ "x": 1207.0039138793945,
+ "y": 452.0000145435333,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "f366b8b5.961cc8",
+ "id": "e1d84972.4ad0c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1034.0039443969727,
- "y": 443.99999141693115,
- "z": "a60b8cc5.55e8f",
+ "x": 1014.0039443969727,
+ "y": 450.9999920129776,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "cb04cf04.061eb",
- "19000243.abd3ee"
+ "fd2ead86.4408b",
+ "a0db8178.b9fc1"
]
]
},
{
- "id": "19000243.abd3ee",
+ "id": "a0db8178.b9fc1",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1246.0038833618164,
- "y": 497.99999046325684,
- "z": "a60b8cc5.55e8f",
+ "x": 1226.0038833618164,
+ "y": 504.9999910593033,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7d37972f.257a38"
+ "d2a74f27.76a7b"
]
]
},
{
- "id": "7d37972f.257a38",
+ "id": "d2a74f27.76a7b",
"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": 1489.0038986206055,
- "y": 493,
- "z": "a60b8cc5.55e8f",
+ "x": 1469.0038986206055,
+ "y": 500.00000059604645,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "377bfea7.613792"
+ "b730478a.e23168"
]
]
},
{
- "id": "377bfea7.613792",
+ "id": "b730478a.e23168",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1687.003927230835,
- "y": 480.0000066757202,
- "z": "a60b8cc5.55e8f",
+ "x": 1667.003927230835,
+ "y": 487.00000727176666,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "18c55aa5.f966a5"
+ "e50ff701.4c8a98"
]
]
},
{
- "id": "18c55aa5.f966a5",
+ "id": "e50ff701.4c8a98",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1839.0038986206055,
- "y": 482,
- "z": "a60b8cc5.55e8f",
+ "x": 1819.0038986206055,
+ "y": 489.00000059604645,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "d08221fe.a8a22",
- "f8638c60.50c2c",
- "4e4f3655.251b48"
+ "9ab17191.831f",
+ "5290285b.0a9238",
+ "718a2bc4.09e914"
]
]
},
{
- "id": "d08221fe.a8a22",
+ "id": "9ab17191.831f",
"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": 2067.0040130615234,
- "y": 424.00000381469727,
- "z": "a60b8cc5.55e8f",
+ "x": 2047.0040130615234,
+ "y": 431.0000044107437,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "f8638c60.50c2c",
+ "id": "5290285b.0a9238",
"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": 2071.0040130615234,
- "y": 478.00000381469727,
- "z": "a60b8cc5.55e8f",
+ "x": 2051.0040130615234,
+ "y": 485.0000044107437,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "9c153d6a.4cf43",
+ "id": "c2a7f215.4af7c",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 585.0040168762207,
- "y": 2093.501151561737,
- "z": "a60b8cc5.55e8f",
+ "x": 580.0040740966797,
+ "y": 2308.5012640953064,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "4e4f3655.251b48",
+ "id": "718a2bc4.09e914",
"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": 2101.4590377807617,
- "y": 529.0104961395264,
- "z": "a60b8cc5.55e8f",
+ "x": 2081.4590377807617,
+ "y": 536.0104967355728,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "2dd1b5ff.e9de3a",
+ "id": "8567646d.1060f8",
"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": 1358.2580871582031,
- "y": 557.0040807723999,
- "z": "a60b8cc5.55e8f",
+ "x": 1338.2580871582031,
+ "y": 564.0040813684464,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "afb4aa7c.d42128"
+ "ac4f7552.ac0308"
]
]
},
{
- "id": "bc24bdbf.b7fae",
+ "id": "80043aea.5219e8",
"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": 1429.25830078125,
- "y": 630.0042104721069,
- "z": "a60b8cc5.55e8f",
+ "x": 1409.25830078125,
+ "y": 637.0042110681534,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "3a56a654.531a3a"
+ "2efabc06.34d0a4"
]
]
},
{
- "id": "afb4aa7c.d42128",
+ "id": "ac4f7552.ac0308",
"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": 1644.2579345703125,
- "y": 559.0041646957397,
- "z": "a60b8cc5.55e8f",
+ "x": 1624.2579345703125,
+ "y": 566.0041652917862,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "258487d9.bf18e8"
+ "fb5d6670.5ef758"
]
]
},
{
- "id": "3a56a654.531a3a",
+ "id": "2efabc06.34d0a4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1649.2580242156982,
- "y": 631.0042181015015,
- "z": "a60b8cc5.55e8f",
+ "x": 1629.2580242156982,
+ "y": 638.0042186975479,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "c2e2f4ae.3e81f8"
+ "f29692e0.539f3"
]
]
},
{
- "id": "c2e2f4ae.3e81f8",
+ "id": "f29692e0.539f3",
"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": 1894.2581024169922,
- "y": 631.0041356086731,
- "z": "a60b8cc5.55e8f",
+ "x": 1874.2581024169922,
+ "y": 638.0041362047195,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "1b295fc8.1fb94"
+ "da95560e.179868"
]
]
},
{
- "id": "1b295fc8.1fb94",
+ "id": "da95560e.179868",
"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": 2202.2583770751953,
- "y": 614.0041036605835,
- "z": "a60b8cc5.55e8f",
+ "x": 2182.2583770751953,
+ "y": 621.00410425663,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "35a3cdd9.9a70d2"
+ "78aec0a1.e1723"
]
]
},
{
- "id": "35a3cdd9.9a70d2",
+ "id": "78aec0a1.e1723",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2411.258415222168,
- "y": 616.004096031189,
- "z": "a60b8cc5.55e8f",
+ "x": 2391.258415222168,
+ "y": 623.0040966272354,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "219f921f.088efe"
+ "df2e3f53.8ca7"
]
]
},
{
- "id": "219f921f.088efe",
+ "id": "df6bb2fa.c17ef",
"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": 2588.2583808898926,
- "y": 612.0042867660522,
- "z": "a60b8cc5.55e8f",
+ "x": 2764.258441925049,
+ "y": 559.0042743682861,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "46f7cea6.503f1",
+ "id": "e1a9154.b1471e8",
"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": 612.2578125,
- "y": 424.00404262542725,
- "z": "a60b8cc5.55e8f",
+ "x": 592.2578125,
+ "y": 431.0040432214737,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "8fd527ce.0b2738"
+ "ae8078e2.85aab8"
]
]
},
{
- "id": "daa35d7b.bbc16",
+ "id": "cea7983f.defeb8",
"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": 1249.008186340332,
- "y": 741.0039882659912,
- "z": "a60b8cc5.55e8f",
+ "x": 1229.008186340332,
+ "y": 748.0039888620377,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "d9309324.f3584"
+ "aa05a333.09241"
]
]
},
{
- "id": "7a222fcd.73c1e",
+ "id": "1a7b39b6.722626",
"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": 895.0080261230469,
- "y": 708.0040283203125,
- "z": "a60b8cc5.55e8f",
+ "x": 875.0080261230469,
+ "y": 715.004028916359,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7ba15821.578698"
+ "6936e75f.9c21b8"
]
]
},
{
- "id": "3174dd24.ba8ab2",
+ "id": "292717fc.ce9118",
"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": 646.0078811645508,
- "y": 639.0039081573486,
- "z": "a60b8cc5.55e8f",
+ "x": 626.0078811645508,
+ "y": 646.0039087533951,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7a222fcd.73c1e"
+ "1a7b39b6.722626"
]
]
},
{
- "id": "d9309324.f3584",
+ "id": "aa05a333.09241",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1471.0081024169922,
- "y": 741.0040698051453,
- "z": "a60b8cc5.55e8f",
+ "x": 1451.0081024169922,
+ "y": 748.0040704011917,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "6e42570c.9e97d8"
+ "45b20afa.d404e4"
]
]
},
{
- "id": "6e42570c.9e97d8",
- "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": 1552.2581100463867,
- "y": 815.5040712356567,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "8eb63937.68f308"
- ]
- ]
- },
- {
- "id": "f89ede9f.dfe34",
- "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": 1935.2584686279297,
- "y": 822.5041785240173,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "69e745ff.0d272c"
- ]
- ]
- },
- {
- "id": "69e745ff.0d272c",
+ "id": "5020b41b.37af8c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2112.258487701416,
- "y": 825.5040187835693,
- "z": "a60b8cc5.55e8f",
+ "x": 3003.2584648132324,
+ "y": 835.5040974617004,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f03a8e8e.83fe2"
+ "285e8b02.5f5364"
]
]
},
{
- "id": "dee78c9f.5dd72",
+ "id": "f8bdb397.3f361",
"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",
+ "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": 2496.2589950561523,
- "y": 799.5040702819824,
- "z": "a60b8cc5.55e8f",
+ "x": 3394.259147644043,
+ "y": 788.5041995048523,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "f03a8e8e.83fe2",
+ "id": "285e8b02.5f5364",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2271.5086784362793,
- "y": 821.0040588378906,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "dee78c9f.5dd72",
- "43b17553.c7382c",
- "36d57da.c3bd682",
- "1a9cf10f.4a8b1f"
- ]
- ]
- },
- {
- "id": "9e2a9762.50d9a8",
- "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": 1930.0078430175781,
- "y": 1338.5039596557617,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "45a4d258.24544c",
- "cb543421.e8e548",
- "f2ddc8f8.67f5b8"
- ]
- ]
- },
- {
- "id": "45a4d258.24544c",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2174.0079040527344,
- "y": 1302.5039596557617,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "73860a6b.6e7a64"
- ]
- ]
- },
- {
- "id": "cb543421.e8e548",
- "type": "not-found",
- "name": "not-found",
- "xml": "<outcome value='not-found'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2176.4987869262695,
- "y": 1338.0779962539673,
- "z": "a60b8cc5.55e8f",
+ "x": 3162.5086555480957,
+ "y": 831.0041375160217,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "57b80d68.fd6804"
+ "f8bdb397.3f361",
+ "ca69f782.4f6db8",
+ "91acccd4.f9b4d"
]
]
},
{
- "id": "f2ddc8f8.67f5b8",
- "type": "other",
- "name": "other",
- "xml": "<outcome value='Other'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2171.8317947387695,
- "y": 1374.4113550186157,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "114f2452.7c39bc"
- ]
- ]
- },
- {
- "id": "114f2452.7c39bc",
- "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": 2325.6042861938477,
- "y": 1371.8504419326782,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "57b80d68.fd6804",
- "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": 2322.070182800293,
- "y": 1336.3636837005615,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "73860a6b.6e7a64",
- "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": 2334.508014678955,
- "y": 1300.5038995742798,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "315d042b.94c54c",
- "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": 1943.9460754394531,
- "y": 1441.6250534057617,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "277e96cc.23f53a",
- "d503dd86.6b851"
- ]
- ]
- },
- {
- "id": "277e96cc.23f53a",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2178.946201324463,
- "y": 1427.62504196167,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "7b5e2570.2698cc"
- ]
- ]
- },
- {
- "id": "d503dd86.6b851",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 2178.196201324463,
- "y": 1463.267949104309,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "198d65d8.c721ba"
- ]
- ]
- },
- {
- "id": "198d65d8.c721ba",
- "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": 2326.9462089538574,
- "y": 1464.0180311203003,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "7b5e2570.2698cc",
- "type": "set",
- "name": "set token-id",
- "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
- "comments": "",
- "x": 2320.9462089538574,
- "y": 1426.6250429153442,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "41672a48.274fe4",
+ "id": "b9762c75.21e69",
"type": "execute",
"name": "execute RestApiCallNode device port create",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.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": 647.03515625,
- "y": 1213.0782289505005,
- "z": "a60b8cc5.55e8f",
+ "x": 669.0351696014404,
+ "y": 1681.0783828496933,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "74d5de9e.64c39",
- "95bf4540.859768"
+ "2da7ca99.c33e76",
+ "294e6b7c.164174"
]
]
},
{
- "id": "74d5de9e.64c39",
+ "id": "2da7ca99.c33e76",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 896.0352153778076,
- "y": 1227.0784349441528,
- "z": "a60b8cc5.55e8f",
+ "x": 915.035228729248,
+ "y": 1695.0785164833069,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "446d7b16.686f54"
+ "78f113d9.71ae5c"
]
]
},
{
- "id": "95bf4540.859768",
+ "id": "294e6b7c.164174",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 896.0352153778076,
- "y": 1189.0782704353333,
- "z": "a60b8cc5.55e8f",
+ "x": 915.035228729248,
+ "y": 1657.0783519744873,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "5b043775.82b438"
+ "bdca7d72.89f35"
]
]
},
{
- "id": "5b043775.82b438",
+ "id": "bdca7d72.89f35",
"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": 1040.0355491638184,
- "y": 1188.078269958496,
- "z": "a60b8cc5.55e8f",
+ "x": 1059.0355625152588,
+ "y": 1656.0783514976501,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "446d7b16.686f54",
+ "id": "78f113d9.71ae5c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1043.0352268218994,
- "y": 1228.0782737731934,
- "z": "a60b8cc5.55e8f",
+ "x": 1062.0352401733398,
+ "y": 1696.0783553123474,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "fcbf2fc7.b018d",
+ "id": "67323544.ab409c",
"type": "set",
"name": "set prop.lan.devicePortId",
"xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",
"comments": "",
- "x": 589.6924171447754,
- "y": 1266.1794338226318,
- "z": "a60b8cc5.55e8f",
+ "x": 608.6924304962158,
+ "y": 1734.179515361786,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "b76fce1f.c41d6",
+ "id": "52d8036.d8251fc",
"type": "comment",
"name": "Create port",
"info": "",
"comments": "",
- "x": 548.7010955810547,
- "y": 1179.522253036499,
- "z": "a60b8cc5.55e8f",
+ "x": 567.7011089324951,
+ "y": 1647.522334575653,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "455e901d.d7497",
+ "id": "a812fb94.72ecd8",
"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": 595.7010955810547,
- "y": 1128.1886892318726,
- "z": "a60b8cc5.55e8f",
+ "x": 606.7011108398438,
+ "y": 1418.1887378692627,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "4fc0e57c.93c3fc",
+ "id": "49f7e1ca.47a1d",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 1069.6854057312012,
- "y": 1308.188857793808,
- "z": "a60b8cc5.55e8f",
+ "x": 1088.6854190826416,
+ "y": 1776.188939332962,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "fe4c3471.1ff888",
- "5d7f5544.360c1c"
+ "90e9cae2.8856e8",
+ "e415727a.32568"
]
]
},
{
- "id": "fe4c3471.1ff888",
+ "id": "90e9cae2.8856e8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1390.685432434082,
- "y": 1325.1891782283783,
- "z": "a60b8cc5.55e8f",
+ "x": 1409.6854457855225,
+ "y": 1793.1892597675323,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "ab1e6271.60b9c"
+ "e9c18e15.5844e"
]
]
},
{
- "id": "5d7f5544.360c1c",
+ "id": "e415727a.32568",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1393.685459136963,
- "y": 1290.1889598369598,
- "z": "a60b8cc5.55e8f",
+ "x": 1412.6854724884033,
+ "y": 1758.189041376114,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "cee492db.e0603"
+ "7758ee8.0aa2e1"
]
]
},
{
- "id": "cee492db.e0603",
+ "id": "7758ee8.0aa2e1",
"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": 1596.685848236084,
- "y": 1286.1890671253204,
- "z": "a60b8cc5.55e8f",
+ "x": 1615.6858615875244,
+ "y": 1754.1891486644745,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "ab1e6271.60b9c",
+ "id": "e9c18e15.5844e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1597.6854133605957,
- "y": 1321.1889336109161,
- "z": "a60b8cc5.55e8f",
+ "x": 1616.6854267120361,
+ "y": 1789.1890151500702,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "e47a1f03.1d40d",
+ "id": "5596dd8.d4db124",
"type": "comment",
"name": "Create bridge domain",
"info": "",
"comments": "",
- "x": 1013.3512992858887,
- "y": 1274.6330835819244,
- "z": "a60b8cc5.55e8f",
+ "x": 1032.351312637329,
+ "y": 1742.6331651210785,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "505ed63f.24baa8",
+ "id": "b8bc82a8.8f71c",
"type": "switchNode",
"name": "switch portSwitch",
"xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 569.4628715515137,
- "y": 1309.855489730835,
- "z": "a60b8cc5.55e8f",
+ "x": 588.4628849029541,
+ "y": 1777.855571269989,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f3a0568f.15eb08"
+ "9b68044d.8003c8"
]
]
},
{
- "id": "f3a0568f.15eb08",
+ "id": "9b68044d.8003c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 748.4629020690918,
- "y": 1309.966812133789,
- "z": "a60b8cc5.55e8f",
+ "x": 767.4629154205322,
+ "y": 1777.9668936729431,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "4fc0e57c.93c3fc"
+ "49f7e1ca.47a1d"
]
]
},
{
- "id": "94404e6f.e8fde",
+ "id": "af677f19.b868e",
"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": 594.0078659057617,
- "y": 1409.7540397644043,
- "z": "a60b8cc5.55e8f",
+ "x": 610.0079498291016,
+ "y": 1125.75403881073,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "8f41cbf5.215278",
- "e159f50d.926278"
+ "818ce376.62233",
+ "94450d41.00936"
]
]
},
{
- "id": "e159f50d.926278",
+ "id": "94450d41.00936",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 795.007884979248,
- "y": 1387.7540311813354,
- "z": "a60b8cc5.55e8f",
+ "x": 811.0079689025879,
+ "y": 1103.7540302276611,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f5bbd137.51f5f"
+ "bdf6adef.1a65c"
]
]
},
{
- "id": "8f41cbf5.215278",
+ "id": "818ce376.62233",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 795.0078887939453,
- "y": 1428.7540349960327,
- "z": "a60b8cc5.55e8f",
+ "x": 811.0079727172852,
+ "y": 1144.7540340423584,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "b8b52f84.e55ad"
+ "9306915f.667d1"
]
]
},
{
- "id": "f5bbd137.51f5f",
+ "id": "bdf6adef.1a65c",
"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": 992.0079040527344,
- "y": 1385.7540311813354,
- "z": "a60b8cc5.55e8f",
+ "x": 1008.0079879760742,
+ "y": 1101.7540302276611,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "b8b52f84.e55ad",
+ "id": "9306915f.667d1",
"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": 950.0078964233398,
- "y": 1425.7540340423584,
- "z": "a60b8cc5.55e8f",
+ "x": 966.0079803466797,
+ "y": 1141.754033088684,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "9835abaa.deb1b8",
+ "id": "a7eaad12.8d234",
"type": "comment",
"name": "Create wan port",
"info": "",
"comments": "",
- "x": 567.0177421569824,
- "y": 1362.7640895843506,
- "z": "a60b8cc5.55e8f",
+ "x": 586.0177555084229,
+ "y": 1830.7641711235046,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "707a08a2.84bfc8",
+ "id": "1c53f052.63589",
"type": "comment",
"name": "TODO: split ip/mask",
"info": "",
"comments": "",
- "x": 991.0175361633301,
- "y": 1347.9343032836914,
- "z": "a60b8cc5.55e8f",
+ "x": 1010.0175495147705,
+ "y": 1815.9343848228455,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "58693560.f55b6c",
+ "id": "b74ec81a.384238",
"type": "execute",
"name": "execute RestApiCallNode IPSubnets create",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\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": 652.7792358398438,
- "y": 1485.8749294281006,
- "z": "a60b8cc5.55e8f",
+ "x": 676.7792358398438,
+ "y": 1898.8749904632568,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "e01d8566.26a208",
- "b77c647.be67698"
+ "23e6b6aa.7344ca",
+ "c063d0d7.3d16a"
]
]
},
{
- "id": "b77c647.be67698",
+ "id": "c063d0d7.3d16a",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 921.7792663574219,
- "y": 1472.8749017715454,
- "z": "a60b8cc5.55e8f",
+ "x": 945.7792663574219,
+ "y": 1885.8749628067017,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7b6fdd20.906734"
+ "8e16c4db.999008"
]
]
},
{
- "id": "e01d8566.26a208",
+ "id": "23e6b6aa.7344ca",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 918.779239654541,
- "y": 1507.8751201629639,
- "z": "a60b8cc5.55e8f",
+ "x": 942.779239654541,
+ "y": 1920.8751811981201,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "a2642272.8a0b"
+ "c72550d5.e3c3a"
]
]
},
{
- "id": "7b6fdd20.906734",
+ "id": "8e16c4db.999008",
"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": 1074.7796478271484,
- "y": 1468.8751277923584,
- "z": "a60b8cc5.55e8f",
+ "x": 1098.7796478271484,
+ "y": 1881.8751888275146,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "a2642272.8a0b",
+ "id": "c72550d5.e3c3a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1065.7792205810547,
- "y": 1508.8748760223389,
- "z": "a60b8cc5.55e8f",
+ "x": 1089.7792205810547,
+ "y": 1921.8749370574951,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "e06f7472.e95f98"
+ "4df7140a.3b523c"
]
]
},
{
- "id": "e06f7472.e95f98",
+ "id": "4df7140a.3b523c",
"type": "set",
"name": "set prop.lan.lanPortId",
"xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
"comments": "",
- "x": 1272.6683235168457,
- "y": 1511.208342552185,
- "z": "a60b8cc5.55e8f",
+ "x": 1296.6683235168457,
+ "y": 1924.2084035873413,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "3c1e06fc.eec57a",
+ "id": "bb7f5a63.9f3828",
"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`\" />",
+ "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": "",
"outputs": 1,
- "x": 669.2896881103516,
- "y": 1665.3338165283203,
- "z": "a60b8cc5.55e8f",
+ "x": 674.2896537780762,
+ "y": 1587.5840225219727,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "5e387a3e.4fd8a4",
- "e4302470.9e4168"
+ "5f34ded5.63106",
+ "676b6124.5f3ce"
]
]
},
{
- "id": "e4302470.9e4168",
+ "id": "676b6124.5f3ce",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 917.289571762085,
- "y": 1691.333193898201,
- "z": "a60b8cc5.55e8f",
+ "x": 922.2895374298096,
+ "y": 1613.5833998918533,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "1a5d2b85.cc6d14"
+ "f979e24a.e1f45"
]
]
},
{
- "id": "1a5d2b85.cc6d14",
+ "id": "f979e24a.e1f45",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1087.2895107269287,
- "y": 1694.333193898201,
- "z": "a60b8cc5.55e8f",
+ "x": 1092.2894763946533,
+ "y": 1616.5833998918533,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "5ab2794a.636098",
+ "id": "cc2c04a4.b165e8",
"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": 1087.2896327972412,
- "y": 1650.333193898201,
- "z": "a60b8cc5.55e8f",
+ "x": 1092.2895984649658,
+ "y": 1572.5833998918533,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "5e387a3e.4fd8a4",
+ "id": "5f34ded5.63106",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 920.2895107269287,
- "y": 1650.333193898201,
- "z": "a60b8cc5.55e8f",
+ "x": 925.2894763946533,
+ "y": 1572.5833998918533,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "5ab2794a.636098"
+ "cc2c04a4.b165e8"
]
]
},
{
- "id": "69c506db.344ae8",
+ "id": "c04f18a6.eec778",
"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.288013458252,
- "y": 1575.8328762054443,
- "z": "a60b8cc5.55e8f",
+ "x": 645.2879791259766,
+ "y": 1498.0830821990967,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "e0d8f775.adb548",
- "1307c84a.e256c8"
+ "97764cff.1f5ea",
+ "ea83fcec.06662"
]
]
},
{
- "id": "1307c84a.e256c8",
+ "id": "ea83fcec.06662",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 861.2879161834717,
- "y": 1597.8328419923782,
- "z": "a60b8cc5.55e8f",
+ "x": 866.2878818511963,
+ "y": 1520.0830479860306,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "845c9ffd.b87b7"
+ "70ae34b5.54dd0c"
]
]
},
{
- "id": "845c9ffd.b87b7",
+ "id": "70ae34b5.54dd0c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1031.2878551483154,
- "y": 1600.8328419923782,
- "z": "a60b8cc5.55e8f",
+ "x": 1036.28782081604,
+ "y": 1523.0830479860306,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "de430292.51fa5",
+ "id": "98836605.c54338",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",
"comments": "",
- "x": 1031.287977218628,
- "y": 1556.8328419923782,
- "z": "a60b8cc5.55e8f",
+ "x": 1036.2879428863525,
+ "y": 1479.0830479860306,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "e0d8f775.adb548",
+ "id": "97764cff.1f5ea",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 864.2878551483154,
- "y": 1556.8328419923782,
- "z": "a60b8cc5.55e8f",
+ "x": 869.28782081604,
+ "y": 1479.0830479860306,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "de430292.51fa5"
+ "98836605.c54338"
]
]
},
{
- "id": "8b10096b.8cb7e8",
+ "id": "51c264bd.1cd0cc",
"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": 1227.2898406982422,
- "y": 862.3332567214966,
- "z": "a60b8cc5.55e8f",
+ "x": 1235.2898559570312,
+ "y": 900.3332679271698,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "43a6f166.ec09e"
+ "425067a.9f0ee98"
]
]
},
{
- "id": "7ba15821.578698",
+ "id": "6936e75f.9c21b8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 984.6229438781738,
- "y": 791.3333368301392,
- "z": "a60b8cc5.55e8f",
+ "x": 964.6229438781738,
+ "y": 798.3333374261856,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "daa35d7b.bbc16",
- "8b10096b.8cb7e8"
+ "cea7983f.defeb8",
+ "51c264bd.1cd0cc"
]
]
},
{
- "id": "43a6f166.ec09e",
+ "id": "425067a.9f0ee98",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1322.9563522338867,
- "y": 936.3333377838135,
- "z": "a60b8cc5.55e8f",
+ "x": 1330.9563674926758,
+ "y": 974.3333489894867,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f4ccb599.a134d8"
+ "c1956959.4be878"
]
]
},
{
- "id": "f4ccb599.a134d8",
+ "id": "c1956959.4be878",
"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": 1537.2062377929688,
- "y": 937.8333144187927,
- "z": "a60b8cc5.55e8f",
+ "x": 1545.2062530517578,
+ "y": 975.8333256244659,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "f6720c82.39b5d"
+ "d2a805b2.ac7b88"
]
]
},
{
- "id": "f6720c82.39b5d",
+ "id": "2b39b5dd.e8366a",
"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": 1784.2062759399414,
- "y": 932.8333973884583,
- "z": "a60b8cc5.55e8f",
+ "x": 1942.2064056396484,
+ "y": 993.8333772420883,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "460bb48a.240e2c"
+ "3ae5efa1.57a7"
]
]
},
{
- "id": "460bb48a.240e2c",
+ "id": "3ae5efa1.57a7",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1934.9562301635742,
- "y": 934.3333129882812,
- "z": "a60b8cc5.55e8f",
+ "x": 2092.9563598632812,
+ "y": 995.3332928419113,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "ac3fc038.e0007"
+ "3180f641.87c8ba"
]
]
},
{
- "id": "ac3fc038.e0007",
+ "id": "3180f641.87c8ba",
"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",
+ "name": "set prop.vpnId",
+ "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": 2108.9569778442383,
- "y": 934.3333714008331,
- "z": "a60b8cc5.55e8f",
+ "x": 2266.9571075439453,
+ "y": 995.3333512544632,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "43b17553.c7382c",
+ "id": "ca69f782.4f6db8",
"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": 2539.290351867676,
- "y": 840.3333714008331,
- "z": "a60b8cc5.55e8f",
+ "x": 3430.290397644043,
+ "y": 843.333466053009,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "36d57da.c3bd682",
+ "id": "91acccd4.f9b4d",
"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": 2570.2902450561523,
- "y": 883.3333377838135,
- "z": "a60b8cc5.55e8f",
+ "x": 3461.2902221679688,
+ "y": 893.3334164619446,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "16a0b0ad.e2c3df",
+ "id": "5684b01b.2cc86",
"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": 656.2896194458008,
- "y": 588.333330154419,
- "z": "a60b8cc5.55e8f",
+ "x": 636.2896194458008,
+ "y": 595.3333307504654,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "8eb63937.68f308",
- "type": "block",
- "name": "block atomic",
- "xml": "<block atomic=\"true\">\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1769.623275756836,
- "y": 816.3333358764648,
- "z": "a60b8cc5.55e8f",
- "wires": [
- [
- "f89ede9f.dfe34",
- "fe16c8cc.020428",
- "9d46cf63.0dcd9"
- ]
- ]
- },
- {
- "id": "fe16c8cc.020428",
+ "id": "e157d21e.75dc",
"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": 1931.9562072753906,
- "y": 747.3333349227905,
- "z": "a60b8cc5.55e8f",
+ "x": 2172.956443786621,
+ "y": 731.3333559036255,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "7b19ac17.f7b154"
+ "91af0190.6f383"
]
]
},
{
- "id": "7b19ac17.f7b154",
+ "id": "91af0190.6f383",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2094.956211090088,
- "y": 742.3333358764648,
- "z": "a60b8cc5.55e8f",
+ "x": 2336.9564476013184,
+ "y": 731.3333559036255,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "5fca6bb6.2ad174"
+ "71599403.d1a60c"
]
]
},
{
- "id": "5fca6bb6.2ad174",
+ "id": "71599403.d1a60c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2262.956253051758,
- "y": 736.3333339691162,
- "z": "a60b8cc5.55e8f",
+ "x": 2524.956615447998,
+ "y": 716.3333549499512,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "fa5fdce5.2309f",
- "d71b47e7.ba0928",
- "368fa25d.21f04e"
+ "7213abe2.551d54",
+ "f3a9e626.ca5db8",
+ "a1885c07.3d09a"
]
]
},
{
- "id": "d71b47e7.ba0928",
+ "id": "f3a9e626.ca5db8",
"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": 2457.956382751465,
- "y": 697.3333253860474,
- "z": "a60b8cc5.55e8f",
+ "x": 2719.956745147705,
+ "y": 677.3333463668823,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "4c9e170f.05bda8"
+ "de11bb23.ad1648"
]
]
},
{
- "id": "fa5fdce5.2309f",
+ "id": "7213abe2.551d54",
"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": 2454.9564895629883,
- "y": 752.333340883255,
- "z": "a60b8cc5.55e8f",
+ "x": 2716.9568519592285,
+ "y": 732.33336186409,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "a41f3558.9efd38"
+ "19121485.c6be8b"
]
]
},
{
- "id": "8f17f745.17ddb8",
+ "id": "cab86296.3a26c",
"type": "set",
"name": "set spoke role",
"xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
"comments": "",
- "x": 2787.9565048217773,
- "y": 691.3333711624146,
- "z": "a60b8cc5.55e8f",
+ "x": 3049.9568672180176,
+ "y": 671.3333921432495,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "44a0a864.8cd1d8",
+ "id": "856c6a7c.0a9268",
"type": "set",
"name": "set hub role",
"xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
"comments": "",
- "x": 2786.9562644958496,
- "y": 746.3333549499512,
- "z": "a60b8cc5.55e8f",
+ "x": 3048.95662689209,
+ "y": 726.3333759307861,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "4c9e170f.05bda8",
+ "id": "de11bb23.ad1648",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2627.9563522338867,
- "y": 693,
- "z": "a60b8cc5.55e8f",
+ "x": 2889.956714630127,
+ "y": 673.000020980835,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "8f17f745.17ddb8"
+ "cab86296.3a26c"
]
]
},
{
- "id": "a41f3558.9efd38",
+ "id": "19121485.c6be8b",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2631.9563522338867,
- "y": 748,
- "z": "a60b8cc5.55e8f",
+ "x": 2893.956714630127,
+ "y": 728.000020980835,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "44a0a864.8cd1d8"
+ "856c6a7c.0a9268"
]
]
},
{
- "id": "b87c5ca2.4198d",
+ "id": "a98e7add.71df78",
"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='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\n",
"comments": "",
"outputs": 1,
- "x": 640.3208885192871,
- "y": 2012.031280040741,
- "z": "a60b8cc5.55e8f",
+ "x": 635.3209457397461,
+ "y": 2227.0313925743103,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
},
{
- "id": "b4355150.f8381",
+ "id": "e03228a1.7c0b08",
"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='Active' />\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": 634.9559097290039,
- "y": 1957.126205444336,
- "z": "a60b8cc5.55e8f",
+ "x": 629.9559669494629,
+ "y": 2172.1263179779053,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "ea89a3cd.96c6c",
+ "id": "f005bd73.83921",
"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": 670.9559097290039,
- "y": 1910.6261444091797,
- "z": "a60b8cc5.55e8f",
+ "x": 665.9559669494629,
+ "y": 2125.626256942749,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "e352097b.fa56f8",
+ "id": "3b06c257.27b87e",
"type": "set",
"name": "copy input data in 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": 634.9558601379395,
- "y": 1858.876064300537,
- "z": "a60b8cc5.55e8f",
+ "x": 629.9559173583984,
+ "y": 2073.8761768341064,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "9f914b2c.f63948",
+ "id": "d5b2bc3d.8d9a6",
"type": "set",
"name": "set device PortId 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.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",
"comments": "",
- "x": 641.3209266662598,
- "y": 1752.0314636230469,
- "z": "a60b8cc5.55e8f",
+ "x": 636.3209838867188,
+ "y": 1967.0315761566162,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "23f60fe.f5fa6f",
+ "id": "b83326ad.562c28",
"type": "set",
"name": "set lan PortId 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.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",
"comments": "",
- "x": 627.3208503723145,
- "y": 1806.0312767028809,
- "z": "a60b8cc5.55e8f",
+ "x": 622.3209075927734,
+ "y": 2021.0313892364502,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "1a9cf10f.4a8b1f",
- "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/svclogic21.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"prop.attach.siteId\"/>\n<parameter name=\"field3\" value='`$prop.attach.siteId`'/>\n",
- "comments": "",
- "outputs": 1,
- "x": 2464.3209915161133,
- "y": 928.5312805175781,
- "z": "a60b8cc5.55e8f",
- "wires": [
- []
- ]
- },
- {
- "id": "368fa25d.21f04e",
- "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/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",
- "comments": "",
- "outputs": 1,
- "x": 2433.321002960205,
- "y": 659.531247138977,
- "z": "a60b8cc5.55e8f",
- "wires": [
- []
- ]
- },
- {
- "id": "9d46cf63.0dcd9",
- "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",
- "comments": "",
- "outputs": 1,
- "x": 1927.3208541870117,
- "y": 691.53125,
- "z": "a60b8cc5.55e8f",
- "wires": [
- []
- ]
- },
- {
- "id": "62b5eb93.96f0e4",
- "type": "comment",
- "name": "**revert the changes",
- "info": "",
- "comments": "",
- "x": 1328.3208808898926,
- "y": 697.0312824249268,
- "z": "a60b8cc5.55e8f",
- "wires": []
- },
- {
- "id": "4995fb6d.83aaf4",
+ "id": "b435bcc5.258",
"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": 871.5038909912109,
- "y": 511.25390625,
- "z": "a60b8cc5.55e8f",
+ "x": 851.5038909912109,
+ "y": 518.2539068460464,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "208d9618.3a993a"
+ "6bafbe6f.aa9fa"
]
]
},
{
- "id": "208d9618.3a993a",
+ "id": "6bafbe6f.aa9fa",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 977.50390625,
- "y": 562.25390625,
- "z": "a60b8cc5.55e8f",
+ "x": 957.50390625,
+ "y": 569.2539068460464,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "fd503aa4.1469a8"
+ "6df05552.51f26c"
]
]
},
{
- "id": "8fd527ce.0b2738",
+ "id": "ae8078e2.85aab8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 671.7539138793945,
- "y": 472.0039048194885,
- "z": "a60b8cc5.55e8f",
+ "x": 651.7539138793945,
+ "y": 479.003905415535,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "4995fb6d.83aaf4"
+ "b435bcc5.258"
]
]
},
{
- "id": "fd503aa4.1469a8",
+ "id": "6df05552.51f26c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1129.753890991211,
- "y": 559.0039281845093,
- "z": "a60b8cc5.55e8f",
+ "x": 1109.753890991211,
+ "y": 566.0039287805557,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "2dd1b5ff.e9de3a"
+ "8567646d.1060f8"
]
]
},
{
- "id": "258487d9.bf18e8",
+ "id": "fb5d6670.5ef758",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1873.5039710998535,
- "y": 557.0039119720459,
- "z": "a60b8cc5.55e8f",
+ "x": 1853.5039710998535,
+ "y": 564.0039125680923,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "bc24bdbf.b7fae"
+ "80043aea.5219e8"
]
]
},
{
- "id": "63f09f8.86bc26",
+ "id": "6484dde4.eec674",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 878.2539176940918,
- "y": 910.7539704740047,
- "z": "a60b8cc5.55e8f",
+ "x": 889.2539329528809,
+ "y": 1200.7540191113949,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "6c04212d.63f27"
+ "a1390712.a62bc8"
]
]
},
{
- "id": "b3737121.de6a3",
+ "id": "ad9df864.da7a08",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 881.7448844909668,
- "y": 958.328006118536,
- "z": "a60b8cc5.55e8f",
+ "x": 892.7448997497559,
+ "y": 1248.3280547559261,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "b8053b7f.3dfe58"
+ "90fe71ad.3f6b8"
]
]
},
{
- "id": "b40d4802.cec768",
+ "id": "eb0b9e44.3ab32",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 877.0778923034668,
- "y": 999.6613191068172,
- "z": "a60b8cc5.55e8f",
+ "x": 888.0779075622559,
+ "y": 1289.6613677442074,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "11f26c3c.e24064"
+ "71113a16.58bf04"
]
]
},
{
- "id": "b8053b7f.3dfe58",
+ "id": "90fe71ad.3f6b8",
"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": 1058.3162956237793,
- "y": 946.6137422025204,
- "z": "a60b8cc5.55e8f",
+ "x": 1069.3163108825684,
+ "y": 1236.6137908399105,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "11f26c3c.e24064",
+ "id": "71113a16.58bf04",
"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": 1064.8504486083984,
- "y": 995.1005118787289,
- "z": "a60b8cc5.55e8f",
+ "x": 1075.8504638671875,
+ "y": 1285.100560516119,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "b9f93820.627df8",
+ "id": "dee3d47e.3afa78",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 880.2539901733398,
- "y": 1053.7540006637573,
- "z": "a60b8cc5.55e8f",
+ "x": 891.2540054321289,
+ "y": 1343.7540493011475,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "ea0a2431.4fcee8"
+ "511dbf29.862b4"
]
]
},
{
- "id": "4b6f89c7.7da458",
+ "id": "1b95ad69.b293e3",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 872.5039901733398,
- "y": 1107.3968839645386,
- "z": "a60b8cc5.55e8f",
+ "x": 883.5040054321289,
+ "y": 1397.3969326019287,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "10698363.0892ad"
+ "b6fcc0f6.ed652"
]
]
},
{
- "id": "ea0a2431.4fcee8",
+ "id": "511dbf29.862b4",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 1030.2539176940918,
- "y": 1054.7539691925049,
- "z": "a60b8cc5.55e8f",
+ "x": 1041.2539329528809,
+ "y": 1344.754017829895,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "10698363.0892ad",
+ "id": "b6fcc0f6.ed652",
"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": 1025.2539901733398,
- "y": 1107.1469449996948,
- "z": "a60b8cc5.55e8f",
+ "x": 1036.254005432129,
+ "y": 1397.146993637085,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "6c04212d.63f27",
+ "id": "a1390712.a62bc8",
"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": 1073.7539978027344,
- "y": 905.7539749145508,
- "z": "a60b8cc5.55e8f",
+ "x": 1084.7540130615234,
+ "y": 1195.754023551941,
+ "z": "54b5b8b7.025628",
"wires": []
},
{
- "id": "97edc5d7.68c598",
+ "id": "f78f25c0.9e44a8",
"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": 631.2539672851562,
- "y": 1076.754077911377,
- "z": "a60b8cc5.55e8f",
+ "x": 642.2539825439453,
+ "y": 1366.754126548767,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "b9f93820.627df8",
- "4b6f89c7.7da458"
+ "dee3d47e.3afa78",
+ "1b95ad69.b293e3"
]
]
},
{
- "id": "13f149d1.1db0a6",
+ "id": "955e1b88.3ac648",
"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": 616.254035949707,
- "y": 957.7539901733398,
- "z": "a60b8cc5.55e8f",
+ "x": 627.2540512084961,
+ "y": 1247.75403881073,
+ "z": "54b5b8b7.025628",
"wires": [
[
- "63f09f8.86bc26",
- "b3737121.de6a3",
- "b40d4802.cec768"
+ "6484dde4.eec674",
+ "ad9df864.da7a08",
+ "eb0b9e44.3ab32"
]
]
},
{
- "id": "deaed14.de5b43",
+ "id": "e3c5f502.462e18",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 631.00390625,
- "y": 291.50390625,
- "z": "a60b8cc5.55e8f",
+ "x": 611.00390625,
+ "y": 298.50390684604645,
+ "z": "54b5b8b7.025628",
"wires": [
[]
]
+ },
+ {
+ "id": "df2e3f53.8ca7",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 2552.5039863586426,
+ "y": 587.7539157867432,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "df6bb2fa.c17ef",
+ "f982878a.d924a8"
+ ]
+ ]
+ },
+ {
+ "id": "f982878a.d924a8",
+ "type": "set",
+ "name": "set site-vnf-index",
+ "xml": "<set>\n<parameter name='site-vnf-index' value='`$vnfidx`' />\n",
+ "comments": "",
+ "x": 2761.50390625,
+ "y": 605.75390625,
+ "z": "54b5b8b7.025628",
+ "wires": []
+ },
+ {
+ "id": "2a5aae1a.c1b0a2",
+ "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": 631.0000305175781,
+ "y": 954.6667243242264,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "a16d9ee5.ca4f8"
+ ]
+ ]
+ },
+ {
+ "id": "a16d9ee5.ca4f8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 732.614933013916,
+ "y": 1050.9960061311722,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "b25dce73.2318a"
+ ]
+ ]
+ },
+ {
+ "id": "b25dce73.2318a",
+ "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": 997.0001754760742,
+ "y": 1000.6666575670242,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "d392cd81.71967"
+ ]
+ ]
+ },
+ {
+ "id": "d392cd81.71967",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1219.0000915527344,
+ "y": 1000.6667391061783,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "fbfbcd34.6e005"
+ ]
+ ]
+ },
+ {
+ "id": "fbfbcd34.6e005",
+ "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": "",
+ "outputs": 1,
+ "x": 1300.250099182129,
+ "y": 1075.1667405366898,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "14eee879.fb0a98"
+ ]
+ ]
+ },
+ {
+ "id": "14eee879.fb0a98",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1517.6152648925781,
+ "y": 1075.9960051774979,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "3e0dbda2.f3d102"
+ ]
+ ]
+ },
+ {
+ "id": "3e0dbda2.f3d102",
+ "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": 1683.2504577636719,
+ "y": 1082.1668478250504,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "d2a4cdf0.bc75d"
+ ]
+ ]
+ },
+ {
+ "id": "d2a4cdf0.bc75d",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1860.2504768371582,
+ "y": 1085.1666880846024,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "62ddf11d.87106"
+ ]
+ ]
+ },
+ {
+ "id": "62ddf11d.87106",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 2019.5006675720215,
+ "y": 1080.6667281389236,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "f40c1288.f6e07"
+ ]
+ ]
+ },
+ {
+ "id": "f40c1288.f6e07",
+ "type": "set",
+ "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": 2244.2509841918945,
+ "y": 1059.1667395830154,
+ "z": "54b5b8b7.025628",
+ "wires": []
+ },
+ {
+ "id": "d2a805b2.ac7b88",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1768.0000610351562,
+ "y": 972.3333503007889,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "2b39b5dd.e8366a",
+ "15adf9ee.e16a86",
+ "2697c7b2.0ecdf8"
+ ]
+ ]
+ },
+ {
+ "id": "15adf9ee.e16a86",
+ "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": 1943.000015258789,
+ "y": 942.333323597908,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "76044b62.8da524"
+ ]
+ ]
+ },
+ {
+ "id": "76044b62.8da524",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2093.749969482422,
+ "y": 943.833239197731,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "dfeb8378.a414f"
+ ]
+ ]
+ },
+ {
+ "id": "dfeb8378.a414f",
+ "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": 2267.750717163086,
+ "y": 943.8332976102829,
+ "z": "54b5b8b7.025628",
+ "wires": []
+ },
+ {
+ "id": "3e65957b.505a7a",
+ "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": 1935.2583618164062,
+ "y": 730.5041723251343,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "e157d21e.75dc"
+ ]
+ ]
+ },
+ {
+ "id": "6306e7ef.6a3048",
+ "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": 2826.258445739746,
+ "y": 832.5042572021484,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "5020b41b.37af8c"
+ ]
+ ]
+ },
+ {
+ "id": "45b20afa.d404e4",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1649.5312805175781,
+ "y": 756.0312795639038,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "3e65957b.505a7a"
+ ]
+ ]
+ },
+ {
+ "id": "a1885c07.3d09a",
+ "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": 2579.5310440063477,
+ "y": 826.0312752723694,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "6306e7ef.6a3048"
+ ]
+ ]
+ },
+ {
+ "id": "2697c7b2.0ecdf8",
+ "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": 1941.50390625,
+ "y": 882.75390625,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "55a98d99.b2ebc4"
+ ]
+ ]
+ },
+ {
+ "id": "55a98d99.b2ebc4",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2092.253860473633,
+ "y": 884.253821849823,
+ "z": "54b5b8b7.025628",
+ "wires": [
+ [
+ "115c12c5.b366ad"
+ ]
+ ]
+ },
+ {
+ "id": "115c12c5.b366ad",
+ "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": 2266.254608154297,
+ "y": 884.2538802623749,
+ "z": "54b5b8b7.025628",
+ "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-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json index 380dfd00..d15b6f4c 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json @@ -579,7 +579,7 @@ "id": "384abebf.660182",
"type": "switchNode",
"name": "switch ActivateSiteInstance",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n ",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n ",
"comments": "",
"outputs": 1,
"x": 1658.5078411102295,
@@ -1878,7 +1878,7 @@ "id": "e72e5636.3932b8",
"type": "set",
"name": "set IP params",
- "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",
+ "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",
"comments": "",
"x": 2257.29248046875,
"y": 1043.8992919921875,
@@ -1889,7 +1889,7 @@ "id": "413a8e72.8c216",
"type": "set",
"name": "set IP params",
- "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
+ "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
"comments": "",
"x": 2254.754150390625,
"y": 1158,
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 fb12ca3e..e9b3965c 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 @@ -26,7 +26,7 @@ <outcome value='CreateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>
</outcome>
- <outcome value='CreateSiteInstance'>
+ <outcome value='CreateSDWANSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>
</outcome>
<outcome value='CreateSDWANDeviceInstance'>
@@ -50,7 +50,7 @@ <outcome value='ActivateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>
</outcome>
- <outcome value='ActivateSiteInstance'>
+ <outcome value='ActivateSDWANSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>
</outcome>
<outcome value='ActivateSDWANDeviceInstance'>
@@ -74,7 +74,7 @@ <outcome value='DeactivateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>
</outcome>
- <outcome value='DeactivateSiteInstance'>
+ <outcome value='DeactivateSDWANSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>
</outcome>
<outcome value='DeactivateSDWANDeviceInstance'>
@@ -98,7 +98,7 @@ <outcome value='DeleteSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>
</outcome>
- <outcome value='DeleteSiteInstance'>
+ <outcome value='DeleteSDWANSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>
</outcome>
<outcome value='DeleteSDWANDeviceInstance'>
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 9211d48b..45a9bce9 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 @@ -78,9 +78,14 @@ <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>
+ <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>
@@ -103,22 +108,11 @@ <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'>
- <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">
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic22.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="set spoke role"/>
- </record>
<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>
@@ -126,61 +120,111 @@ </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>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic21.log"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="prop.attach.siteId"/>
- <parameter name="field3" value='`$prop.attach.siteId`'/>
- </record>
- </block>
- </outcome>
- </switch>
- </block>
- </for>
+ </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`' >
- <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>
+ <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>
</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>
+ <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>
<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="esr-thirdparty-sdnc"
key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
@@ -233,6 +277,54 @@ </execute>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+ <parameter name="format" value="json"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="vpn-result"/>
+ <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"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Create vpn failed" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true"></block>
+ </outcome>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />
+ <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"/>
+ <parameter name="httpMethod" value="put"/>
+ <parameter name="responsePrefix" value="vpn-result"/>
+ <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"/>
+ <parameter name="keyStorePassword" value="adminadmin"/>
+ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error executing Create vpn topology failed" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true"></block>
+ </outcome>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
@@ -287,23 +379,6 @@ </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.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`" />
@@ -332,54 +407,6 @@ </block>
</outcome>
</execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
- <parameter name="responsePrefix" value="vpn-result"/>
- <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"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn failed" />
- </return>
- </outcome>
- <outcome value='success'>
- <block atomic="true"></block>
- </outcome>
- </execute>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
- <parameter name="format" value="json"/>
- <parameter name="httpMethod" value="put"/>
- <parameter name="responsePrefix" value="vpn-result"/>
- <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"/>
- <parameter name="keyStorePassword" value="adminadmin"/>
- <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn topology failed" />
- </return>
- </outcome>
- <outcome value='success'>
- <block atomic="true"></block>
- </outcome>
- </execute>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />
@@ -431,4 +458,4 @@ </return>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml index 40b1896d..288dd5d9 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml @@ -129,7 +129,7 @@ </block>
</outcome>
</switch>
- <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">
+ <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
<outcome value='true'>
<set>
<parameter name='tmp.siteVidx' value='`$idx`' />
@@ -346,11 +346,9 @@ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />
- <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />
<parameter name='prop.wan.IpMode' value="static" />
+ <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />
<parameter name='prop.route.nextHopType' value="ip-address" />
- <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />
@@ -383,7 +381,7 @@ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name='prop.wan.ip-address' value="" />
+ <parameter name='prop.wan.ipAddress' value="" />
<parameter name='prop.wan.prefixLength' value="" />
<parameter name='prop.wan.providerIpAddress' value="" />
<parameter name='prop.wan.IpMode' value="DHCP" />
diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json new file mode 100644 index 00000000..b274c1bf --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-port-cellular.json @@ -0,0 +1,18 @@ +{ + "ports": [ + { + "portType": ${prop.wan.portType}, + "portNumber": ${prop.wan.portNumber}, + "deviceId": ${prop.wan.deviceId}, + "portSwitch": "layer3-port", + "linkInfo": { + "linkType": "Cellular", + "cellular": { + "apn" : ${prop.wan.apn-name} + }, + "atm": null, + "ethernet": null + } + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json b/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json new file mode 100644 index 00000000..d24cf4f1 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-port-ethernet.json @@ -0,0 +1,21 @@ +{ + "ports": [ + { + "portType": ${prop.wan.portType}, + "portNumber": ${prop.wan.portNumber}, + "deviceId": ${prop.wan.deviceId}, + "portSwitch": "layer3-port", + "linkInfo": { + "linkType": "Ethernet", + "cellular": null, + "atm": null, + "ethernet": { + "negotiationMode": "auto", + "media": "copper", + "duplex": "half", + "speed": 10 + } + } + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json new file mode 100644 index 00000000..58cf7969 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-dhcp.json @@ -0,0 +1,45 @@ +{ + "tnps": [ + { + "name": ${prop.wan.name}, + "siteId": ${prop.wan.siteId}, + "deviceId": ${prop.wan.deviceId}, + "portId": ${prop.wan.devicePortId}, + "inSubInterface": false, + "vlanId": "null", + "ipConnection": { + "ipv4": { + "publicIP": null, + "accessType": "IPoE", + "ipMode": "DHCP", + "customerAddress": "", + "prefixLength": null, + "providerAddress": "", + "peerIp": null, + "userName": null, + "userKey": null + } + }, + "transportNetworkInfo": { + "transportNetworkId": ${prop.wan.transportNetworkId}, + "workMode": "active" + }, + "attributes": { + "inputBandwidth": ${prop.wan.inputBandwidth}, + "outputBandwidth": ${prop.wan.outputBandwidth}, + "mtu": 1500, + "TCPmss": 1200 + }, + "ntp": [ + { + "serverIP": "11.11.11.11", + "authentication": false, + "mode": "MD5", + "authKey": "123456", + "authId": 123 + } + ], + "description": ${prop.wan.description} + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json new file mode 100644 index 00000000..9825b6e6 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json @@ -0,0 +1,45 @@ +{ + "tnps": [ + { + "name": ${prop.wan.name}, + "siteId": ${prop.wan.siteId}, + "deviceId": ${prop.wan.deviceId}, + "portId": ${prop.wan.devicePortId}, + "inSubInterface": false, + "vlanId": "null", + "ipConnection": { + "ipv4": { + "publicIP": null, + "accessType": "IPoE", + "ipMode": "Static", + "customerAddress": ${prop.wan.ip-address}, + "prefixLength": ${prop.wan.prefixLength}, + "providerAddress": ${prop.wan.providerIpAddress}, + "peerIp": null, + "userName": null, + "userKey": null + } + }, + "transportNetworkInfo": { + "transportNetworkId": ${prop.wan.transportNetworkId}, + "workMode": "active" + }, + "attributes": { + "inputBandwidth": ${prop.wan.inputBandwidth}, + "outputBandwidth": ${prop.wan.outputBandwidth}, + "mtu": 1500, + "TCPmss": 1200 + }, + "ntp": [ + { + "serverIP": "11.11.11.11", + "authentication": false, + "mode": "MD5", + "authKey": "123456", + "authId": 123 + } + ], + "description": ${prop.wan.description} + } + ] +} |