code fix for OS attach volumes and dettach volumes

Issue-ID: APPC-448
Change-Id: I348108a8fb49a42c79039975e8470442a0f80dd2
Signed-off-by: kusuma kumari M <km583p@att.com>

1 files changed, 262 insertions, 262 deletions

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json
index 0e6504779..32fe9c2e1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json
@@ -1,262 +1,262 @@
-[

-    {

-        "id": "eeae9def.4d566",

-        "type": "dgstart",

-        "name": "DGSTART",

-        "outputs": 1,

-        "x": 93,

-        "y": 92,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "f51d1b93.7d168"

-            ]

-        ]

-    },

-    {

-        "id": "f51d1b93.7d168",

-        "type": "service-logic",

-        "name": "APPC 4.0.0",

-        "module": "APPC",

-        "version": "4.0.0",

-        "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='APPC' version='4.0.0'>",

-        "outputs": 1,

-        "x": 250,

-        "y": 92,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "10439b1c.b0fbc5"

-            ]

-        ]

-    },

-    {

-        "id": "10439b1c.b0fbc5",

-        "type": "method",

-        "name": "DetachVolume",

-        "xml": "<method rpc='DetachVolumeVM' mode='sync'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 448,

-        "y": 94,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "cf4fac38.3b932"

-            ]

-        ]

-    },

-    {

-        "id": "6f1b4f51.cab76",

-        "type": "success",

-        "name": "success",

-        "xml": "<outcome value='success'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 815.9999694824219,

-        "y": 303.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "f6364905.533518"

-            ]

-        ]

-    },

-    {

-        "id": "eda3e619.a190e",

-        "type": "other",

-        "name": "other",

-        "xml": "<outcome value='Other'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 824.9999694824219,

-        "y": 182.99996948242188,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "b81aef23.ced6e8"

-            ]

-        ]

-    },

-    {

-        "id": "361abfaa.ca34b8",

-        "type": "returnSuccess",

-        "name": "return success",

-        "xml": "<return status='success'>",

-        "comments": "",

-        "x": 1371.9999694824219,

-        "y": 275.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": []

-    },

-    {

-        "id": "5b028b69.7d6af4",

-        "type": "returnFailure",

-        "name": "return failure",

-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC dettachVolume not found' />",

-        "comments": "",

-        "x": 1132.9999694824219,

-        "y": 182.99996948242188,

-        "z": "65f0ae97.bfd7e8",

-        "wires": []

-    },

-    {

-        "id": "f6364905.533518",

-        "type": "switchNode",

-        "name": "switch error-code",

-        "xml": "<switch test='`$error_code`'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1008.9999694824219,

-        "y": 304.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "567026e7.afed6",

-                "ee60ee08.fb232"

-            ]

-        ]

-    },

-    {

-        "id": "567026e7.afed6",

-        "type": "success",

-        "name": "SUCCESS 200",

-        "xml": "<outcome value='200'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1190.9999694824219,

-        "y": 274.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "361abfaa.ca34b8"

-            ]

-        ]

-    },

-    {

-        "id": "ee60ee08.fb232",

-        "type": "outcome",

-        "name": "ERROR",

-        "xml": "<outcome value='Other'>\n",

-        "comments": "",

-        "outputs": 1,

-        "x": 1182.9999694824219,

-        "y": 433.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "285baaf0.7d06de"

-            ]

-        ]

-    },

-    {

-        "id": "285baaf0.7d06de",

-        "type": "block",

-        "name": "block",

-        "xml": "<block>\n",

-        "atomic": "false",

-        "comments": "",

-        "outputs": 1,

-        "x": 1315.9999694824219,

-        "y": 434.9999694824219,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "44fe2b94.9c5d94",

-                "961f42bf.beb62"

-            ]

-        ]

-    },

-    {

-        "id": "44fe2b94.9c5d94",

-        "type": "returnFailure",

-        "name": "return failure",

-        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",

-        "comments": "",

-        "x": 1450.9999694824219,

-        "y": 476,

-        "z": "65f0ae97.bfd7e8",

-        "wires": []

-    },

-    {

-        "id": "b81aef23.ced6e8",

-        "type": "block",

-        "name": "block",

-        "xml": "<block>\n",

-        "atomic": "false",

-        "comments": "",

-        "outputs": 1,

-        "x": 980.9999694824219,

-        "y": 182.99996948242188,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "5b028b69.7d6af4"

-            ]

-        ]

-    },

-    {

-        "id": "34472fd1.b14ab",

-        "type": "record",

-        "name": "record",

-        "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",

-        "comments": "",

-        "outputs": 1,

-        "x": 815.11669921875,

-        "y": 124,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            []

-        ]

-    },

-    {

-        "id": "cf4fac38.3b932",

-        "type": "block",

-        "name": "block",

-        "xml": "<block>\n",

-        "atomic": "false",

-        "comments": "",

-        "outputs": 1,

-        "x": 636.8666687011719,

-        "y": 152.86666870117188,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "34472fd1.b14ab",

-                "e021eba0.2f5b7"

-            ]

-        ]

-    },

-    {

-        "id": "961f42bf.beb62",

-        "type": "record",

-        "name": "record",

-        "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`\" />",

-        "comments": "",

-        "outputs": 1,

-        "x": 1440.8666687011719,

-        "y": 406.8666687011719,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            []

-        ]

-    },

-    {

-        "id": "e021eba0.2f5b7",

-        "type": "execute",

-        "name": "DetachVolume",

-        "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`\"/>",

-        "comments": "",

-        "outputs": 1,

-        "x": 652.9999694824219,

-        "y": 238,

-        "z": "65f0ae97.bfd7e8",

-        "wires": [

-            [

-                "eda3e619.a190e",

-                "6f1b4f51.cab76"

-            ]

-        ]

-    }

-]

+[
+    {
+        "id": "eeae9def.4d566",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 93,
+        "y": 92,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "f51d1b93.7d168"
+            ]
+        ]
+    },
+    {
+        "id": "f51d1b93.7d168",
+        "type": "service-logic",
+        "name": "APPC 4.0.0",
+        "module": "APPC",
+        "version": "4.0.0",
+        "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='APPC' version='4.0.0'>",
+        "outputs": 1,
+        "x": 250,
+        "y": 92,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "10439b1c.b0fbc5"
+            ]
+        ]
+    },
+    {
+        "id": "10439b1c.b0fbc5",
+        "type": "method",
+        "name": "DetachVolume",
+        "xml": "<method rpc='DetachVolumeVM' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 448,
+        "y": 94,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "cf4fac38.3b932"
+            ]
+        ]
+    },
+    {
+        "id": "6f1b4f51.cab76",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 815.9999694824219,
+        "y": 303.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "f6364905.533518"
+            ]
+        ]
+    },
+    {
+        "id": "eda3e619.a190e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 824.9999694824219,
+        "y": 182.99996948242188,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "b81aef23.ced6e8"
+            ]
+        ]
+    },
+    {
+        "id": "361abfaa.ca34b8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>",
+        "comments": "",
+        "x": 1371.9999694824219,
+        "y": 275.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": []
+    },
+    {
+        "id": "5b028b69.7d6af4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='RPC dettachVolume not found' />",
+        "comments": "",
+        "x": 1132.9999694824219,
+        "y": 182.99996948242188,
+        "z": "65f0ae97.bfd7e8",
+        "wires": []
+    },
+    {
+        "id": "f6364905.533518",
+        "type": "switchNode",
+        "name": "switch error-code",
+        "xml": "<switch test='`$error_code`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1008.9999694824219,
+        "y": 304.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "567026e7.afed6",
+                "ee60ee08.fb232"
+            ]
+        ]
+    },
+    {
+        "id": "567026e7.afed6",
+        "type": "success",
+        "name": "SUCCESS 200",
+        "xml": "<outcome value='200'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1190.9999694824219,
+        "y": 274.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "361abfaa.ca34b8"
+            ]
+        ]
+    },
+    {
+        "id": "ee60ee08.fb232",
+        "type": "outcome",
+        "name": "ERROR",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1182.9999694824219,
+        "y": 433.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "285baaf0.7d06de"
+            ]
+        ]
+    },
+    {
+        "id": "285baaf0.7d06de",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1315.9999694824219,
+        "y": 434.9999694824219,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "44fe2b94.9c5d94",
+                "961f42bf.beb62"
+            ]
+        ]
+    },
+    {
+        "id": "44fe2b94.9c5d94",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",
+        "comments": "",
+        "x": 1450.9999694824219,
+        "y": 476,
+        "z": "65f0ae97.bfd7e8",
+        "wires": []
+    },
+    {
+        "id": "b81aef23.ced6e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 980.9999694824219,
+        "y": 182.99996948242188,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "5b028b69.7d6af4"
+            ]
+        ]
+    },
+    {
+        "id": "34472fd1.b14ab",
+        "type": "record",
+        "name": "record",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 815.11669921875,
+        "y": 124,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cf4fac38.3b932",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 636.8666687011719,
+        "y": 152.86666870117188,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "34472fd1.b14ab",
+                "e021eba0.2f5b7"
+            ]
+        ]
+    },
+    {
+        "id": "961f42bf.beb62",
+        "type": "record",
+        "name": "record",
+        "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`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440.8666687011719,
+        "y": 406.8666687011719,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e021eba0.2f5b7",
+        "type": "execute",
+        "name": "DetachVolume",
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='dettachVolume'>\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`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 652.9999694824219,
+        "y": 238,
+        "z": "65f0ae97.bfd7e8",
+        "wires": [
+            [
+                "eda3e619.a190e",
+                "6f1b4f51.cab76"
+            ]
+        ]
+    }
+]