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, 1 insertions, 271 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 bc4869c3..1a370640 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,271 +1 @@
-[
-    {
-        "id": "95a3ee2.905f31",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 98.33332824707031,
-        "y": 85,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "cb0de0b2.53b5e"
-            ]
-        ]
-    },
-    {
-        "id": "cb0de0b2.53b5e",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 173.61903381347656,
-        "y": 125.23811149597168,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "88f9b16e.fd717"
-            ]
-        ]
-    },
-    {
-        "id": "88f9b16e.fd717",
-        "type": "method",
-        "name": "method vf-module-topology-operation",
-        "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 187.76195526123047,
-        "y": 164.9999942779541,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "cc0d87ea.42e588"
-            ]
-        ]
-    },
-    {
-        "id": "504658a3.49bd28",
-        "type": "comment",
-        "name": "vf-module-topology-operation",
-        "info": "",
-        "comments": "",
-        "x": 492.67818450927734,
-        "y": 32.58634376525879,
-        "z": "6872ec11.8012f4",
-        "wires": []
-    },
-    {
-        "id": "cc0d87ea.42e588",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 161.16670989990234,
-        "y": 349.36017322540283,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "fa856f03.28331",
-                "7676bb7a.aad3e4",
-                "ed140240.696ee"
-            ]
-        ]
-    },
-    {
-        "id": "fa856f03.28331",
-        "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": 453.3333320617676,
-        "y": 531.1909055709839,
-        "z": "6872ec11.8012f4",
-        "wires": []
-    },
-    {
-        "id": "7676bb7a.aad3e4",
-        "type": "switchNode",
-        "name": "switch svc-action",
-        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 460.9047088623047,
-        "y": 367.5714159011841,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "865715e6.66c8a8",
-                "60defca7.7eed64",
-                "e80f4202.f64da",
-                "933b1870.467508",
-                "2ee18070.6515e"
-            ]
-        ]
-    },
-    {
-        "id": "865715e6.66c8a8",
-        "type": "outcome",
-        "name": "assign",
-        "xml": "<outcome value='assign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 673.7142486572266,
-        "y": 292.85723400115967,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "176e8d1f.b28273"
-            ]
-        ]
-    },
-    {
-        "id": "60defca7.7eed64",
-        "type": "outcome",
-        "name": "unassign",
-        "xml": "<outcome value='unassign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 682.0952339172363,
-        "y": 439.0479259490967,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "b794ebfe.90b468"
-            ]
-        ]
-    },
-    {
-        "id": "933b1870.467508",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 673.8094635009766,
-        "y": 488.57139110565186,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "65cfc979.37f8c8"
-            ]
-        ]
-    },
-    {
-        "id": "65cfc979.37f8c8",
-        "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": 857.9999084472656,
-        "y": 488.57145595550537,
-        "z": "6872ec11.8012f4",
-        "wires": []
-    },
-    {
-        "id": "ed140240.696ee",
-        "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": 583.4166107177734,
-        "y": 242.3810567855835,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "176e8d1f.b28273",
-        "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": 1035.8571014404297,
-        "y": 292.4286947250366,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d080b6cc.baf0a8",
-        "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": 1047.8570594787598,
-        "y": 389.0953378677368,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b794ebfe.90b468",
-        "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": 1042.190330505371,
-        "y": 438.7620573043823,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e80f4202.f64da",
-        "type": "outcome",
-        "name": "deactivate",
-        "xml": "<outcome value='deactivate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 686.1903266906738,
-        "y": 389.7620153427124,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "d080b6cc.baf0a8"
-            ]
-        ]
-    },
-    {
-        "id": "6dfc037a.3d846c",
-        "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": 1048.3333053588867,
-        "y": 339.9999837875366,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2ee18070.6515e",
-        "type": "outcome",
-        "name": "activate",
-        "xml": "<outcome value='activate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 678.3332710266113,
-        "y": 340.6666650772095,
-        "z": "6872ec11.8012f4",
-        "wires": [
-            [
-                "6dfc037a.3d846c"
-            ]
-        ]
-    }
-]
+[{"id":"aac134ec.6cf1b8","type":"dgstart","name":"DGSTART","outputs":1,"x":130,"y":85,"z":"e4792a03.590918","wires":[["937a93d5.41f8b"]]},{"id":"937a93d5.41f8b","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":243.28570556640625,"y":125.23811149597168,"z":"e4792a03.590918","wires":[["1ff0b858.8b6048"]]},{"id":"1ff0b858.8b6048","type":"method","name":"method vf-module-topology-operation","xml":"<method rpc='vf-module-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":217.42862701416016,"y":164.9999942779541,"z":"e4792a03.590918","wires":[["e6e0449c.e0ce68"]]},{"id":"b858ba31.1d36a8","type":"comment","name":"vf-module-topology-operation","info":"","comments":"","x":524.344856262207,"y":32.58634376525879,"z":"e4792a03.590918","wires":[]},{"id":"e6e0449c.e0ce68","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":199.50003814697266,"y":404.3601722717285,"z":"e4792a03.590918","wires":[["6a5a06d.b6909f8","5dfb397c.6005b8","b60fc0ca.3f1f1"]]},{"id":"6a5a06d.b6909f8","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":485.0000305175781,"y":577.8575611114502,"z":"e4792a03.590918","wires":[]},{"id":"5dfb397c.6005b8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":495.9046401977539,"y":402.57139682769775,"z":"e4792a03.590918","wires":[["3f3819ab.205506","c0da133d.5bf54","dc742571.a62c58","b0109a9a.d288c8","2db6534f.dfd25c","69657262.5b917c"]]},{"id":"3f3819ab.205506","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":705.3809204101562,"y":292.85723400115967,"z":"e4792a03.590918","wires":[["bbd51bfa.9a57d8"]]},{"id":"c0da133d.5bf54","type":"outcome","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":713.761905670166,"y":439.0479259490967,"z":"e4792a03.590918","wires":[["a83fc83c.53eca8"]]},{"id":"b0109a9a.d288c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":705.4761619567871,"y":535.2380466461182,"z":"e4792a03.590918","wires":[["fc77d9ee.2a5968"]]},{"id":"fc77d9ee.2a5968","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":899.6665878295898,"y":535.238115310669,"z":"e4792a03.590918","wires":[]},{"id":"b60fc0ca.3f1f1","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":615.0832824707031,"y":242.3810567855835,"z":"e4792a03.590918","wires":[[]]},{"id":"bbd51bfa.9a57d8","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":1077.523754119873,"y":292.4286985397339,"z":"e4792a03.590918","wires":[[]]},{"id":"80ccbb30.d5a208","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":1089.5237121582031,"y":389.0953416824341,"z":"e4792a03.590918","wires":[[]]},{"id":"a83fc83c.53eca8","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":1083.8569831848145,"y":438.7620611190796,"z":"e4792a03.590918","wires":[[]]},{"id":"dc742571.a62c58","type":"outcome","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":717.8569984436035,"y":389.7620153427124,"z":"e4792a03.590918","wires":[["80ccbb30.d5a208"]]},{"id":"cfe9d851.6e01b8","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":1081.99995803833,"y":339.9999876022339,"z":"e4792a03.590918","wires":[[]]},{"id":"2db6534f.dfd25c","type":"outcome","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":709.999942779541,"y":340.6666650772095,"z":"e4792a03.590918","wires":[["cfe9d851.6e01b8"]]},{"id":"69657262.5b917c","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":728.3333206176758,"y":486.6666555404663,"z":"e4792a03.590918","wires":[["2b822e27.0073f2"]]},{"id":"2b822e27.0073f2","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":1097.4283905029297,"y":486.38079166412354,"z":"e4792a03.590918","wires":[[]]}]
\ No newline at end of file