Generic resource API DG catch up

Generic resource API DG catch up with several new capabilities

Change-Id: I6ba4a1716693a2fb0ba5314f60038277a50249a3
Issue-ID: SDNC-403
Signed-off-by: Brandon, Bruce (bb2697) <bb2697@att.com>

Former-commit-id: dd97cf829ce1c0b3bbb0e98e93a2e6619d945beb

1 files changed, 135 insertions, 135 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_generate-l3network-network-id.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_generate-l3network-network-id.json
index 747692e0..2aecf297 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_generate-l3network-network-id.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_generate-l3network-network-id.json
@@ -1,244 +1,244 @@
 [
     {
-        "id": "32a337db.ae5aa8",
+        "id": "e7bd9a65.20fdd8",
         "type": "execute",
         "name": "execute: generateUUID",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
         "comments": "",
         "outputs": 1,
-        "x": 475.8888854980469,
-        "y": 396.50000381469727,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 545,
+        "y": 418.5,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "aee3b0da.c79fb"
+                "bebe20e6.50ef2"
             ]
         ]
     },
     {
-        "id": "aee3b0da.c79fb",
+        "id": "bebe20e6.50ef2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 671.6388931274414,
-        "y": 396.50000381469727,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 744.7500076293945,
+        "y": 416.50000381469727,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "2e6b8196.18f09e"
+                "9eddb187.db4bb"
             ]
         ]
     },
     {
-        "id": "2e6b8196.18f09e",
+        "id": "9eddb187.db4bb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<!-- Used to work around execute node bug -->\n\t<parameter name=\"execute_failure\" value=\"false\" />\n\n\t<!-- return parameters -->\n\t<parameter name=\"error-message.generate-l3network-network-id\" value=\"An error occured while generating a UUID for L3-NETWORK.\" />",
         "comments": "",
-        "x": 836.6388931274414,
-        "y": 396.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 909.7500076293945,
+        "y": 416.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "19e3e967.c281b7",
+        "id": "31a24297.e15d1e",
         "type": "get-resource",
         "name": "Query AnAI -  l3-network",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n              resource=\"l3-network\"\n              key=\"l3-network.network-id = $tmp.return.generate-l3network-network-id.uuid\"\n              local-only=\"false\"\n              pfx=\"tmp.local-variables.generate-l3network-network-id.L3NETWORK\" >",
         "comments": "",
         "outputs": 1,
-        "x": 601.1388931274414,
-        "y": 487.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 674.2500076293945,
+        "y": 507.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "2807c6fa.8fbd4a",
-                "94e9ced3.238",
-                "4ecb327.82397cc",
-                "a2e8b62.4d66748"
+                "fbe58eaa.4092f",
+                "bf4ce186.fe5b4",
+                "45826101.ef494",
+                "25b3888f.ec6cf8"
             ]
         ]
     },
     {
-        "id": "c1a23e2e.3f106",
+        "id": "7ec5dc21.02fc54",
         "type": "for",
         "name": "for n: true",
         "xml": "<for atomic=\"true\" index=\"n\" start=\"0\" end=\"1\" >",
         "comments": "",
         "outputs": 1,
-        "x": 425.1388931274414,
-        "y": 487.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 498.25000762939453,
+        "y": 507.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "19e3e967.c281b7"
+                "31a24297.e15d1e"
             ]
         ]
     },
     {
-        "id": "2807c6fa.8fbd4a",
+        "id": "fbe58eaa.4092f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 805.6388931274414,
-        "y": 487.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 878.7500076293945,
+        "y": 507.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "6fcc46f3.9af1a8"
+                "cf545076.3189e"
             ]
         ]
     },
     {
-        "id": "94e9ced3.238",
+        "id": "bf4ce186.fe5b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 801.6388931274414,
-        "y": 567.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 874.7500076293945,
+        "y": 587.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "537fe43b.f1146c"
+                "d07d9c69.54e1d"
             ]
         ]
     },
     {
-        "id": "4ecb327.82397cc",
+        "id": "45826101.ef494",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 810.6388931274414,
-        "y": 527.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 883.7500076293945,
+        "y": 547.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "4292e2a6.5346ac"
+                "f2604c68.2cc79"
             ]
         ]
     },
     {
-        "id": "537fe43b.f1146c",
+        "id": "d07d9c69.54e1d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<!-- return parameters -->\n\t<parameter name=\"error-message.generate-l3network-network-id\" value=\"`'An error occured while checking if a generated l3network-network-id was unique. network-id = ' + $tmp.local-variables.generate-l3network-network-id.uuid`\" />",
         "comments": "",
-        "x": 968.1389007568359,
-        "y": 592.7500066757202,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1041.250015258789,
+        "y": 612.7500066757202,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "6fcc46f3.9af1a8",
+        "id": "cf545076.3189e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 963.6388931274414,
-        "y": 487.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1036.7500076293945,
+        "y": 507.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "17797a19.8abea6",
-                "4e358d48.be92b4"
+                "28421263.2994fe",
+                "c44a7adf.25dce8"
             ]
         ]
     },
     {
-        "id": "17797a19.8abea6",
+        "id": "28421263.2994fe",
         "type": "set",
         "name": "set: ...local...is-unique = 0",
         "xml": "<set>\n\t<parameter name=\"tmp.local-variables.generate-l3network-network-id.is-unique\" value=\"0\" />",
         "comments": "",
-        "x": 1181.1389465332031,
-        "y": 487.7500066757202,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1254.2500610351562,
+        "y": 507.7500066757202,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "4e358d48.be92b4",
+        "id": "c44a7adf.25dce8",
         "type": "execute",
         "name": "execute: generateUUID",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n\t<parameter name=\"ctx-destination\" value=\"tmp.return.generate-l3network-network-id.uuid\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1174.6388931274414,
-        "y": 527.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1247.7500076293945,
+        "y": 547.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "4cf76132.02956"
+                "9de63c0c.60c61"
             ]
         ]
     },
     {
-        "id": "4cf76132.02956",
+        "id": "9de63c0c.60c61",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1361.6388931274414,
-        "y": 527.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1434.7500076293945,
+        "y": 547.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "dea8bdbf.c6534"
+                "ee927e4f.a8611"
             ]
         ]
     },
     {
-        "id": "dea8bdbf.c6534",
+        "id": "ee927e4f.a8611",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<!-- return parameters -->\n\t<parameter name=\"error-message.generate-l3network-network-id\" value=\"An error occured while generating a UUID for L3-NETWORK.\" />",
         "comments": "",
-        "x": 1515.6388931274414,
-        "y": 527.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1588.7500076293945,
+        "y": 547.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "4292e2a6.5346ac",
+        "id": "f2604c68.2cc79",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 941.6388931274414,
-        "y": 527.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 1014.7500076293945,
+        "y": 547.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfc540f2.ccff2",
+        "id": "d5946e5a.154dc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 182.13888931274414,
-        "y": 84,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 255.25000381469727,
+        "y": 104,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "b386b9cc.e3d508"
+                "4ec5f49c.6b21fc"
             ]
         ]
     },
     {
-        "id": "b386b9cc.e3d508",
+        "id": "4ec5f49c.6b21fc",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -246,153 +246,153 @@
         "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": 206.13888549804688,
-        "y": 130.25,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 279.25,
+        "y": 150.25,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "a7f05089.bec56"
+                "f579c708.74a9d8"
             ]
         ]
     },
     {
-        "id": "a7f05089.bec56",
+        "id": "f579c708.74a9d8",
         "type": "method",
         "name": "method generate-l3network-network-id",
         "xml": "<method rpc=\"generate-l3network-network-id\" mode=\"sync\">",
         "comments": "",
         "outputs": 1,
-        "x": 291.8888854980469,
-        "y": 182.75,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 365,
+        "y": 202.75,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "34f40852.137a58"
+                "71096650.ece918"
             ]
         ]
     },
     {
-        "id": "f5b14600.c43d28",
+        "id": "3149511f.d3441e",
         "type": "comment",
         "name": "GENERIC-RESOURCE-API: GENERATE-L3NETWORK-NETWORK-ID",
         "info": "",
         "comments": "",
-        "x": 733.6389007568359,
-        "y": 90.24999809265137,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 806.7500152587891,
+        "y": 110.24999809265137,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "34f40852.137a58",
+        "id": "71096650.ece918",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 243.6388931274414,
-        "y": 307.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 316.75000762939453,
+        "y": 327.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "32a337db.ae5aa8",
-                "c1a23e2e.3f106",
-                "6d1bc386.49356c",
-                "2d49b311.80b8cc"
+                "e7bd9a65.20fdd8",
+                "7ec5dc21.02fc54",
+                "29c55a03.c43e16",
+                "d535cedb.29a8b"
             ]
         ]
     },
     {
-        "id": "de1da0bf.8163b",
+        "id": "3ab649c5.b819f6",
         "type": "comment",
         "name": "LOOP UNTIL GENERATED NETWORK-ID ISN'T FOUND IN A&AI",
         "info": "",
         "comments": "",
-        "x": 644.8888854980469,
-        "y": 444.0000047683716,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 718,
+        "y": 464.0000047683716,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "6ed54c0.6154fb4",
+        "id": "59df6115.cb391",
         "type": "comment",
         "name": "GENERATE A NETWORK-ID",
         "info": "",
         "comments": "",
-        "x": 508.6388854980469,
-        "y": 354.00000286102295,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 581.75,
+        "y": 374.00000286102295,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "6d1bc386.49356c",
+        "id": "29c55a03.c43e16",
         "type": "set",
         "name": "unset: local-variables & return",
         "xml": "<set>\n\t<parameter name=\"tmp.local-variables.generate-l3network-network-id.\" value=\"\" />\n\t<parameter name=\"tmp.return.generate-l3network-network-id.\" value=\"\" />",
         "comments": "",
-        "x": 494.6388931274414,
-        "y": 307.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 567.7500076293945,
+        "y": 327.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "b0ae69a3.56e508",
+        "id": "a5a22a52.0df378",
         "type": "comment",
         "name": "CLEANUP LOCAL VARIABLES TO BE USED",
         "info": "",
         "comments": "",
-        "x": 578.8888854980469,
-        "y": 264.00000190734863,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 652,
+        "y": 284.00000190734863,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "5a56764d.91fa68",
+        "id": "9f21f02f.9e3ca",
         "type": "comment",
         "name": "GLOBAL VARIABLES USED",
         "info": "// RETURN VALUES\nerror-message.generate-l3network-network-id\ntmp.return.generate-l3network-network-id.uuid\n\n// LOCAL VARIABLES (erased at beginning & end of DG)\ntmp.local-variables.generate-l3network-network-id.*\ntmp.return.generate-l3network-network-id.*\n",
         "comments": "",
-        "x": 720.138916015625,
-        "y": 130.24999809265137,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 793.2500305175781,
+        "y": 150.24999809265137,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "2d49b311.80b8cc",
+        "id": "d535cedb.29a8b",
         "type": "set",
         "name": "unset: local-variables & return",
         "xml": "<set>\n\t<parameter name=\"tmp.local-variables.generate-l3network-network-id.\" value=\"\" />",
         "comments": "",
-        "x": 494.6388931274414,
-        "y": 587.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 567.7500076293945,
+        "y": 607.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "979528d.92883d8",
+        "id": "b578cb06.12eea8",
         "type": "comment",
         "name": "CLEANUP LOCAL VARIABLES",
         "info": "",
         "comments": "",
-        "x": 536.1388854980469,
-        "y": 545.2500057220459,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 609.25,
+        "y": 565.2500057220459,
+        "z": "86afe909.dcb228",
         "wires": []
     },
     {
-        "id": "a2e8b62.4d66748",
+        "id": "25b3888f.ec6cf8",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value=\"Other\">",
         "comments": "",
         "outputs": 1,
-        "x": 801.6388931274414,
-        "y": 607.7500009536743,
-        "z": "ed9b1fd8.6f0a7",
+        "x": 874.7500076293945,
+        "y": 627.7500009536743,
+        "z": "86afe909.dcb228",
         "wires": [
             [
-                "537fe43b.f1146c"
+                "d07d9c69.54e1d"
             ]
         ]
     }
-]
+]
\ No newline at end of file