From fb18306b26c323d9f0fbe8e0b5f049e9ed85f75e Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Wed, 13 May 2020 05:07:55 +0000 Subject: Adding local-link-connectivity-list (llcl) information to match ttp and tp locally (to support NNI-based Service creation use-case). - This is needed for F release Issue-ID: SDNC-1184 Signed-off-by: Hesam Rahimi Change-Id: I24f1ef56884b874baed029182a984945080af769 Former-commit-id: 4ff90dd1689d772865399ab5a995119981b127e1 --- ...ENERIC-RESOURCE-API_sotn-create-otn-tunnel.json | 46 +- ...URCE-API_sotn-get-otn-tunnel-path-from-oof.json | 744 ++++++++++++++++++++- ...ESOURCE-API_sotn-vf-operation-uni-activate.json | 322 +++++++-- ...GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml | 44 +- ...OURCE-API_sotn-get-otn-tunnel-path-from-oof.xml | 381 ++++++----- ...RESOURCE-API_sotn-vf-operation-uni-activate.xml | 277 ++++---- 6 files changed, 1425 insertions(+), 389 deletions(-) (limited to 'platform-logic/generic-resource-api/src') diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json index 8b19b0e4..6d2bdbbf 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json @@ -105,7 +105,7 @@ "z": "3b47dc40.0a0c44", "wires": [ [ - "84d1cb1a.eb2fc8" + "921b5877.d781b" ] ] }, @@ -121,7 +121,7 @@ "z": "3b47dc40.0a0c44", "wires": [ [ - "2182e897.132d8" + "5ee72a4.dae15d4" ] ] }, @@ -129,7 +129,7 @@ "id": "2182e897.132d8", "type": "execute", "name": "execute RestconfApiCallNode Create OTN tunnel with token", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1223, @@ -146,7 +146,7 @@ "id": "84d1cb1a.eb2fc8", "type": "execute", "name": "execute RestconfApiCallNode Creat OTN tunnel without token", - "xml": "\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1235, @@ -681,7 +681,7 @@ "id": "77be498b.1e80d", "type": "set", "name": "set attachment_param", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "x": 1269, "y": 823, @@ -692,7 +692,7 @@ "id": "5ad550e4.a3ef2", "type": "set", "name": "set attachment_param", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "x": 1669, "y": 872, @@ -714,5 +714,39 @@ "84bd363f.cecab" ] ] + }, + { + "id": "921b5877.d781b", + "type": "execute", + "name": "execute RestApiCallNode Create OTN tunnel without token", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1231, + "y": 1112, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "ab8d3cb8.cfa08", + "1b911a1d.a19f46" + ] + ] + }, + { + "id": "5ee72a4.dae15d4", + "type": "execute", + "name": "execute RestApiCallNode Create OTN tunnel with token", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1223, + "y": 1285, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "ab8d3cb8.cfa08", + "1b911a1d.a19f46" + ] + ] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json index 58005857..c785b72d 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json @@ -203,8 +203,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1389.0001220703125, - "y": 756.2864990234375, + "x": 1150.0001220703125, + "y": 1085.2864990234375, "z": "5b68e0d.bd97b2", "wires": [ [ @@ -219,8 +219,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1383.0001220703125, - "y": 806.2864990234375, + "x": 1144.0001220703125, + "y": 1135.2864990234375, "z": "5b68e0d.bd97b2", "wires": [ [ @@ -234,8 +234,8 @@ "name": "return failure", "xml": "\n\t\n\t\n \n\t\n\t\n \n", "comments": "", "outputs": 1, @@ -353,7 +353,7 @@ "name": "break", "xml": "\n", "comments": "", - "x": 2198.5001220703125, + "x": 2232.5, "y": 999, "z": "5b68e0d.bd97b2", "wires": [] @@ -371,9 +371,9 @@ "wires": [ [ "dd179bba.27e578", - "3a661a62.460126", "a736e107.ab857", - "51dd454b.e64094" + "51dd454b.e64094", + "e9ba305b.3f7b08" ] ] }, @@ -383,8 +383,8 @@ "name": "setup variables", "info": "", "comments": "", - "x": 2330.5001220703125, - "y": 379, + "x": 2331.5, + "y": 182, "z": "5b68e0d.bd97b2", "wires": [] }, @@ -614,7 +614,7 @@ "z": "5b68e0d.bd97b2", "wires": [ [ - "ebf0e7da.b09cb" + "a982c4fa.2154f" ] ] }, @@ -622,10 +622,10 @@ "id": "ebf0e7da.b09cb", "type": "set", "name": "set domain A node ttp-id", - "xml": "\n\n", + "xml": "\n\n", "comments": "", - "x": 4671.5001220703125, - "y": 373, + "x": 6035.5, + "y": 431, "z": "5b68e0d.bd97b2", "wires": [] }, @@ -1165,21 +1165,10 @@ "z": "5b68e0d.bd97b2", "wires": [ [ - "5bd66639.66f16" + "fe418352.84c6" ] ] }, - { - "id": "5bd66639.66f16", - "type": "set", - "name": "set domain B node ttp-id", - "xml": "\n\n", - "comments": "", - "x": 4625.5001220703125, - "y": 739, - "z": "5b68e0d.bd97b2", - "wires": [] - }, { "id": "d4d32344.490fe8", "type": "set", @@ -1353,7 +1342,700 @@ "wires": [ [ "40299798.13bc", - "c0faec82.816fb8" + "ba0dda0.572ad28" + ] + ] + }, + { + "id": "e9ba305b.3f7b08", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2266, + "y": 307, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "5728cf0a.e04c88" + ] + ] + }, + { + "id": "5728cf0a.e04c88", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2465, + "y": 304, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a07b7ba1.16119" + ] + ] + }, + { + "id": "a07b7ba1.16119", + "type": "outcome", + "name": "p-interface", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2642.117431640625, + "y": 302.34027099609375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "5430daff.402bcc" + ] + ] + }, + { + "id": "b3de6391.5ab778", + "type": "set", + "name": "set src-ltpId and dst-ltpId", + "xml": "\n\n\n\n\n\n\n\n", + "comments": "", + "x": 2956, + "y": 246, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "cf93cd1e.3a945", + "type": "break", + "name": "break", + "xml": "\n", + "comments": "", + "x": 2917, + "y": 309, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "5430daff.402bcc", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 2782, + "y": 287, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "b3de6391.5ab778", + "cf93cd1e.3a945" + ] + ] + }, + { + "id": "f1b6891b.494ac", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1342, + "y": 890, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "71c25391.1fc4f4" + ] + ] + }, + { + "id": "71c25391.1fc4f4", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1541, + "y": 887, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "fb1d0e47.e5d04" + ] + ] + }, + { + "id": "fb1d0e47.e5d04", + "type": "outcome", + "name": "p-interface", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1718.117431640625, + "y": 885.3402709960938, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d166e350.8b25f" + ] + ] + }, + { + "id": "d166e350.8b25f", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1858, + "y": 870, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "76dcccfc.66809c", + "c46fae49.1a78a8" + ] + ] + }, + { + "id": "76dcccfc.66809c", + "type": "break", + "name": "break", + "xml": "\n", + "comments": "", + "x": 1993, + "y": 892, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "8ebbd23d.9dd4d", + "type": "switchNode", + "name": "test $vidx", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1793, + "y": 730, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "e155bd88.0bc8b", + "74a1badc.9d6fbc" + ] + ] + }, + { + "id": "e155bd88.0bc8b", + "type": "outcome", + "name": "outcome first", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1958, + "y": 708, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "f1b6891b.494ac" + ] + ] + }, + { + "id": "74a1badc.9d6fbc", + "type": "outcome", + "name": "outcome last", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1957, + "y": 769, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "bf04627d.7c822" + ] + ] + }, + { + "id": "c46fae49.1a78a8", + "type": "set", + "name": "set oofsolutions-first info", + "xml": "\n\n\n\n\n\n", + "comments": "", + "x": 2041, + "y": 847, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "bf04627d.7c822", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1320, + "y": 993, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "1e746899.4a1de7" + ] + ] + }, + { + "id": "1e746899.4a1de7", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1519, + "y": 990, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "1fda2797.1ef958" + ] + ] + }, + { + "id": "1fda2797.1ef958", + "type": "outcome", + "name": "p-interface", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1696.117431640625, + "y": 988.3402709960938, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "73e8ef8a.6dee8" + ] + ] + }, + { + "id": "73e8ef8a.6dee8", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1836, + "y": 973, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "9ff282e5.e46b2", + "d72292cf.36986" + ] + ] + }, + { + "id": "9ff282e5.e46b2", + "type": "break", + "name": "break", + "xml": "\n", + "comments": "", + "x": 1971, + "y": 995, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "d72292cf.36986", + "type": "set", + "name": "set oofsolutions last info", + "xml": "\n\n\n", + "comments": "", + "x": 2026, + "y": 949, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "ba0dda0.572ad28", + "type": "switchNode", + "name": "switch relationship_length", + "xml": "", + "comments": "", + "outputs": 1, + "x": 1440, + "y": 731, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d7ed588c.061ed8", + "b66c4a0f.48599" + ] + ] + }, + { + "id": "d7ed588c.061ed8", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1631, + "y": 698, + "z": "5b68e0d.bd97b2", + "wires": [ + [] + ] + }, + { + "id": "b66c4a0f.48599", + "type": "outcomeFalse", + "name": "false", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1632, + "y": 745, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "8ebbd23d.9dd4d" + ] + ] + }, + { + "id": "a982c4fa.2154f", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4642, + "y": 370, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "203d5e77.1749e2" + ] + ] + }, + { + "id": "7cb92f1c.0d62a8", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5223, + "y": 433, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "517c6485.d4072c" + ] + ] + }, + { + "id": "517c6485.d4072c", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5449, + "y": 433, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "66fdc763.76b7a8" + ] + ] + }, + { + "id": "66fdc763.76b7a8", + "type": "outcome", + "name": "p-interface", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5643.2861328125, + "y": 432.82177734375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d6464d3a.f940c8" + ] + ] + }, + { + "id": "d6464d3a.f940c8", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 5818.1171875, + "y": 432.34027099609375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ebf0e7da.b09cb" + ] + ] + }, + { + "id": "203d5e77.1749e2", + "type": "switchNode", + "name": "switch ttp relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4840, + "y": 372, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "6d19c367.9a927c", + "ad218f76.da61f", + "4692a096.2a98" + ] + ] + }, + { + "id": "6d19c367.9a927c", + "type": "other", + "name": "Null", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5023, + "y": 334, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "13f17017.84d56" + ] + ] + }, + { + "id": "4692a096.2a98", + "type": "outcome", + "name": "length 0", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5033, + "y": 382, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "13f17017.84d56" + ] + ] + }, + { + "id": "ad218f76.da61f", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5022, + "y": 436, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "7cb92f1c.0d62a8" + ] + ] + }, + { + "id": "13f17017.84d56", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 5178, + "y": 334, + "z": "5b68e0d.bd97b2", + "wires": [ + [] + ] + }, + { + "id": "fe418352.84c6", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4631, + "y": 744, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a04c015d.4f2be" + ] + ] + }, + { + "id": "491826fa.0106a8", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5212, + "y": 807, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "1943c22a.5a60a6" + ] + ] + }, + { + "id": "a04c015d.4f2be", + "type": "switchNode", + "name": "switch ttp relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4829, + "y": 746, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d6405c54.6f4518", + "6576831f.203ff4", + "863d1cc0.5d8dc8" + ] + ] + }, + { + "id": "d6405c54.6f4518", + "type": "other", + "name": "Null", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5012, + "y": 708, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "3eef1226.8c611e" + ] + ] + }, + { + "id": "863d1cc0.5d8dc8", + "type": "outcome", + "name": "length 0", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5022, + "y": 756, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "3eef1226.8c611e" + ] + ] + }, + { + "id": "6576831f.203ff4", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5011, + "y": 810, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "491826fa.0106a8" + ] + ] + }, + { + "id": "3eef1226.8c611e", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 5167, + "y": 708, + "z": "5b68e0d.bd97b2", + "wires": [ + [] + ] + }, + { + "id": "66a31e69.f659b8", + "type": "set", + "name": "set domain B node ttp-id", + "xml": "\n\n", + "comments": "", + "x": 6024.5, + "y": 805, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "1943c22a.5a60a6", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5438, + "y": 807, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d1d6f06f.051f98" + ] + ] + }, + { + "id": "d1d6f06f.051f98", + "type": "outcome", + "name": "p-interface", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 5632.2861328125, + "y": 806.82177734375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "c6c9b722.1343d8" + ] + ] + }, + { + "id": "c6c9b722.1343d8", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 5807.1171875, + "y": 806.3402709960938, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "66a31e69.f659b8" ] ] } diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json index 658a04cd..6005d810 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json @@ -526,9 +526,7 @@ "z": "9b26c8a0.a64c1", "wires": [ [ - "2cd069f4.1bd85e", - "e85654b4.901fd", - "596112fe.dbc0a4" + "8a87ece8.73f728" ] ] }, @@ -536,10 +534,10 @@ "id": "2cd069f4.1bd85e", "type": "set", "name": "set tmp.unis.uni[].tpId", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", - "x": 1843.117431640625, - "y": 598.3402709960938, + "x": 2557.117431640625, + "y": 641.3402709960938, "z": "9b26c8a0.a64c1", "wires": [] }, @@ -589,12 +587,12 @@ { "id": "e85654b4.901fd", "type": "execute", - "name": "execute split tpId to get pnf-name", - "xml": "\n\n\n\n", + "name": "execute split tp-id to get pnf-name", + "xml": "\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1882, - "y": 673, + "x": 2596, + "y": 716, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -610,8 +608,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2105, - "y": 628, + "x": 2819, + "y": 671, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -626,8 +624,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2107, - "y": 692, + "x": 2821, + "y": 735, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -641,8 +639,8 @@ "name": "set ipAddress prefixLength", "xml": "\n\n", "comments": "", - "x": 2327, - "y": 630, + "x": 3041, + "y": 673, "z": "9b26c8a0.a64c1", "wires": [] }, @@ -652,8 +650,8 @@ "name": "return failure", "xml": "\n\n\n", "comments": "", - "x": 2266, - "y": 711, + "x": 2980, + "y": 754, "z": "9b26c8a0.a64c1", "wires": [] }, @@ -664,8 +662,8 @@ "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1812, - "y": 810, + "x": 2526, + "y": 853, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -681,8 +679,8 @@ "atomic": "false", "comments": "", "outputs": 1, - "x": 2171.88232421875, - "y": 818.6556396484375, + "x": 2885.88232421875, + "y": 861.6556396484375, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -697,8 +695,8 @@ "name": "set node-id", "xml": "\n\n", "comments": "", - "x": 2351, - "y": 772, + "x": 3065, + "y": 815, "z": "9b26c8a0.a64c1", "wires": [] }, @@ -709,8 +707,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2363.882568359375, - "y": 858.6597290039062, + "x": 3077.882568359375, + "y": 901.6597290039062, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -725,8 +723,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2589.882568359375, - "y": 858.6597290039062, + "x": 3303.882568359375, + "y": 901.6597290039062, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -742,7 +740,7 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2788, + "x": 3513, "y": 971, "z": "9b26c8a0.a64c1", "wires": [ @@ -758,7 +756,7 @@ "xml": "", "atomic": "true", "outputs": 1, - "x": 3001, + "x": 3726, "y": 972, "z": "9b26c8a0.a64c1", "wires": [ @@ -774,7 +772,7 @@ "name": "set network-id", "xml": "\n\n", "comments": "", - "x": 3236, + "x": 3961, "y": 902, "z": "9b26c8a0.a64c1", "wires": [] @@ -786,7 +784,7 @@ "xml": "\n\n\n", "comments": "", "outputs": 1, - "x": 3244, + "x": 3969, "y": 983, "z": "9b26c8a0.a64c1", "wires": [ @@ -802,7 +800,7 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 3476.5, + "x": 4201.5, "y": 979, "z": "9b26c8a0.a64c1", "wires": [ @@ -817,7 +815,7 @@ "name": "set network-id, topo-id, client-id, etc", "xml": "\n\n\n\n\n\n\n\n", "comments": "", - "x": 3745, + "x": 4470, "y": 978, "z": "9b26c8a0.a64c1", "wires": [] @@ -843,7 +841,7 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 2815, + "x": 3540, "y": 836, "z": "9b26c8a0.a64c1", "wires": [ @@ -859,7 +857,7 @@ "xml": "", "atomic": "true", "outputs": 1, - "x": 3028, + "x": 3753, "y": 837, "z": "9b26c8a0.a64c1", "wires": [ @@ -874,7 +872,7 @@ "name": "set thirdparty-sdnc-id", "xml": "\n\n", "comments": "", - "x": 3255, + "x": 3980, "y": 836, "z": "9b26c8a0.a64c1", "wires": [] @@ -912,8 +910,8 @@ "name": "set oof.vpn", "xml": "\n", "comments": "", - "x": 1092.0272216796875, - "y": 1027.040771484375, + "x": 1096.0272216796875, + "y": 946.040771484375, "z": "9b26c8a0.a64c1", "wires": [] }, @@ -1067,7 +1065,7 @@ "id": "a9643f3f.4f04b", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "outputs": 1, "x": 1156.0272216796875, @@ -1136,10 +1134,10 @@ "wires": [ [ "124c6957.e07dc7", - "3ce3b19a.7c10c6", - "d661efba.3fa238", - "ee991e0.ab6b36", - "f7756434.d014e" + "f7756434.d014e", + "a9643f3f.4f04b", + "ae925256.a68df", + "ee991e0.ab6b36" ] ] }, @@ -1197,7 +1195,7 @@ "id": "678c3911.078e2", "type": "execute", "name": "execute RestconfApiCallNode Create ethernet Service with token", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1660.52734375, @@ -1304,7 +1302,7 @@ "id": "42cb8b06.e7daec", "type": "execute", "name": "execute RestconfApiCallNode Create ethernet Service without token", - "xml": "\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1670.52734375, @@ -1340,8 +1338,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1995, - "y": 817, + "x": 2709, + "y": 860, "z": "9b26c8a0.a64c1", "wires": [ [ @@ -1353,11 +1351,237 @@ "id": "672fc75a.1e91b", "type": "set", "name": "set tmp.unis.uni[].tpId", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "x": 655, "y": 1015, "z": "9b26c8a0.a64c1", "wires": [] + }, + { + "id": "ae925256.a68df", + "type": "get-resource", + "name": "get network-resource", + "xml": "\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1128, + "y": 1024, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "23c084ce.22a7f4", + "d2d56dd3.d8df6", + "28e7be58.d60b6a" + ] + ] + }, + { + "id": "23c084ce.22a7f4", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1323.5001220703125, + "y": 981, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "16ae77fe.3db2f" + ] + ] + }, + { + "id": "d2d56dd3.d8df6", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1315.5001220703125, + "y": 1036, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "8f6658aa.e556f8" + ] + ] + }, + { + "id": "28e7be58.d60b6a", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1320.5001220703125, + "y": 1093, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "5bc0d431.a1baf4" + ] + ] + }, + { + "id": "5bc0d431.a1baf4", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "outputs": 1, + "x": 1682.8826904296875, + "y": 978.6597290039062, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "a5fdb89.17d6dc8" + ] + ] + }, + { + "id": "a5fdb89.17d6dc8", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1908.8826904296875, + "y": 978.6597290039062, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "d4a46397.2bb99" + ] + ] + }, + { + "id": "d4a46397.2bb99", + "type": "outcome", + "name": "esr-thirdparty-sdnc", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2115.0001220703125, + "y": 977, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "d4ec153c.0cdc78" + ] + ] + }, + { + "id": "d4ec153c.0cdc78", + "type": "set", + "name": "set prop.sdncRestApi.thirdpartySdnc.id", + "xml": "\n\n", + "comments": "", + "x": 2133, + "y": 1056, + "z": "9b26c8a0.a64c1", + "wires": [] + }, + { + "id": "8a87ece8.73f728", + "type": "get-resource", + "name": "get-resource uni", + "xml": "\n\n", + "comments": "", + "outputs": 1, + "x": 1802, + "y": 689, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "af655688.304b78" + ] + ] + }, + { + "id": "af655688.304b78", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1974, + "y": 689, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "91d7b892.85ea" + ] + ] + }, + { + "id": "bc6860a4.74042", + "type": "set", + "name": "set tmp.unis.uni[]", + "xml": "\n\n\n\n", + "comments": "", + "x": 2299, + "y": 645, + "z": "9b26c8a0.a64c1", + "wires": [] + }, + { + "id": "91d7b892.85ea", + "type": "block", + "name": "block", + "xml": "", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 2115, + "y": 691, + "z": "9b26c8a0.a64c1", + "wires": [ + [ + "bc6860a4.74042", + "e85654b4.901fd", + "596112fe.dbc0a4" + ] + ] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml index c6505ad1..96f3843f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml @@ -48,6 +48,22 @@ + + + + + + + + + + + + + + + + @@ -73,6 +89,22 @@ + + + + + + + + + + + + + + + + @@ -81,13 +113,15 @@ - + + - + + @@ -106,13 +140,15 @@ - + + - + + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml index 7159b23a..3ea459a5 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml @@ -1,13 +1,11 @@ - - + + - - - - - + + + + + @@ -15,95 +13,106 @@ - - - - - - + + + + + + - - + + - + - + - + - + - - + + - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - - + + - - - + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - - - - + + + + + @@ -113,94 +122,99 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - + - + - - + + - - - + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - - - - + + + + + @@ -210,35 +224,35 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + @@ -246,34 +260,57 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml index 406f52c0..7a4eedf3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml @@ -79,75 +79,88 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + resource="uni" + key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value" + pfx='tmp.aai.uni' local-only='false' > - + + - - - - - - - - - - - - - - - --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - + + + + + @@ -174,17 +187,19 @@ - - - + + + + - - - + + + + @@ -192,6 +207,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -202,68 +287,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg