Add snapshot-id to RebuildVM DG

Parameterize error-message in AttachVolumeVM DG

Parameterize error-message in DetachVolumeVM DG

Parameterize error-message in VM_Start DG

Parameterize error-message in VM_Stop DG

Change-Id: I8a2a06661d668565dc2b2f0160ac7695ac52198e
Issue-ID: APPC-1011
Signed-off-by: Dan McMillan <dm3821@att.com>

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 2b33c7e..18ba280 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
@@ -246,7 +246,7 @@
         "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
+        "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=\"`$volumeId`\" />\n<parameter name=\"org.onap.appc.device\" value=\"`$device`\" />\n<parameter name=\"org.onap.appc.tag\" value=\"`$tag`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 622.9999694824219,\r

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 2fbca8f..ac3af44 100644 (file)
--- 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
@@ -246,7 +246,7 @@
         "id": "62735c5f.2a9b9c",\r
         "type": "execute",\r
         "name": "DetachVolume",\r
-        "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`\"/>",\r
+        "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=\"`$volumeId`\" />\n<parameter name=\"org.onap.appc.device\" value=\"`$device`\" />\n<parameter name=\"org.onap.appc.tag\" value=\"`$tag`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 653.1166381835938,\r

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
index 4ec3a58..c7a96b3 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_RebuildVM.json
@@ -35,7 +35,7 @@
         "id": "5bf06fcf.867b98",\r
         "type": "execute",\r
         "name": "rebuildServer()",\r
-        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\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.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />",\r
+        "xml": "<execute plugin='org.onap.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\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.payload\" value=\"`$input.payload`\" />\n<parameter name=\"org.onap.appc.skiphypervisorcheck\" value=\"`$skip-hypervisor-check`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 722.7499694824219,\r

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
index 4e636f9..1d6ec40 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
@@ -193,7 +193,7 @@
         "id": "18420693.2d9f89",\r
         "type": "set",\r
         "name": "set error code and message",\r
-        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Start VM status is error' />\n",\r
+        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",\r
         "comments": "",\r
         "x": 1398,\r
         "y": 507,\r
@@ -254,4 +254,4 @@
             ]\r
         ]\r
     }\r
-]
\ No newline at end of file
+]

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
index 0ea358a..cfea649 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Stop.json
@@ -218,7 +218,7 @@
         "id": "32f7f639.b0517a",\r
         "type": "set",\r
         "name": "set error code and message",\r
-        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Stop VM status is error' />\n",\r
+        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",\r
         "comments": "",\r
         "x": 1345,\r
         "y": 241.5666732788086,\r