From 5aa6ed96d68f0bb476815e6736d53c66b4b01738 Mon Sep 17 00:00:00 2001 From: nachandr Date: Mon, 18 May 2020 13:03:23 -0500 Subject: [PATCH] Add debug info#2 to template uploader --- cfme/utils/template/rhevm.py | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/cfme/utils/template/rhevm.py b/cfme/utils/template/rhevm.py index 67b9a33a90..a550ea4b92 100644 --- a/cfme/utils/template/rhevm.py +++ b/cfme/utils/template/rhevm.py @@ -32,14 +32,25 @@ def add_glance_to_provider(self): @log_wrap("import template from Glance server") def import_template_from_glance(self): """Import the template from glance to local rhevm datastore, sucks.""" - self.mgmt.import_glance_image( - source_storage_domain_name=self.glance_key, - target_cluster_name=self.provider_data.template_upload.cluster, - source_template_name=self.image_name, - target_template_name=self.temp_template_name, - target_storage_domain_name=self.provider_data.template_upload.storage_domain) - mgmt_network = self.provider_data.template_upload.get('management_network') - rv_tmpl = self.mgmt.get_template(self.temp_template_name) + if self.stream == 'upstream': + self.mgmt.import_glance_image( + source_storage_domain_name=self.glance_key, + target_cluster_name=self.provider_data.template_upload.cluster, + source_template_name=self.image_name, + target_template_name=self.template_name, + target_storage_domain_name=self.provider_data.template_upload.storage_domain) + mgmt_network = self.provider_data.template_upload.get('management_network') + rv_tmpl = self.mgmt.get_template(self.template_name) + + else: + self.mgmt.import_glance_image( + source_storage_domain_name=self.glance_key, + target_cluster_name=self.provider_data.template_upload.cluster, + source_template_name=self.image_name, + target_template_name=self.temp_template_name, + target_storage_domain_name=self.provider_data.template_upload.storage_domain) + mgmt_network = self.provider_data.template_upload.get('management_network') + rv_tmpl = self.mgmt.get_template(self.temp_template_name) if mgmt_network: # network devices, qcow template doesn't have any temp_nics = rv_tmpl.get_nics() @@ -127,11 +138,12 @@ def run(self): self.glance_upload() self.add_glance_to_provider() self.import_template_from_glance() - self.deploy_vm_from_template() - if self.stream == 'upstream': - self.manageiq_cleanup() - self.add_disk_to_vm() - self.templatize_vm() + if self.stream == 'downstream': + self.deploy_vm_from_template() + # if self.stream == 'upstream': + # self.manageiq_cleanup() + self.add_disk_to_vm() + self.templatize_vm() return True except Exception: logger.exception('template creation failed for provider {}'.format(