Merge pull request #2309 from zhencliu/ssh_snap

remote_image_snapshot: support ssh storage backend

qemu/tests/cfg/remote_image_snapshot.cfg

@@ -3,13 +3,14 @@
 #   ceph
 #   gluster_direct
 #   nbd
-#   curl (read-only)
+#   libcurl (read-only)
+#   libssh (read-only)
 # These tcs only focus on the following scenarios:
 #   remote image -> local snapshot
 #   remote image -> remote snapshot
 
 - remote_image_snapshot:
-    only iscsi_direct ceph gluster_direct nbd curl
+    only iscsi_direct ceph gluster_direct nbd libcurl libssh
     virt_test_type = qemu
     type = qemu_disk_img_info
     image_chain= "image1 snA"
@@ -38,12 +39,13 @@
             enable_gluster_snA = no
             enable_nbd_snA = no
             enable_curl_snA = no
+            enable_ssh_snA = no
             image_raw_device_snA = no
             storage_type_snA = filesystem
-            curl:
+            libcurl, libssh:
                 image_readonly_snA = no
         - to_remote:
-            no nbd curl
+            no nbd libcurl libssh
             iscsi_direct:
                 # make sure size of lun_snA equals to size of lun_image1
                 # hard code here for avocado-vt cannot select luns by now

qemu/tests/qemu_disk_img_info.py

@@ -62,6 +62,7 @@ def run(test, params, env):
     enable_gluster = params.get("enable_gluster") == "yes"
     enable_nbd = params.get("enable_nbd") == "yes"
     enable_curl = params.get("enable_curl") == "yes"
+    enable_ssh = params.get("enable_ssh") == "yes"
     if enable_ceph:
         update_params.update({
              "enable_ceph_%s" % base_image: optval("enable_ceph",
@@ -109,6 +110,14 @@ def run(test, params, env):
             "storage_type_%s" % base_image: optval("storage_type",
                                                    base_image,
                                                    params, "filesystem")})
+    elif enable_ssh:
+        update_params.update({
+            "enable_ssh_%s" % base_image: optval("enable_ssh",
+                                                 base_image,
+                                                 params, "no"),
+            "storage_type_%s" % base_image: optval("storage_type",
+                                                   base_image,
+                                                   params, "filesystem")})
     params.update(update_params)
 
     image_chain = params.get("image_chain", "").split()