summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-04-19 00:29:01 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-19 00:29:01 +0000
commit90c15a00656ee8dd3160a327ac9bf15d5e5af168 (patch)
tree9c9c1adbe31beaec81af383986ae321f4bcaa33a
parentc006776c7fb3c6c7cb6ea081d431b2bd886811ac (diff)
parenta599fa4e74ee243fb1a99b8544648af074b27d4e (diff)
Merge "SDWAN LanPort DGs are called in parent DG"
Former-commit-id: 2a92fc2dbeeed599a64a2939dfcfe631d7486370
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json888
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml39
2 files changed, 430 insertions, 497 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 b1920a25..b8819dd3 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": "89e51e9a.af64e",
+ "id": "8a97ec5a.e8724",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 107.00390625,
- "y": 88.41365686058998,
- "z": "3e6c75a5.b69bda",
+ "x": 147.01040649414062,
+ "y": 86.41365575790405,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "a0ef042f.2b7ad8"
+ "7092e500.65d96c"
]
]
},
{
- "id": "a0ef042f.2b7ad8",
+ "id": "7092e500.65d96c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1294 +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": 220.28961181640625,
- "y": 128.65176835656166,
- "z": "3e6c75a5.b69bda",
+ "x": 260.2961120605469,
+ "y": 126.65176725387573,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "a57a3919.3af3c8"
+ "975074db.12b248"
]
]
},
{
- "id": "a57a3919.3af3c8",
+ "id": "975074db.12b248",
"type": "method",
"name": "method vf-module-topology-operation",
"xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 194.43253326416016,
- "y": 168.41365113854408,
- "z": "3e6c75a5.b69bda",
+ "x": 234.43903350830078,
+ "y": 166.41365003585815,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "8614ae38.109ab"
+ "6ba66072.d698d"
]
]
},
{
- "id": "38a58e7b.28bdc2",
+ "id": "c5d72244.65ac2",
"type": "comment",
"name": "vf-module-topology-operation",
"info": "",
"comments": "",
- "x": 501.34876251220703,
- "y": 36.00000062584877,
- "z": "3e6c75a5.b69bda",
+ "x": 541.3552627563477,
+ "y": 33.99999952316284,
+ "z": "85ee3913.3987f8",
"wires": []
},
{
- "id": "8614ae38.109ab",
+ "id": "6ba66072.d698d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 176.50394439697266,
- "y": 407.7738291323185,
- "z": "3e6c75a5.b69bda",
+ "x": 216.51044464111328,
+ "y": 405.77382802963257,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "53a601da.db57d",
- "f371244d.9451a8",
- "c9966ea2.57b1d"
+ "bff84223.52b62",
+ "bb77dcde.97b13",
+ "71a0804b.8983d"
]
]
},
{
- "id": "53a601da.db57d",
+ "id": "bff84223.52b62",
"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": 462.0039367675781,
- "y": 581.2712179720402,
- "z": "3e6c75a5.b69bda",
+ "x": 502.01043701171875,
+ "y": 579.2712168693542,
+ "z": "85ee3913.3987f8",
"wires": []
},
{
- "id": "f371244d.9451a8",
+ "id": "bb77dcde.97b13",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 472.9085464477539,
- "y": 405.98505368828773,
- "z": "3e6c75a5.b69bda",
+ "x": 512.9150466918945,
+ "y": 403.9850525856018,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "dc31bef9.f164b",
- "1b121869.8a1878",
- "320a19eb.21afb6",
- "db7b02d4.3e117",
- "b369a934.e11c08",
- "8734e4a2.e72ad8",
- "bcf05aca.9cd8e8",
- "c7064bfe.3bb108",
- "5dfbbd6.4b80544"
+ "d56401a4.01d66",
+ "ad92b387.5520d",
+ "9ce981c8.a135f",
+ "aabf716e.1d0df",
+ "4bf064de.ff298c",
+ "a756f30b.6c1cb",
+ "201f4d37.e91032",
+ "2b26c4c1.602edc"
]
]
},
{
- "id": "dc31bef9.f164b",
+ "id": "d56401a4.01d66",
"type": "outcome",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 682.3848266601562,
- "y": 296.27089086174965,
- "z": "3e6c75a5.b69bda",
+ "x": 722.3913269042969,
+ "y": 294.2708897590637,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "d462656f.1ce878"
+ "481f6fe3.cdf5a"
]
]
},
{
- "id": "1b121869.8a1878",
+ "id": "ad92b387.5520d",
"type": "outcome",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 690.765811920166,
- "y": 442.46158280968666,
- "z": "3e6c75a5.b69bda",
+ "x": 730.7723121643066,
+ "y": 440.46158170700073,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "52d55f39.2254f"
+ "bb1cd6a8.6e06d8"
]
]
},
{
- "id": "320a19eb.21afb6",
+ "id": "9ce981c8.a135f",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 678.4806060791016,
- "y": 1848.9855699539185,
- "z": "3e6c75a5.b69bda",
+ "x": 670.486686706543,
+ "y": 1670.985191822052,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "aa8c9f07.7e876"
+ "c834b9f2.d6f188"
]
]
},
{
- "id": "aa8c9f07.7e876",
+ "id": "c834b9f2.d6f188",
"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": 872.6710319519043,
- "y": 1848.9856386184692,
- "z": "3e6c75a5.b69bda",
+ "x": 864.6771125793457,
+ "y": 1670.9852604866028,
+ "z": "85ee3913.3987f8",
"wires": []
},
{
- "id": "c9966ea2.57b1d",
+ "id": "71a0804b.8983d",
"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": 592.0871887207031,
- "y": 245.79471364617348,
- "z": "3e6c75a5.b69bda",
+ "x": 632.0936889648438,
+ "y": 243.79471254348755,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "d462656f.1ce878",
+ "id": "481f6fe3.cdf5a",
"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": 1054.527660369873,
- "y": 295.84235540032387,
- "z": "3e6c75a5.b69bda",
+ "x": 1094.5341606140137,
+ "y": 293.84235429763794,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "1a8dc80f.d90c48",
+ "id": "a7175f3d.aa415",
"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": 1066.5276184082031,
- "y": 392.50899854302406,
- "z": "3e6c75a5.b69bda",
+ "x": 1106.5341186523438,
+ "y": 390.50899744033813,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "52d55f39.2254f",
+ "id": "bb1cd6a8.6e06d8",
"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": 1060.8608894348145,
- "y": 442.17571797966957,
- "z": "3e6c75a5.b69bda",
+ "x": 1100.867389678955,
+ "y": 440.17571687698364,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "e3a2c358.113df",
+ "id": "a7404f76.f0514",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 694.8609046936035,
- "y": 393.1756722033024,
- "z": "3e6c75a5.b69bda",
+ "x": 734.8674049377441,
+ "y": 391.17567110061646,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "1a8dc80f.d90c48"
+ "a7175f3d.aa415"
]
]
},
{
- "id": "db7b02d4.3e117",
+ "id": "aabf716e.1d0df",
"type": "outcome",
"name": "changeassign",
"xml": "<outcome value='changeassign'>\n",
"comments": "",
"outputs": 1,
- "x": 705.3372268676758,
- "y": 490.0803124010563,
- "z": "3e6c75a5.b69bda",
+ "x": 745.3437271118164,
+ "y": 488.08031129837036,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "f258fd95.0fe79"
+ "8e6a8b07.9cfd08"
]
]
},
{
- "id": "f258fd95.0fe79",
+ "id": "8e6a8b07.9cfd08",
"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": 1074.4322967529297,
- "y": 489.7944485247135,
- "z": "3e6c75a5.b69bda",
+ "x": 1114.4387969970703,
+ "y": 487.7944474220276,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "b369a934.e11c08",
+ "id": "4bf064de.ff298c",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 700.0041465759277,
- "y": 691.4137353897095,
- "z": "3e6c75a5.b69bda",
+ "x": 731.0104064941406,
+ "y": 686.413655757904,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "ba7564f.359ed98"
+ "856b20f2.dd3e"
]
]
},
{
- "id": "2c4e26db.d2576a",
+ "id": "4a0f3f1f.e154f",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 940.3377494812012,
- "y": 743.0000324249268,
- "z": "3e6c75a5.b69bda",
+ "x": 969.3440093994141,
+ "y": 694.0000189244747,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "3d832a02.563396",
- "1104c91d.350e07",
- "f844d17c.4dd8f",
- "48cd140e.14f35c",
- "b370d981.a636e8",
- "6fc07521.c03a0c"
+ "61a8036d.49151c",
+ "9df20938.7cb218",
+ "e668ec20.ba224",
+ "e9946938.94da68",
+ "17aebe0e.08da62",
+ "6c28f181.61b7c"
]
]
},
{
- "id": "1104c91d.350e07",
+ "id": "9df20938.7cb218",
"type": "outcome",
"name": "CreateSiteInstance",
"xml": "<outcome value='CreateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1198.8141288757324,
- "y": 689.4793787002563,
- "z": "3e6c75a5.b69bda",
+ "x": 1226.8203773498535,
+ "y": 603.4793815612793,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "20db622e.dd2f7e"
+ "c35bc84f.6dd758"
]
]
},
{
- "id": "3d832a02.563396",
+ "id": "61a8036d.49151c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1140.7185325622559,
- "y": 826.8572956621647,
- "z": "3e6c75a5.b69bda",
+ "x": 1169.7247924804688,
+ "y": 777.8572821617126,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "66bc9e9c.1ac1f"
+ "35631ae7.723fc6"
]
]
},
{
- "id": "ba7564f.359ed98",
+ "id": "856b20f2.dd3e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 890.3373947143555,
- "y": 688.0001001358032,
- "z": "3e6c75a5.b69bda",
+ "x": 917.3439254760742,
+ "y": 614.0000205039978,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "2c4e26db.d2576a"
+ "4a0f3f1f.e154f",
+ "e795cb52.6c6f98"
]
]
},
{
- "id": "20db622e.dd2f7e",
+ "id": "c35bc84f.6dd758",
"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": 1655.3379516601562,
- "y": 687.0001611709595,
- "z": "3e6c75a5.b69bda",
+ "x": 1683.3442001342773,
+ "y": 601.0001640319824,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "66bc9e9c.1ac1f",
+ "id": "35631ae7.723fc6",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1294.0041847229004,
- "y": 826.9136921465397,
- "z": "3e6c75a5.b69bda",
+ "x": 1323.0104446411133,
+ "y": 777.9136786460876,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "f844d17c.4dd8f",
+ "id": "e668ec20.ba224",
"type": "outcome",
"name": "CreateSDWANPortInstance",
"xml": "<outcome value='CreateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1204.6709251403809,
- "y": 785.247186332941,
- "z": "3e6c75a5.b69bda",
+ "x": 1233.6771850585938,
+ "y": 736.247172832489,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "b6270252.07dee"
+ "93c38881.fc6c68"
]
]
},
{
- "id": "b6270252.07dee",
+ "id": "93c38881.fc6c68",
"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": 1677.194622039795,
- "y": 784.767938286066,
- "z": "3e6c75a5.b69bda",
+ "x": 1706.2008819580078,
+ "y": 735.767924785614,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "48cd140e.14f35c",
+ "id": "e9946938.94da68",
"type": "outcome",
"name": "CreateSDWANDeviceInstance",
"xml": "<outcome value='CreateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1214.0352592468262,
- "y": 742.4451303482056,
- "z": "3e6c75a5.b69bda",
+ "x": 1242.0415077209473,
+ "y": 656.4451332092285,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "3b11278c.bb8c38"
+ "f8aa9b06.01e4b8"
]
]
},
{
- "id": "3b11278c.bb8c38",
+ "id": "f8aa9b06.01e4b8",
"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": 1669.5590476989746,
- "y": 741.9659996032715,
- "z": "3e6c75a5.b69bda",
+ "x": 1697.5652961730957,
+ "y": 655.9660024642944,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "b370d981.a636e8",
+ "id": "17aebe0e.08da62",
"type": "outcome",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1233.0039367675781,
- "y": 594.4136924743652,
- "z": "3e6c75a5.b69bda",
+ "x": 1272.010425567627,
+ "y": 555.4137077331543,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "657379da.c01418"
+ "3571e5b5.b5fc8a"
]
]
},
{
- "id": "657379da.c01418",
+ "id": "3571e5b5.b5fc8a",
"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": 1641.5277099609375,
- "y": 591.9344596862793,
- "z": "3e6c75a5.b69bda",
+ "x": 1680.5341987609863,
+ "y": 552.9344749450684,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "8734e4a2.e72ad8",
+ "id": "a756f30b.6c1cb",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 691.0042190551758,
- "y": 978.746994972229,
- "z": "3e6c75a5.b69bda",
+ "x": 721.0104064941406,
+ "y": 881.7469687461853,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "f1db3d76.89225"
+ "3edd603.8e265a"
]
]
},
{
- "id": "cdd2825f.5d09c",
+ "id": "a5f22e70.04f1a",
"type": "outcome",
"name": "ActivateSiteInstance",
"xml": "<outcome value='ActivateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1182.1472473144531,
- "y": 978.6459150314331,
- "z": "3e6c75a5.b69bda",
+ "x": 1212.153434753418,
+ "y": 881.6458888053894,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "2a41522d.67a51e"
+ "ce7332d1.0ac03"
]
]
},
{
- "id": "f1db3d76.89225",
+ "id": "3edd603.8e265a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 871.6709899902344,
- "y": 974.1666717529297,
- "z": "3e6c75a5.b69bda",
+ "x": 901.6771774291992,
+ "y": 877.166645526886,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "7f5f8826.961548"
+ "91a235a8.4c9e08"
]
]
},
{
- "id": "2a41522d.67a51e",
+ "id": "ce7332d1.0ac03",
"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": 1555.6710510253906,
- "y": 977.1666975021362,
- "z": "3e6c75a5.b69bda",
+ "x": 1585.6772384643555,
+ "y": 880.1666712760925,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "e3a84270.80d99",
+ "id": "f2fcfc7e.d1ffa",
"type": "outcome",
"name": "ActivateSDWANDeviceInstance",
"xml": "<outcome value='ActivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1210.3377075195312,
- "y": 1027.6667370796204,
- "z": "3e6c75a5.b69bda",
+ "x": 1240.343894958496,
+ "y": 930.6667108535767,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "5a26eb28.451874"
+ "c9db1dea.dfbf5"
]
]
},
{
- "id": "5a26eb28.451874",
+ "id": "c9db1dea.dfbf5",
"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": 1645.8614044189453,
- "y": 1027.1875095367432,
- "z": "3e6c75a5.b69bda",
+ "x": 1675.8675918579102,
+ "y": 930.1874833106995,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "a4f9d63b.494d98",
+ "id": "f410619e.7b2af",
"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": 1650.3375396728516,
- "y": 1072.6666593551636,
- "z": "3e6c75a5.b69bda",
+ "x": 1674.3437194824219,
+ "y": 1015.6666650772095,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "c8acd26d.1e739",
+ "id": "b65d5517.761218",
"type": "outcome",
"name": "ActivateSDWANPortInstance",
"xml": "<outcome value='ActivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1214.8138427734375,
- "y": 1073.1458868980408,
- "z": "3e6c75a5.b69bda",
+ "x": 1238.8200225830078,
+ "y": 1016.1458926200867,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "a4f9d63b.494d98"
+ "f410619e.7b2af"
]
]
},
{
- "id": "7f5f8826.961548",
+ "id": "91a235a8.4c9e08",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 922.0042114257812,
- "y": 1024.746958732605,
- "z": "3e6c75a5.b69bda",
+ "x": 978.0104064941406,
+ "y": 943.7469687461853,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "cdd2825f.5d09c",
- "e3a84270.80d99",
- "c8acd26d.1e739",
- "58bf71df.40217",
- "e2c3c98a.638358",
- "7eb3a13c.fe01"
+ "a5f22e70.04f1a",
+ "f2fcfc7e.d1ffa",
+ "b65d5517.761218",
+ "631e788a.5ef948",
+ "b5cf8a8f.31ae38",
+ "25d6d260.b0230e"
]
]
},
{
- "id": "58bf71df.40217",
+ "id": "631e788a.5ef948",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1146.5757064819336,
- "y": 1121.958472251892,
- "z": "3e6c75a5.b69bda",
+ "x": 1170.581886291504,
+ "y": 1064.958477973938,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "9491c86f.faa978"
+ "c987f934.5e8db8"
]
]
},
{
- "id": "e2c3c98a.638358",
+ "id": "b5cf8a8f.31ae38",
"type": "outcome",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
"comments": "",
"outputs": 1,
- "x": 1225.0041465759277,
- "y": 888.7469822466373,
- "z": "3e6c75a5.b69bda",
+ "x": 1254.0104064941406,
+ "y": 839.7469687461853,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "3b1f1b03.8cdd84"
+ "e540db1.fcd5d28"
]
]
},
{
- "id": "3b1f1b03.8cdd84",
+ "id": "e540db1.fcd5d28",
"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": 1640.5279502868652,
- "y": 882.2677589952946,
- "z": "3e6c75a5.b69bda",
+ "x": 1669.5342102050781,
+ "y": 833.2677454948425,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "bcf05aca.9cd8e8",
+ "id": "201f4d37.e91032",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 685.0042686462402,
- "y": 1232.7470879554749,
- "z": "3e6c75a5.b69bda",
+ "x": 705.0103988647461,
+ "y": 1167.7470617294312,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "eace7410.b0c1f8"
+ "389867bf.2284f8"
]
]
},
{
- "id": "5e7397b3.dab7a8",
+ "id": "c7aad7d3.fb5618",
"type": "outcome",
"name": "DeactivateSiteInstance",
"xml": "<outcome value='DeactivateSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1178.1472778320312,
- "y": 1281.646014213562,
- "z": "3e6c75a5.b69bda",
+ "x": 1196.1534271240234,
+ "y": 1167.6459817886353,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "21bb9b2a.ea8a34"
+ "4675b373.48835c"
]
]
},
{
- "id": "eace7410.b0c1f8",
+ "id": "389867bf.2284f8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 857.6710453033447,
- "y": 1233.1667957305908,
- "z": "3e6c75a5.b69bda",
+ "x": 885.6771697998047,
+ "y": 1163.1667385101318,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "c3ccf383.cfe88"
+ "80dc1053.718dc"
]
]
},
{
- "id": "21bb9b2a.ea8a34",
+ "id": "4675b373.48835c",
"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": 1551.6710815429688,
- "y": 1280.1667966842651,
- "z": "3e6c75a5.b69bda",
+ "x": 1569.677230834961,
+ "y": 1166.1667642593384,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "5379b130.c4fdc",
+ "id": "f75c0513.6c8168",
"type": "outcome",
"name": "DeactivateSDWANDeviceInstance",
"xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1206.3377380371094,
- "y": 1330.6668362617493,
- "z": "3e6c75a5.b69bda",
+ "x": 1224.3438873291016,
+ "y": 1216.6668038368225,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "84ada7ed.5abb58"
+ "85958e69.f32bb"
]
]
},
{
- "id": "84ada7ed.5abb58",
+ "id": "85958e69.f32bb",
"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": 1641.8614349365234,
- "y": 1330.187608718872,
- "z": "3e6c75a5.b69bda",
+ "x": 1659.8675842285156,
+ "y": 1216.1875762939453,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "45330326.89c95c",
+ "id": "73d40202.c78c6c",
"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": 1646.3375701904297,
- "y": 1375.6667585372925,
- "z": "3e6c75a5.b69bda",
+ "x": 1657.3437957763672,
+ "y": 1294.666778087616,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "47362b0e.0aa804",
+ "id": "da717258.8698a",
"type": "outcome",
"name": "DeactivateSDWANPortInstance",
"xml": "<outcome value='DeactivateSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1210.8138732910156,
- "y": 1376.1459860801697,
- "z": "3e6c75a5.b69bda",
+ "x": 1221.8200988769531,
+ "y": 1295.1460056304932,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "45330326.89c95c"
+ "73d40202.c78c6c"
]
]
},
{
- "id": "c3ccf383.cfe88",
+ "id": "80dc1053.718dc",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 917.0043296813965,
- "y": 1301.7472405433655,
- "z": "3e6c75a5.b69bda",
+ "x": 962.0103988647461,
+ "y": 1229.7470617294312,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "5e7397b3.dab7a8",
- "5379b130.c4fdc",
- "47362b0e.0aa804",
- "63e6c1ce.d4cf5",
- "4a02ebd5.071034",
- "fb94038a.0100e"
+ "c7aad7d3.fb5618",
+ "f75c0513.6c8168",
+ "da717258.8698a",
+ "903da395.919c3",
+ "82d33324.e23e3",
+ "1b1f1da6.c2e872"
]
]
},
{
- "id": "63e6c1ce.d4cf5",
+ "id": "903da395.919c3",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1146.5756072998047,
- "y": 1425.9585485458374,
- "z": "3e6c75a5.b69bda",
+ "x": 1157.5818328857422,
+ "y": 1344.958568096161,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "58fb4bd3.507344"
+ "e8c4be82.d0b16"
]
]
},
{
- "id": "4a02ebd5.071034",
+ "id": "82d33324.e23e3",
"type": "outcome",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1214.0042190551758,
- "y": 1182.7470560073853,
- "z": "3e6c75a5.b69bda",
+ "x": 1238.010398864746,
+ "y": 1125.7470617294312,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "fbad4fa4.97356"
+ "2b4b6274.20abbe"
]
]
},
{
- "id": "fbad4fa4.97356",
+ "id": "2b4b6274.20abbe",
"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": 1629.5280227661133,
- "y": 1176.2678327560425,
- "z": "3e6c75a5.b69bda",
+ "x": 1653.5342025756836,
+ "y": 1119.2678384780884,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "58fb4bd3.507344",
+ "id": "e8c4be82.d0b16",
"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": 1485.0042877197266,
- "y": 1426.4137592315674,
- "z": "3e6c75a5.b69bda",
+ "x": 1496.010513305664,
+ "y": 1345.4137787818909,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "9491c86f.faa978",
+ "id": "c987f934.5e8db8",
"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": 1477.0042190551758,
- "y": 1119.4136819839478,
- "z": "3e6c75a5.b69bda",
+ "x": 1501.010398864746,
+ "y": 1062.4136877059937,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "45dbdd14.1c9594",
+ "id": "9ee92290.b08c",
"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": 1059.00386428833,
- "y": 343.41364446282387,
- "z": "3e6c75a5.b69bda",
+ "x": 1099.0103645324707,
+ "y": 341.41364336013794,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "7ddcd159.af7c5",
+ "id": "d58a6905.f3a7f8",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 687.003849029541,
- "y": 344.08032193779945,
- "z": "3e6c75a5.b69bda",
+ "x": 727.0103492736816,
+ "y": 342.0803208351135,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "45dbdd14.1c9594"
+ "9ee92290.b08c"
]
]
},
{
- "id": "c7064bfe.3bb108",
+ "id": "2b26c4c1.602edc",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 669.0042915344238,
- "y": 1569.0804500579834,
- "z": "3e6c75a5.b69bda",
+ "x": 668.0104446411133,
+ "y": 1513.0803904533386,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "86fe3063.f5314"
+ "b6813743.434d08"
]
]
},
{
- "id": "8129346a.9a7028",
+ "id": "325c1f9a.af3de",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 900.3378295898438,
- "y": 1599.666877746582,
- "z": "3e6c75a5.b69bda",
+ "x": 907.3439636230469,
+ "y": 1513.666757106781,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "abdb2c6d.26329",
- "1c9b503f.e869e",
- "ebc11a5b.92e8f8",
- "ed7bc3fc.a812b",
- "f8972855.1982c8",
- "5677852c.5c596c"
+ "f978524b.49dc8",
+ "ee8589f0.103678",
+ "ef71212e.bc228",
+ "c42f06a0.286dc8",
+ "c4490e9c.34e51",
+ "747ce36c.3de7fc"
]
]
},
{
- "id": "1c9b503f.e869e",
+ "id": "ee8589f0.103678",
"type": "outcome",
"name": "DeleteSiteInstance",
"xml": "<outcome value='DeleteSiteInstance'>",
"comments": "",
"outputs": 1,
- "x": 1149.8142318725586,
- "y": 1589.1461973190308,
- "z": "3e6c75a5.b69bda",
+ "x": 1176.820457458496,
+ "y": 1447.1461582183838,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "491e32c9.2d52ac"
+ "e685df53.12b53"
]
]
},
{
- "id": "abdb2c6d.26329",
+ "id": "f978524b.49dc8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1099.7186889648438,
- "y": 1736.524130821228,
- "z": "3e6c75a5.b69bda",
+ "x": 1106.7248306274414,
+ "y": 1604.5240168571472,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "8f601e81.71977"
+ "9ea10b9d.acf658"
]
]
},
{
- "id": "86fe3063.f5314",
+ "id": "b6813743.434d08",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 849.3378295898438,
- "y": 1532.6668758392334,
- "z": "3e6c75a5.b69bda",
+ "x": 854.3439636230469,
+ "y": 1440.6667551994324,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "8129346a.9a7028"
+ "325c1f9a.af3de"
]
]
},
{
- "id": "491e32c9.2d52ac",
+ "id": "e685df53.12b53",
"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": 1603.338005065918,
- "y": 1584.6669492721558,
- "z": "3e6c75a5.b69bda",
+ "x": 1596.344123840332,
+ "y": 1442.6670017242432,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "8f601e81.71977",
+ "id": "9ea10b9d.acf658",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1253.0043411254883,
- "y": 1736.580527305603,
- "z": "3e6c75a5.b69bda",
+ "x": 1260.010482788086,
+ "y": 1604.5804133415222,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "ebc11a5b.92e8f8",
+ "id": "ef71212e.bc228",
"type": "outcome",
"name": "DeleteSDWANPortInstance",
"xml": "<outcome value='DeleteSDWANPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1163.6710815429688,
- "y": 1694.9140214920044,
- "z": "3e6c75a5.b69bda",
+ "x": 1170.6772232055664,
+ "y": 1562.9139075279236,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "f8f01738.a952f8"
+ "64a82c2b.8bd464"
]
]
},
{
- "id": "f8f01738.a952f8",
+ "id": "64a82c2b.8bd464",
"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": 1636.1947784423828,
- "y": 1694.4347734451294,
- "z": "3e6c75a5.b69bda",
+ "x": 1643.2009201049805,
+ "y": 1562.4346594810486,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "ed7bc3fc.a812b",
+ "id": "c42f06a0.286dc8",
"type": "outcome",
"name": "DeleteSDWANDeviceInstance",
"xml": "<outcome value='DeleteSDWANDeviceInstance'>",
"comments": "",
"outputs": 1,
- "x": 1173.0354232788086,
- "y": 1641.1119375228882,
- "z": "3e6c75a5.b69bda",
+ "x": 1195.041618347168,
+ "y": 1486.111795425415,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "3f658e56.9d3b42"
+ "4d9adbda.eda754"
]
]
},
{
- "id": "3f658e56.9d3b42",
+ "id": "4d9adbda.eda754",
"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": 1637.5591888427734,
- "y": 1640.63277053833,
- "z": "3e6c75a5.b69bda",
+ "x": 1609.5654373168945,
+ "y": 1481.6326999664307,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "f8972855.1982c8",
+ "id": "c4490e9c.34e51",
"type": "outcome",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1186.004264831543,
- "y": 1487.0804476737976,
- "z": "3e6c75a5.b69bda",
+ "x": 1199.0104751586914,
+ "y": 1406.0804076194763,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "19b04dbd.6b60a2"
+ "8af6e006.bfec5"
]
]
},
{
- "id": "19b04dbd.6b60a2",
+ "id": "8af6e006.bfec5",
"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": 1595.5280227661133,
- "y": 1488.6011400222778,
- "z": "3e6c75a5.b69bda",
+ "x": 1592.534278869629,
+ "y": 1406.6011753082275,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "6fc07521.c03a0c",
+ "id": "e795cb52.6c6f98",
+ "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",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "6c28f181.61b7c",
"type": "outcome",
"name": "CreateSDWANLanPortInstance",
"xml": "<outcome value='CreateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1241.0312728881836,
- "y": 642.5312581062317,
- "z": "3e6c75a5.b69bda",
+ "x": 1235.75390625,
+ "y": 697.25390625,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "8f4dfe29.61b9d"
+ "1169c073.b7816"
]
]
},
{
- "id": "8f4dfe29.61b9d",
+ "id": "1169c073.b7816",
"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": 1651.5550537109375,
- "y": 641.0520095825195,
- "z": "3e6c75a5.b69bda",
+ "x": 1708.277603149414,
+ "y": 696.774658203125,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "7eb3a13c.fe01",
+ "id": "25d6d260.b0230e",
"type": "outcome",
"name": "ActivateSDWANLanPortInstance",
"xml": "<outcome value='ActivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1229.03125,
- "y": 932.03125,
- "z": "3e6c75a5.b69bda",
+ "x": 1247.75390625,
+ "y": 974.50390625,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "41d9f761.0dc728"
+ "ec26a8f0.36bb88"
]
]
},
{
- "id": "41d9f761.0dc728",
+ "id": "ec26a8f0.36bb88",
"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": 1639.555030822754,
- "y": 930.5520014762878,
- "z": "3e6c75a5.b69bda",
+ "x": 1665.2775573730469,
+ "y": 974.0246677398682,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "fb94038a.0100e",
+ "id": "1b1f1da6.c2e872",
"type": "outcome",
"name": "DeactivateSDWANLanPortInstance",
"xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1213.03125,
- "y": 1236.53125,
- "z": "3e6c75a5.b69bda",
+ "x": 1233.75390625,
+ "y": 1260.75390625,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "383a8f05.b6135"
+ "dabaac5b.2c0a7"
]
]
},
{
- "id": "383a8f05.b6135",
+ "id": "dabaac5b.2c0a7",
"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": 1623.555030822754,
- "y": 1235.0520014762878,
- "z": "3e6c75a5.b69bda",
+ "x": 1651.2775573730469,
+ "y": 1260.2746677398682,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
},
{
- "id": "5677852c.5c596c",
+ "id": "747ce36c.3de7fc",
"type": "outcome",
"name": "DeleteSDWANLanPortInstance",
- "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
+ "xml": "<outcome value='DleteSDWANLanPortInstance'>",
"comments": "",
"outputs": 1,
- "x": 1201.03125,
- "y": 1544.53125,
- "z": "3e6c75a5.b69bda",
+ "x": 1197.75390625,
+ "y": 1523.75390625,
+ "z": "85ee3913.3987f8",
"wires": [
[
- "7c7dc424.e574ac"
+ "19220770.af1c39"
]
]
},
{
- "id": "7c7dc424.e574ac",
+ "id": "19220770.af1c39",
"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": 1607.5550842285156,
- "y": 1546.0520501732826,
- "z": "3e6c75a5.b69bda",
- "wires": [
- []
- ]
- },
- {
- "id": "5dfbbd6.4b80544",
- "type": "outcome",
- "name": "update",
- "xml": "<outcome value='update'>\n",
- "comments": "",
- "outputs": 1,
- "x": 683.000057220459,
- "y": 1791.333441734314,
- "z": "3e6c75a5.b69bda",
- "wires": [
- [
- "321a7638.3b493a"
- ]
- ]
- },
- {
- "id": "321a7638.3b493a",
- "type": "block",
- "name": "block : atomic",
- "xml": "<block atomic=\"true\">",
- "atomic": "true",
- "outputs": 1,
- "x": 857.3335571289062,
- "y": 1790.9197030067444,
- "z": "3e6c75a5.b69bda",
- "wires": [
- [
- "31f55a0d.2f22a6"
- ]
- ]
- },
- {
- "id": "31f55a0d.2f22a6",
- "type": "switchNode",
- "name": "switch request-action",
- "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
- "comments": "",
- "outputs": 1,
- "x": 1056.3335647583008,
- "y": 1790.919867515564,
- "z": "3e6c75a5.b69bda",
- "wires": [
- [
- "b3fecb60.6fce78"
- ]
- ]
- },
- {
- "id": "b3fecb60.6fce78",
- "type": "outcome",
- "name": "SdwanBandwidthChange",
- "xml": "<outcome value='SdwanBandwidthChange'>",
- "comments": "",
- "outputs": 1,
- "x": 1300.0000381469727,
- "y": 1789.000054359436,
- "z": "3e6c75a5.b69bda",
- "wires": [
- [
- "ec71b2dd.08538"
- ]
- ]
- },
- {
- "id": "ec71b2dd.08538",
- "type": "call",
- "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
- "comments": "",
- "outputs": 1,
- "x": 1673.5238418579102,
- "y": 1789.520941734314,
- "z": "3e6c75a5.b69bda",
+ "x": 1615.2775573730469,
+ "y": 1523.2746677398682,
+ "z": "85ee3913.3987f8",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index eab88b48..fb12ca3e 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
@@ -16,19 +16,25 @@
</outcome>
<outcome value='create'>
<block atomic="true">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="request-action"/>
+ <parameter name="field3" value='`$vf-module-topology-operation-input.request-information.request-action`'/>
+ </record>
<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>
<outcome value='CreateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>
</outcome>
- <outcome value='CreateSDWANLanPortInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' ></call>
- </outcome>
<outcome value='CreateSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>
</outcome>
<outcome value='CreateSDWANDeviceInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' ></call>
</outcome>
+ <outcome value='CreateSDWANLanPortInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' ></call>
+ </outcome>
<outcome value='CreateSDWANPortInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' ></call>
</outcome>
@@ -44,15 +50,15 @@
<outcome value='ActivateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>
</outcome>
- <outcome value='ActivateSDWANLanPortInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' ></call>
- </outcome>
<outcome value='ActivateSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>
</outcome>
<outcome value='ActivateSDWANDeviceInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' ></call>
</outcome>
+ <outcome value='ActivateSDWANLanPortInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' ></call>
+ </outcome>
<outcome value='ActivateSDWANPortInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' ></call>
</outcome>
@@ -68,15 +74,15 @@
<outcome value='DeactivateSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>
</outcome>
- <outcome value='DeactivateSDWANLanPortInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' ></call>
- </outcome>
<outcome value='DeactivateSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>
</outcome>
<outcome value='DeactivateSDWANDeviceInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' ></call>
</outcome>
+ <outcome value='DeactivateSDWANLanPortInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' ></call>
+ </outcome>
<outcome value='DeactivateSDWANPortInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' ></call>
</outcome>
@@ -92,15 +98,15 @@
<outcome value='DeleteSDWANVpnInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>
</outcome>
- <outcome value='DeleteSDWANLanPortInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
- </outcome>
<outcome value='DeleteSiteInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>
</outcome>
<outcome value='DeleteSDWANDeviceInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' ></call>
</outcome>
+ <outcome value='DleteSDWANLanPortInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
+ </outcome>
<outcome value='DeleteSDWANPortInstance'>
<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' ></call>
</outcome>
@@ -110,15 +116,6 @@
</switch>
</block>
</outcome>
- <outcome value='update'>
- <block atomic="true">
- <switch test='`$vf-module-topology-operation-input.request-information.request-action`'>
- <outcome value='SdwanBandwidthChange'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' ></call>
- </outcome>
- </switch>
- </block>
- </outcome>
<outcome value='Other'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>