[KVM-AUTOTEST,3/9] KVM test: rss_file_transfer.py: add convenience functions upload() and download()

Commit Message

Michael Goldish July 15, 2010, 3:57 p.m. UTC

None

Patch

diff --git a/client/tests/kvm/rss_file_transfer.py b/client/tests/kvm/rss_file_transfer.py
index c584397..3de8259 100755
--- a/client/tests/kvm/rss_file_transfer.py
+++ b/client/tests/kvm/rss_file_transfer.py
@@ -395,6 +395,30 @@  class FileDownloadClient(FileTransferClient):
             raise
 
 
+def upload(address, port, src_pattern, dst_path, timeout=60,
+           connect_timeout=10):
+    """
+    Connect to server and upload files.
+
+    @see: FileUploadClient
+    """
+    client = FileUploadClient(address, port, connect_timeout)
+    client.upload(src_pattern, dst_path, timeout)
+    client.close()
+
+
+def download(address, port, src_pattern, dst_path, timeout=60,
+             connect_timeout=10):
+    """
+    Connect to server and upload files.
+
+    @see: FileDownloadClient
+    """
+    client = FileDownloadClient(address, port, connect_timeout)
+    client.download(src_pattern, dst_path, timeout)
+    client.close()
+
+
 def main():
     import optparse
 
@@ -418,13 +442,9 @@  def main():
     port = int(port)
 
     if options.download:
-        client = FileDownloadClient(address, port)
-        client.download(src_pattern, dst_path, timeout=options.timeout)
-        client.close()
+        download(address, port, src_pattern, dst_path, options.timeout)
     elif options.upload:
-        client = FileUploadClient(address, port)
-        client.upload(src_pattern, dst_path, timeout=options.timeout)
-        client.close()
+        upload(address, port, src_pattern, dst_path, options.timeout)
 
 
 if __name__ == "__main__":