Code fix for attach and detach volumes

[appc.git] / appc-directed-graph / appc-dgraph / provider / src / main / resources / json / APPC / APPC_AttachVolumeVM.json

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json
index 8684afa..2b33c7e 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "8c8d638b.d864e8",\r
+        "id": "5007ce02.07f1d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 84,\r
-        "y": 84,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 87,\r
+        "y": 73.11666870117188,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "67bc77ec.cfab9"\r
+                "7d845d7f.b28f8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67bc77ec.cfab9",\r
+        "id": "7d845d7f.b28f8c",\r
         "type": "service-logic",\r
         "name": "APPC 4.0.0",\r
         "module": "APPC",\r
@@ -22,240 +22,240 @@
         "comments": "",\r
         "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='APPC' version='4.0.0'>",\r
         "outputs": 1,\r
-        "x": 241,\r
-        "y": 84,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 220,\r
+        "y": 38.116668701171875,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "9ab2a765.c334e"\r
+                "2bf8e045.73a448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ab2a765.c334e",\r
+        "id": "2bf8e045.73a448",\r
         "type": "method",\r
         "name": "AttachVolume",\r
         "xml": "<method rpc='AttachVolumeVM' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 439,\r
-        "y": 86,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 418,\r
+        "y": 40.116668701171875,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "af60ef65.5a714"\r
+                "468a32bf.35f284"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d95111e.b625",\r
+        "id": "6d9a583d.567f7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 806.9999694824219,\r
-        "y": 295.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 785.9999694824219,\r
+        "y": 250.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "3f10a3d4.fa8644"\r
+                "9b1062e9.283098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98f61d5c.9857e8",\r
+        "id": "ddd78a95.68e358",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 815.9999694824219,\r
-        "y": 174.99996948242188,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 794.9999694824219,\r
+        "y": 129.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "b2efb443.b631a"\r
+                "f06647ab.96aca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6be48d2c.b63d8c",\r
+        "id": "10c52db4.a51652",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>",\r
         "comments": "",\r
-        "x": 1362.9999694824219,\r
-        "y": 267.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1341.9999694824219,\r
+        "y": 222.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ebaa10e.c55e6e",\r
+        "id": "84c0dae5.04bb7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC attachVolume not found' />",\r
         "comments": "",\r
-        "x": 1123.9999694824219,\r
-        "y": 174.99996948242188,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1102.9999694824219,\r
+        "y": 129.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f10a3d4.fa8644",\r
+        "id": "9b1062e9.283098",\r
         "type": "switchNode",\r
-        "name": "switch error-code",\r
-        "xml": "<switch test='`$error_code`'>\n",\r
+        "name": "switch status",\r
+        "xml": "<switch test='`$VOLUME_STATUS`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 999.9999694824219,\r
-        "y": 296.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 978.9999694824219,\r
+        "y": 251.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "78e00fc2.178ca8",\r
-                "5cb2873d.ba509"\r
+                "69b4b801.d2dd58",\r
+                "4a833666.1d3a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78e00fc2.178ca8",\r
+        "id": "69b4b801.d2dd58",\r
         "type": "success",\r
-        "name": "SUCCESS 200",\r
-        "xml": "<outcome value='200'>\n",\r
+        "name": "success",\r
+        "xml": "<outcome value='SUCCESS'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1181.9999694824219,\r
-        "y": 266.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1160.9999694824219,\r
+        "y": 221.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "6be48d2c.b63d8c"\r
+                "10c52db4.a51652"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5cb2873d.ba509",\r
+        "id": "4a833666.1d3a3",\r
         "type": "outcome",\r
         "name": "ERROR",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1173.9999694824219,\r
-        "y": 425.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1152.9999694824219,\r
+        "y": 380.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "c45d6cad.1266a8"\r
+                "df65c991.2b7fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c45d6cad.1266a8",\r
+        "id": "df65c991.2b7fa8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1306.9999694824219,\r
-        "y": 426.9999694824219,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1285.9999694824219,\r
+        "y": 381.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "4593642b.a03a34",\r
-                "7bdd8ae4.5a04e4"\r
+                "21987bda.eebd5c",\r
+                "3d82b93b.845e96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4593642b.a03a34",\r
+        "id": "21987bda.eebd5c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",\r
         "comments": "",\r
-        "x": 1441.9999694824219,\r
-        "y": 468,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1420.9999694824219,\r
+        "y": 422.1166687011719,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2efb443.b631a",\r
+        "id": "f06647ab.96aca",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 971.9999694824219,\r
-        "y": 174.99996948242188,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 950.9999694824219,\r
+        "y": 129.11663818359375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "3ebaa10e.c55e6e"\r
+                "84c0dae5.04bb7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80ee82a0.8401c8",\r
+        "id": "ff624428.83add8",\r
         "type": "record",\r
         "name": "record",\r
-        "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'input.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />\n<parameter name=\"field4\" value=\"`'volumeId in context=' + $volumeId`\" />\n",\r
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'input.payload = ' + $input.payload`\" />\n<parameter name=\"field3\" value=\"`'vm-id in context=' + $vm-id`\" />\n<parameter name=\"field4\" value=\"`'volumeId in context=' + $volumeId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 806.11669921875,\r
-        "y": 116,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 785.11669921875,\r
+        "y": 70.11666870117188,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "af60ef65.5a714",\r
+        "id": "468a32bf.35f284",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 627.8666687011719,\r
-        "y": 144.86666870117188,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 606.8666687011719,\r
+        "y": 98.98333740234375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "80ee82a0.8401c8",\r
-                "1ecc7492.a889b3"\r
+                "ff624428.83add8",\r
+                "18c8070a.4a19b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bdd8ae4.5a04e4",\r
+        "id": "3d82b93b.845e96",\r
         "type": "record",\r
         "name": "record",\r
-        "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />",\r
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field3\" value=\"`'error-message = ' + $error-message`\" />\n<parameter name=\"field4\" value=\"`'error-code = ' + $error_code`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1431.8666687011719,\r
-        "y": 398.8666687011719,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 1410.8666687011719,\r
+        "y": 352.98333740234375,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1ecc7492.a889b3",\r
+        "id": "18c8070a.4a19b1",\r
         "type": "execute",\r
         "name": "attachVolume",\r
         "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='attachVolume'>\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\" />\n<parameter name=\"org.onap.appc.instance.url\" value=\"`$vm-id`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$identity-url`\" />\n<parameter name=\"org.onap.appc.volumeid\" value=\"`$volumeAttachment.volumeId`\" />\n<parameter name=\"org.onap.appc.device\" value=\"`$volumeAttachment.device`\" />\n<parameter name=\"org.onap.appc.tag\" value=\"`$volumeAttachment.tag`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 643.9999694824219,\r
-        "y": 230,\r
-        "z": "1eca43d0.41972c",\r
+        "x": 622.9999694824219,\r
+        "y": 184.11666870117188,\r
+        "z": "bb7eafb1.d37d2",\r
         "wires": [\r
             [\r
-                "98f61d5c.9857e8",\r
-                "9d95111e.b625"\r
+                "ddd78a95.68e358",\r
+                "6d9a583d.567f7"\r
             ]\r
         ]\r
     }\r