search for: data_centers_service

...rhv-upload-plugin.py index c72f5e181..c6ba1962f 100644 --- a/v2v/rhv-upload-plugin.py +++ b/v2v/rhv-upload-plugin.py @@ -70,7 +70,7 @@ def find_host(connection): system_service = connection.system_service() storage_name = params['output_storage'] data_centers = system_service.data_centers_service().list( - search='storage=%s' % storage_name, + search='storage.name=%s' % storage_name, case_sensitive=False, ) if len(data_centers) == 0: -- 2.17.1

...onnection): debug("cannot read /etc/vdsm/vdsm.id, using any host: %s" % e) return None - debug("hw_id = %r" % vdsm_id) + system_service = connection.system_service() + storage_name = params['output_storage'] + data_centers = system_service.data_centers_service().list( + search='storage=%s' % storage_name, + case_sensitive=False, + ) + if len(data_centers) == 0: + # The storage domain is not attached to a datacenter + # (shouldn't happen, would fail on disk creation). + return None + + datacenter = d...

...@@ -69,14 +69,34 @@ def find_host(connection): debug("hw_id = %r" % vdsm_id) - hosts_service = connection.system_service().hosts_service() + system_service = connection.system_service() + storage_name = params['output_storage'] + data_centers = system_service.data_centers_service().list( + search='storage=%s' % storage_name, + case_sensitive=False, + ) + if len(data_centers) == 0: + # The storage domain is not attached to a datacenter + # (shouldn't happen, would fail on disk creation). + debug("storange domain (%s)...

...s(-) diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py index c6ba1962f..d787c9598 100644 --- a/v2v/rhv-upload-plugin.py +++ b/v2v/rhv-upload-plugin.py @@ -71,7 +71,7 @@ def find_host(connection): storage_name = params['output_storage'] data_centers = system_service.data_centers_service().list( search='storage.name=%s' % storage_name, - case_sensitive=False, + case_sensitive=True, ) if len(data_centers) == 0: # The storage domain is not attached to a datacenter @@ -84,7 +84,7 @@ def find_host(connection): hosts_service = syste...

...> --- a/v2v/rhv-upload-plugin.py > > +++ b/v2v/rhv-upload-plugin.py > > @@ -70,7 +70,7 @@ def find_host(connection): > > system_service = connection.system_service() > > storage_name = params['output_storage'] > > data_centers = system_service.data_centers_service().list( > > - search='storage=%s' % storage_name, > > + search='storage.name=%s' % storage_name, > > case_sensitive=False, > > Thanks, pushed (commit 2547df8a0de46bb1447396e07ee0989bc3f8f31e). > > > Do we need this in RHEL 7....

...v/test-v2v-o-rhv-upload-module/ovirtsdk4/__init__.py +++ b/v2v/test-v2v-o-rhv-upload-module/ovirtsdk4/__init__.py @@ -39,6 +39,9 @@ class Connection(object): return SystemService() class SystemService(object): + def clusters_service(self): + return ClustersService() + def data_centers_service(self): return DataCentersService() @@ -54,6 +57,10 @@ class SystemService(object): def vms_service(self): return VmsService() +class ClustersService(object): + def list(self, search=None, case_sensitive=False): + return ["Default"] + class DataCenters...

...ot;cannot read /etc/vdsm/vdsm.id, using any host: %s" % e) > return None > > - debug("hw_id = %r" % vdsm_id) > + system_service = connection.system_service() > + storage_name = params['output_storage'] > + data_centers = system_service.data_centers_service().list( > + search='storage=%s' % storage_name, > + case_sensitive=False, > + ) > + if len(data_centers) == 0: > + # The storage domain is not attached to a datacenter > + # (shouldn't happen, would fail on disk creation). > +...

...using any host: %s" % e) > return None > > - debug("hw_id = %r" % vdsm_id) > I would leave this as is... > + system_service = connection.system_service() > + storage_name = params['output_storage'] > + data_centers = system_service.data_centers_service().list( > + search='storage=%s' % storage_name, > + case_sensitive=False, > + ) > + if len(data_centers) == 0: > + # The storage domain is not attached to a datacenter > + # (shouldn't happen, would fail on disk creation). > A debu...

...ost(connection): > > debug("hw_id = %r" % vdsm_id) > > - hosts_service = connection.system_service().hosts_service() > + system_service = connection.system_service() > + storage_name = params['output_storage'] > + data_centers = system_service.data_centers_service().list( > + search='storage=%s' % storage_name, > + case_sensitive=False, > + ) > + if len(data_centers) == 0: > + # The storage domain is not attached to a datacenter > + # (shouldn't happen, would fail on disk creation). > +...

...f5e181..c6ba1962f 100644 > --- a/v2v/rhv-upload-plugin.py > +++ b/v2v/rhv-upload-plugin.py > @@ -70,7 +70,7 @@ def find_host(connection): > system_service = connection.system_service() > storage_name = params['output_storage'] > data_centers = system_service.data_centers_service().list( > - search='storage=%s' % storage_name, > + search='storage.name=%s' % storage_name, > case_sensitive=False, Thanks, pushed (commit 2547df8a0de46bb1447396e07ee0989bc3f8f31e). Do we need this in RHEL 7.6? Rich. -- Richard Jones, Virtualiza...

.... --- v2v/rhv-upload-precheck.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/v2v/rhv-upload-precheck.py b/v2v/rhv-upload-precheck.py index 9ccfd1fdf..0b8087adb 100644 --- a/v2v/rhv-upload-precheck.py +++ b/v2v/rhv-upload-precheck.py @@ -66,6 +66,15 @@ data_centers = system_service.data_centers_service().list( case_sensitive=True, ) if len(data_centers) == 0: + storage_domains = system_service.storage_domains_service().list( + search='name=%s' % params['output_storage'], + case_sensitive=True, + ) + if len(storage_domains) == 0: + # The storage...

...) -# Check whether the specified cluster exists. -clusters_service = system_service.clusters_service() -clusters = clusters_service.list( - search='name=%s' % params['rhv_cluster'], +# Check whether there is a datacenter for the specified storage. +data_centers = system_service.data_centers_service().list( + search='storage.name=%s' % params['output_storage'], case_sensitive=True, ) +if len(data_centers) == 0: + # The storage domain is not attached to a datacenter + # (shouldn't happen, would fail on disk creation). + raise RuntimeError("The storage...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix

..., + url = None, + username = None, + password = None, + ca_file = None, + log = None, + insecure = False, + ): + pass + + def system_service(self): + return SystemService() + +class SystemService(object): + def data_centers_service(self): + return DataCentersService() + + def disks_service(self): + return DisksService() + + def image_transfers_service(self): + return ImageTransfersService() + + def storage_domains_service(self): + return StorageDomainsService() + + def vms_service(self)...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-September/msg00121.html v2: - Rewrote patch 2 from scratch so it incorporates Nir's suggestions. - Add fake module to EXTRA_DIST. - Retested. Unfortunately I am no longer able to test the ordinary conversion path because ovirtsdk4 is incompatible with Fedora 29 / Python 3.7:

This adds a test of -o rhv-upload. Obviously for an upstream test we cannot require a working oVirt server. This test works by faking the ovirtsdk4 Python module, setting PYTHONPATH so that the fake module is picked up instead of the real module (if installed). However it's more complex than that because the nbdkit plugin also expects to talk to a working imageio HTTPS server. Therefore

...; + password = None, > + ca_file = None, > + log = None, > + insecure = False, > + ): > + pass > + > + def system_service(self): > + return SystemService() > + > +class SystemService(object): > + def data_centers_service(self): > + return DataCentersService() > + > + def disks_service(self): > + return DisksService() > + > + def image_transfers_service(self): > + return ImageTransfersService() > + > + def storage_domains_service(self): > + return St...

This series extract oVirt SDK and imageio code to make it eaiser to follow the code and improve error handing in open() and close(). The first small patches can be consider as fixes for downstream. Tested based on libguestfs v1.41.5, since I had trouble building virt-v2v and libguestfs from master. Nir Soffer (18): rhv-upload: Remove unused exception class rhv-upload: Check status more