CLOUDSTACK-6282: Added-volume-API-tests-to-test_escalations.py.patch JiraId-CLOUDSTACK-6282.patch

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

tools/marvin/marvin/config/test_data.py

@@ -365,6 +365,9 @@ test_data = {
         "ostype": "CentOS 5.6 (64-bit)",
         "sleep": 90,
         "timeout": 10,
+        "page": 1,
+        "pagesize": 2,
+        "listall":'true',
         "advanced_sg": {
             "zone": {
                 "name": "",
@@ -388,6 +391,20 @@ test_data = {
             "name": "Primary iSCSI"
         },
         "volume": {"diskname": "Test Volume"},
+        "custom_volume": {
+                          "customdisksize": 1,
+                          "diskname": "Custom disk",
+                         },
+        "upload_volume": {
+                          "diskname": "UploadVol",
+                          "format": "VHD",
+                          "url": "http://10.147.28.7/templates/393d3550-05ef-330f-9b8c-745b0e699759.vhd",
+                          "checksum": "",
+                         },
+        "recurring_snapshot": {
+                               "maxsnaps": 2,
+                               "timezone": "US/Arizona",
+                               },
         "volume_offerings": {
             0: {"diskname": "TestDiskServ"},
         },

tools/marvin/marvin/lib/base.py

@@ -827,6 +827,16 @@ class Volume:
                 timeout = timeout - 1
         return
 
+    @classmethod
+    def extract(cls, apiclient, volume_id, zoneid, mode):
+        """Extracts the volume"""
+        
+        cmd = extractVolume.extractVolumeCmd()
+        cmd.id = volume_id
+        cmd.zoneid = zoneid
+        cmd.mode = mode
+        return Volume(apiclient.extractVolume(cmd).__dict__)
+
     @classmethod
     def migrate(cls, apiclient, **kwargs):
         """Migrate a volume"""