Attachment 892815 Details for Bug 1094632 – storage: detect localfs storage

[patch] storage: detect localfs storage

0001-storage-detect-localfs-storage.patch (text/plain), 3.23 KB, created by Sandro Bonazzola on 2014-05-06 09:11:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Bonazzola

Created: 2014-05-06 09:11:52 UTC

Size: 3.23 KB

patch

obsolete

>From 06868461ca56ef7323f2c58d59559f5a5a9493db Mon Sep 17 00:00:00 2001
>From: Sandro Bonazzola <sbonazzo@redhat.com>
>Date: Mon, 5 May 2014 17:32:06 +0200
>Subject: [PATCH] storage: detect localfs storage
>
>iso-uploader has been designed thinking only at
>NFS storage for iso images uploaded using nfs upload backend.
>All other storage types have been delegated to ssh upload backend.
>Added a check on localfs explaining that for that storage only
>ssh upload is supported.
>
>Change-Id: Iff3313ba69500a7dbbdbe4c0972d747a9ae31b99
>Bug-Url:https://bugzilla.redhat.com/1094632
>Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
>---
> src/__main__.py | 28 +++++++++++++++++++++-------
> 1 file changed, 21 insertions(+), 7 deletions(-)
>
>diff --git a/src/__main__.py b/src/__main__.py
>index 91a25a2..6207818 100644
>--- a/src/__main__.py
>+++ b/src/__main__.py
>@@ -617,10 +617,13 @@ class ISOUploader(object):
>                     _("The %s storage domain supplied is not of type ISO") %
>                     isodomain
>                 )
>-            id = sd.get_id()
>+            sd_uuid = sd.get_id()
>             storage = sd.get_storage()
>             if storage is not None:
>-                address = storage.get_address()
>+                domain_type = storage.get_type()
>+                address = 'localhost'
>+                if domain_type not in ('localfs', ):
>+                    address = storage.get_address()
>                 path = storage.get_path()
>             else:
>                 raise Exception(
>@@ -629,8 +632,10 @@ class ISOUploader(object):
>                         "the %s ISO domain."
>                     ) % isodomain
>                 )
>-            logging.debug('id=%s address=%s path=%s' % (id, address, path))
>-            return (id, address, path)
>+            logging.debug(
>+                'id=%s address=%s path=%s' % (sd_uuid, address, path)
>+            )
>+            return (sd_uuid, domain_type, address, path)
>         else:
>             raise Exception(
>                 _("An ISO storage domain with a name of %s was not found.") %
>@@ -940,9 +945,10 @@ class ISOUploader(object):
>             )
>         elif self.configuration.get('iso_domain'):
>             # Discover the hostname and path from the ISO domain.
>-            (id, address, path) = self.get_host_and_path_from_ISO_domain(
>-                self.configuration.get('iso_domain')
>-            )
>+            (id, domain_type, address, path) = \
>+                self.get_host_and_path_from_ISO_domain(
>+                    self.configuration.get('iso_domain')
>+                )
>             remote_path = os.path.join(id, DEFAULT_IMAGES_DIR)
>         elif self.configuration.get('nfs_server'):
>             mnt = self.configuration.get('nfs_server')
>@@ -1063,6 +1069,14 @@ class ISOUploader(object):
>                         _('Error message is "%s"'),
>                         str(e).strip()
>                     )
>+        elif domain_type in ('localfs', ):
>+            ExitCodes.exit_code = ExitCodes.UPLOAD_ERR
>+            logging.error(
>+                _(
>+                    'Upload to a local storage domain is supported only '
>+                    'through SSH'
>+                ),
>+            )
>         else:
>             # NFS support.
>             tmpDir = tempfile.mkdtemp()
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1094632: 892815