X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json;h=1e578f8d77b11f4edbece8d566d82164095cf384;hb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;hp=713d6aba198f60c44d846ce2629cf9a302f0c761;hpb=b7cd528f9b720b4f820ac5eb38f01df2b16c9817;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
index 713d6aba..1e578f8d 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "4ee6b24.013d9cc",
+        "id": "aeb91e9b.d42c7",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 163,
-        "y": 91,
-        "z": "1453a3a4.2dddfc",
+        "x": 189.88333129882812,
+        "y": 84.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "42ee2cb2.8b0aa4"
+                "84614040.2c4ec8"
             ]
         ]
     },
     {
-        "id": "42ee2cb2.8b0aa4",
+        "id": "84614040.2c4ec8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,339 +22,620 @@
         "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": 447.2856903076172,
-        "y": 152.23810863494873,
-        "z": "1453a3a4.2dddfc",
+        "x": 474.1690216064453,
+        "y": 146.12143993377686,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "2d8be51e.1fe5b2"
+                "8109fba8.cb20c"
             ]
         ]
     },
     {
-        "id": "2d8be51e.1fe5b2",
+        "id": "8109fba8.cb20c",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 402.4285888671875,
-        "y": 244.00003051757812,
-        "z": "1453a3a4.2dddfc",
+        "x": 429.3119201660156,
+        "y": 237.88336181640625,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "44543bcb.341e5c"
+                "dc0a4608.eb89a8"
             ]
         ]
     },
     {
-        "id": "44543bcb.341e5c",
+        "id": "dc0a4608.eb89a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 763.238037109375,
-        "y": 228.66668701171875,
-        "z": "1453a3a4.2dddfc",
+        "x": 790.1213684082031,
+        "y": 222.55001831054688,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "93197478.d2fae",
-                "eb6c2023.7ef7a",
-                "d72f415d.01bc08"
+                "509ec296.1bbe8c",
+                "5920f715.1dd26",
+                "838a9489.ed1eb",
+                "9abf8c8.8d1f07"
             ]
         ]
     },
     {
-        "id": "93197478.d2fae",
+        "id": "509ec296.1bbe8c",
         "type": "save",
         "name": "get all-connectivities from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-all-connectivities\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 248,
-        "y": 414,
-        "z": "1453a3a4.2dddfc",
+        "x": 274.8833312988281,
+        "y": 407.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "3210bd43.c197f2",
-                "cb92b047.8ddef8",
-                "39efd1fc.091d56"
+                "718aef78.41717",
+                "f4bff51a.32c2a",
+                "be13a17a.8d69d8"
             ]
         ]
     },
     {
-        "id": "3210bd43.c197f2",
+        "id": "718aef78.41717",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 492,
-        "y": 374,
-        "z": "1453a3a4.2dddfc",
+        "x": 518.8833312988281,
+        "y": 367.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "b85791e3.02f868"
+                "41301f82.8c086"
             ]
         ]
     },
     {
-        "id": "cb92b047.8ddef8",
+        "id": "f4bff51a.32c2a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 489.490966796875,
-        "y": 423.57403564453125,
-        "z": "1453a3a4.2dddfc",
+        "x": 516.3742980957031,
+        "y": 417.4573669433594,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "7f9747fb.6ed01"
+                "46c2d85d.47d55"
             ]
         ]
     },
     {
-        "id": "39efd1fc.091d56",
+        "id": "be13a17a.8d69d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 487,
-        "y": 466,
-        "z": "1453a3a4.2dddfc",
+        "x": 513.8833312988281,
+        "y": 459.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "d53ce1e7.42a2c"
+                "c5665fd8.f3a29"
             ]
         ]
     },
     {
-        "id": "b85791e3.02f868",
+        "id": "41301f82.8c086",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 640,
-        "y": 375,
-        "z": "1453a3a4.2dddfc",
+        "x": 666.8833312988281,
+        "y": 368.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "538f3beb.2d964c"
+                "de5d49ec.648cb"
             ]
         ]
     },
     {
-        "id": "7f9747fb.6ed01",
+        "id": "46c2d85d.47d55",
         "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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 639.0623779296875,
-        "y": 423.8597717285156,
-        "z": "1453a3a4.2dddfc",
+        "x": 665.9457092285156,
+        "y": 417.74310302734375,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "d53ce1e7.42a2c",
+        "id": "c5665fd8.f3a29",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 638,
-        "y": 463,
-        "z": "1453a3a4.2dddfc",
+        "x": 664.8833312988281,
+        "y": 456.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "538f3beb.2d964c",
+        "id": "de5d49ec.648cb",
         "type": "for",
         "name": "for helpconnidx in all-connectivities",
         "xml": "<for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 887,
-        "y": 370,
-        "z": "1453a3a4.2dddfc",
+        "x": 913.8833312988281,
+        "y": 363.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "344678ba.b7f29"
+                "64800a1.2a06474"
             ]
         ]
     },
     {
-        "id": "344678ba.b7f29",
+        "id": "64800a1.2a06474",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1134,
-        "y": 376,
-        "z": "1453a3a4.2dddfc",
+        "x": 784.88330078125,
+        "y": 540.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "d48cc8ae.307b68"
+                "f3fa10d8.6f9d4",
+                "aad0e41e.4e03c"
             ]
         ]
     },
     {
-        "id": "d48cc8ae.307b68",
+        "id": "31c74b2e.3b274c",
         "type": "switchNode",
         "name": "switch current provider-id?",
         "xml": "\n<switch test=\"`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 328,
-        "y": 625,
-        "z": "1453a3a4.2dddfc",
+        "x": 345.88330078125,
+        "y": 984.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "bc092a3b.859928"
+                "7e112bdd.b19944"
             ]
         ]
     },
     {
-        "id": "bc092a3b.859928",
+        "id": "7e112bdd.b19944",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 537,
-        "y": 619,
-        "z": "1453a3a4.2dddfc",
+        "x": 554.88330078125,
+        "y": 978.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "121a7afe.07beb5"
+                "c05a9bda.8a79"
             ]
         ]
     },
     {
-        "id": "121a7afe.07beb5",
+        "id": "c05a9bda.8a79",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 694,
-        "y": 619,
-        "z": "1453a3a4.2dddfc",
+        "x": 711.88330078125,
+        "y": 978.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "7603071b.598a38"
+                "55ad0392.5f6db4"
             ]
         ]
     },
     {
-        "id": "7603071b.598a38",
+        "id": "55ad0392.5f6db4",
         "type": "switchNode",
         "name": "switch current-cvlan-id?",
         "xml": "\n<switch test=\"`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 320,
-        "y": 713,
-        "z": "1453a3a4.2dddfc",
+        "x": 337.88330078125,
+        "y": 1072.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "e6157f7f.780a28"
+                "788f496d.e066e8"
             ]
         ]
     },
     {
-        "id": "e6157f7f.780a28",
+        "id": "788f496d.e066e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 529,
-        "y": 707,
-        "z": "1453a3a4.2dddfc",
+        "x": 546.88330078125,
+        "y": 1066.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "4bd1a2a7.9f2d14"
+                "6fac95a4.8d5e0c"
             ]
         ]
     },
     {
-        "id": "eb6c2023.7ef7a",
+        "id": "5920f715.1dd26",
         "type": "set",
         "name": "unset found-connectivity",
         "xml": "<set>\n<parameter name='found-connectivity' value=\"false\" />\n",
         "comments": "",
-        "x": 1006,
-        "y": 143,
-        "z": "1453a3a4.2dddfc",
+        "x": 1032.8833312988281,
+        "y": 136.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "c418ca90.026d18",
+        "id": "276095dd.4c3c5a",
         "type": "set",
         "name": "set found-connectivity=true",
         "xml": "<set>\n<parameter name='found-connectivity' value=\"true\" />\n",
         "comments": "",
-        "x": 935,
-        "y": 707,
-        "z": "1453a3a4.2dddfc",
+        "x": 952.88330078125,
+        "y": 1066.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "4bd1a2a7.9f2d14",
+        "id": "6fac95a4.8d5e0c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 697,
-        "y": 708,
-        "z": "1453a3a4.2dddfc",
+        "x": 714.88330078125,
+        "y": 1067.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "c418ca90.026d18",
-                "cce4f57f.9fec88",
-                "cc11b7b4.773dc8"
+                "276095dd.4c3c5a",
+                "35f5de07.464e0a",
+                "40d9d0fe.d02c3"
             ]
         ]
     },
     {
-        "id": "cce4f57f.9fec88",
+        "id": "35f5de07.464e0a",
         "type": "set",
         "name": "set the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`\" />\n",
         "comments": "",
-        "x": 916,
-        "y": 763,
-        "z": "1453a3a4.2dddfc",
+        "x": 933.88330078125,
+        "y": 1122.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "d72f415d.01bc08",
+        "id": "838a9489.ed1eb",
         "type": "set",
         "name": "unset tmp.the-connectivity.",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"\" />\n",
         "comments": "",
-        "x": 1010,
-        "y": 187,
-        "z": "1453a3a4.2dddfc",
+        "x": 1036.8833312988281,
+        "y": 180.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "cc11b7b4.773dc8",
+        "id": "40d9d0fe.d02c3",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 877,
-        "y": 814,
-        "z": "1453a3a4.2dddfc",
+        "x": 894.88330078125,
+        "y": 1173.88330078125,
+        "z": "b7dcb328.93d858",
+        "wires": []
+    },
+    {
+        "id": "9abf8c8.8d1f07",
+        "type": "set",
+        "name": "unset tmp.aai.helper-all-connectivities",
+        "xml": "<set>\n<parameter name='tmp.aai.helper-all-connectivities.' value=\"\" />\n",
+        "comments": "",
+        "x": 1063,
+        "y": 233,
+        "z": "b7dcb328.93d858",
+        "wires": []
+    },
+    {
+        "id": "9cad442b.773338",
+        "type": "switchNode",
+        "name": "switch access-provider-id != ''",
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1043,
+        "y": 633,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "4d1586da.4c4ea8",
+                "8c666101.3ce288"
+            ]
+        ]
+    },
+    {
+        "id": "f3fa10d8.6f9d4",
+        "type": "record",
+        "name": "record access-provider-id",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1022,
+        "y": 481,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aad0e41e.4e03c",
+        "type": "switchNode",
+        "name": "access-provider-id empty?",
+        "xml": "<switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1031,
+        "y": 543,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "ea8bd792.630a88",
+                "3693d975.d419ee"
+            ]
+        ]
+    },
+    {
+        "id": "ea8bd792.630a88",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1242,
+        "y": 521,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "266f1b69.40bd84"
+            ]
+        ]
+    },
+    {
+        "id": "3693d975.d419ee",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1250,
+        "y": 577,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "be2ed43a.87e25"
+            ]
+        ]
+    },
+    {
+        "id": "266f1b69.40bd84",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379,
+        "y": 522,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "be2ed43a.87e25",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1382,
+        "y": 578,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "9cad442b.773338"
+            ]
+        ]
+    },
+    {
+        "id": "4d1586da.4c4ea8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1250,
+        "y": 683,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "ebe04a71.67d7"
+            ]
+        ]
+    },
+    {
+        "id": "8c666101.3ce288",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252,
+        "y": 635,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "dea822fb.78f968"
+            ]
+        ]
+    },
+    {
+        "id": "ebe04a71.67d7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1388,
+        "y": 687,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "bc41ce93.ef44f8"
+            ]
+        ]
+    },
+    {
+        "id": "dea822fb.78f968",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1383,
+        "y": 635,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bc41ce93.ef44f8",
+        "type": "switchNode",
+        "name": "switch type is not mdsc",
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1023,
+        "y": 732,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "66c221d8.65d09",
+                "1093c517.0894a3"
+            ]
+        ]
+    },
+    {
+        "id": "66c221d8.65d09",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1239,
+        "y": 733,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "a35a8a78.60736"
+            ]
+        ]
+    },
+    {
+        "id": "1093c517.0894a3",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1237,
+        "y": 781,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "4932f7b5.545a3"
+            ]
+        ]
+    },
+    {
+        "id": "a35a8a78.60736",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1370,
+        "y": 733,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4932f7b5.545a3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1375,
+        "y": 785,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "31c74b2e.3b274c"
+            ]
+        ]
+    },
+    {
+        "id": "e835ab85.de0738",
+        "type": "comment",
+        "name": "access-provider-id in mdsc connectivity should be empty",
+        "info": "middle-man connectivity should not have its access-provider-id set. It should be empty.",
+        "comments": "",
+        "x": 1095,
+        "y": 443,
+        "z": "b7dcb328.93d858",
         "wires": []
     }
 ]
\ No newline at end of file