diff --git a/airgun/entities/contenthost.py b/airgun/entities/contenthost.py index 3886c0119..e28061756 100644 --- a/airgun/entities/contenthost.py +++ b/airgun/entities/contenthost.py @@ -121,7 +121,8 @@ def execute_module_stream_action( def search_package(self, entity_name, package_name): """Search for specific package installed in content host""" - view = self.navigate_to(self, 'Edit', entity_name=entity_name) + view = self.navigate_to(self, 'LegacyDetails', entity_name=entity_name) + view.packages_installed.wait_displayed() view.packages_installed.search(package_name) return view.packages_installed.table.read() @@ -145,7 +146,8 @@ def install_errata(self, entity_name, errata_id, install_via='rex'): :return: Returns a dict containing task status details """ - view = self.navigate_to(self, 'Edit', entity_name=entity_name) + view = self.navigate_to(self, 'LegacyDetails', entity_name=entity_name) + view.errata.wait_displayed() if errata_id == "All": view.errata.select_all.fill(True) else: diff --git a/airgun/entities/errata.py b/airgun/entities/errata.py index dfc13b0c1..2b37f05b7 100644 --- a/airgun/entities/errata.py +++ b/airgun/entities/errata.py @@ -8,6 +8,7 @@ ErrataTaskDetailsView, ErratumView, ) +from airgun.views.job_invocation import JobInvocationStatusView class ErrataEntity(BaseEntity): @@ -59,12 +60,18 @@ def read( view.content_hosts.environment_filter.fill(environment) return view.read(widget_names=widget_names) - def install(self, entity_name, host_name): + def install(self, entity_name, host_names, environment=None): """Install errata on content host. :param str entity_name: errata id or title - :param str host_name: content host name to apply errata on + :param str host_names: content host name to apply errata on. + pass a single str hostname, + or pass 'All' for any available hosts, + or pass a list of str hostnames. + :param str environment: name of lifecycle environment to scope errata. + default: None """ + task_page = 'ErrataTaskDetails' view = self.navigate_to( self, 'Details', @@ -73,13 +80,41 @@ def install(self, entity_name, host_name): installable=False, repo=None, ) - view.content_hosts.search(host_name) - view.content_hosts.table.row(name=host_name)[0].fill(True) + if environment: + view.content_hosts.environment_filter.fill(environment) + view.content_hosts.wait_displayed() + + if host_names == 'All': + # select_all on table, check if single or multiple hosts + view.content_hosts.select_all.fill(True) + if len(view.content_hosts.read()) > 1: + task_page = 'JobInvocationStatus' + elif isinstance(host_names, list): + # find and select hostnames in table from list + for hostname in host_names: + view.content_hosts.table.row(name=hostname)[0].fill(True) + if len(host_names) > 1: + task_page = 'JobInvocationStatus' + else: + # search and select the single passed hostname + view.content_hosts.search(host_names) + view.content_hosts.wait_displayed() + view.content_hosts.table.row(name=host_names)[0].fill(True) + view.content_hosts.wait_displayed() view.content_hosts.apply.click() + # brought to confirmation page, confirm to install view = ErrataInstallationConfirmationView(view.browser) + view.wait_displayed() view.confirm.click() - view = ErrataTaskDetailsView(view.browser) - view.progressbar.wait_for_result() + # wait for redirect to task details page + if task_page == 'JobInvocationStatus': + # installed to multiple hosts + view = JobInvocationStatusView(view.browser) + view.wait_for_result(delay=0.01) + else: + # installed to a single host + view = ErrataTaskDetailsView(view.browser) + view.progressbar.wait_for_result(delay=0.01) return view.read() def search_content_hosts(self, entity_name, value, environment=None): diff --git a/airgun/views/errata.py b/airgun/views/errata.py index eed66a8e0..600f9f9c2 100644 --- a/airgun/views/errata.py +++ b/airgun/views/errata.py @@ -80,6 +80,7 @@ class content_hosts(SatTab): TAB_NAME = 'Content Hosts' environment_filter = SatSelect(".//select[@ng-model='environmentFilter']") searchbox = Search() + select_all = Checkbox(locator=".//input[@type='checkbox'][@ng-change='allSelected()']") apply = Text(".//button[@ng-click='goToNextStep()']") table = SatTable( locator=".//table", @@ -188,7 +189,7 @@ def is_displayed(self): class ErrataInstallationConfirmationView(BaseLoggedInView): cancel = Text(".//button[@ng-click='transitionBack()']") - confirm = Text(".//button[@type='submit']") + confirm = Text(".//span[text()='Confirm']") class ErrataTaskDetailsView(TaskDetailsView):