From 478bce9798e2a8819a9be03082f3055752899874 Mon Sep 17 00:00:00 2001
From: Eli Qiao <taget@linux.vnet.ibm.com>
Date: Thu, 4 Sep 2014 09:56:51 +0800
Subject: [PATCH] Fix integrated test cases for assisted-volume-snapshots

qcow is not a valid type of snapshot in real environment,
the require type should be qcow2 instead of qcow.
Change-Id: I0fc8e90913699074cd997f5c1e0693372436d14f
---
 .../snapshot-create-assisted-req.json                           | 2 +-
 .../snapshot-create-assisted-req.xml                            | 2 +-
 nova/tests/integrated/test_api_samples.py                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json
index 9b6890c8bad8..f6bd4bec5fac 100644
--- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json
+++ b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json
@@ -3,7 +3,7 @@
         "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
         "create_info": {
             "snapshot_id": "421752a6-acf6-4b2d-bc7a-119f9148cd8c",
-            "type": "qcow",
+            "type": "qcow2",
             "new_file": "new_file_name"}
      }
 }
diff --git a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml
index 9aff79dd2e0a..925dbf2f1e9f 100644
--- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml
+++ b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml
@@ -3,7 +3,7 @@
     <volume_id>521752a6-acf6-4b2d-bc7a-119f9148cd8c</volume_id>
     <create_info>
       <snapshot_id>421752a6-acf6-4b2d-bc7a-119f9148cd8c</snapshot_id>
-      <type>qcow</type>
+      <type>qcow2</type>
       <new_file>new_file_name</new_file>
     </create_info>
   </snapshot>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index d0b22008c12c..779b131ac2fc 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -4019,7 +4019,7 @@ class AssistedVolumeSnapshotsJsonTest(ApiSampleTestBaseV2):
             'description': 'Daily backup',
             'volume_id': '521752a6-acf6-4b2d-bc7a-119f9148cd8c',
             'snapshot_id': '421752a6-acf6-4b2d-bc7a-119f9148cd8c',
-            'type': 'qcow',
+            'type': 'qcow2',
             'new_file': 'new_file_name'
         }
         subs.update(self._get_regexes())