From bc8740e77298a553b9401532150e1bc16fd57d26 Mon Sep 17 00:00:00 2001
From: Dan McMillan <dm3821@att.com>
Date: Tue, 19 Jun 2018 20:56:33 +0000
Subject: 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>
---
 .../provider/src/main/resources/json/APPC/APPC_AttachVolumeVM.json    | 2 +-
 .../provider/src/main/resources/json/APPC/APPC_DetachVolumeVM.json    | 2 +-
 .../provider/src/main/resources/json/APPC/APPC_RebuildVM.json         | 2 +-
 .../provider/src/main/resources/json/APPC/APPC_VM_Start.json          | 4 ++--
 .../provider/src/main/resources/json/APPC/APPC_VM_Stop.json           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'appc-directed-graph/appc-dgraph/provider')

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 2b33c7e1c..18ba280b7 100644
--- 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",
         "type": "execute",
         "name": "attachVolume",
-        "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`\" />",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
         "x": 622.9999694824219,
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 2fbca8f8a..ac3af44ca 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
@@ -246,7 +246,7 @@
         "id": "62735c5f.2a9b9c",
         "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`\"/>",
+        "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`\"/>",
         "comments": "",
         "outputs": 1,
         "x": 653.1166381835938,
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 4ec3a58c9..c7a96b3f2 100644
--- 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",
         "type": "execute",
         "name": "rebuildServer()",
-        "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`\" />",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
         "x": 722.7499694824219,
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 4e636f95e..1d6ec40db 100644
--- 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",
         "type": "set",
         "name": "set error code and message",
-        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Start VM status is error' />\n",
+        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",
         "comments": "",
         "x": 1398,
         "y": 507,
@@ -254,4 +254,4 @@
             ]
         ]
     }
-]
\ 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 0ea358a0d..cfea64938 100644
--- 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",
         "type": "set",
         "name": "set error code and message",
-        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Stop VM status is error' />\n",
+        "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='`$error-message`' />\n",
         "comments": "",
         "x": 1345,
         "y": 241.5666732788086,
-- 
cgit 1.2.3-korg