[1LP][RFR] Add support for cancel and nav_away to Host.update() and test_infrastructure_hosts_crud

cfme/common/host_views.py

@@ -307,7 +307,7 @@ class HostEditView(HostFormView):
     @property
     def is_displayed(self):
         return (
-            self.logged_in_as_current_user and self.navigation.currently_selected == [
+            self.in_compute_infrastructure_hosts and self.navigation.currently_selected == [
                 'Compute', 'Infrastructure', 'Hosts'] and self.title.text == 'Info/Settings')
 
 

cfme/infrastructure/host.py

@@ -94,21 +94,35 @@ def __init__(self, **kwargs):
             super(Host.Credential, self).__init__(**kwargs)
             self.ipmi = kwargs.get('ipmi')
 
-    def update(self, updates, validate_credentials=False, from_details=True):
+    def update(self, updates, validate_credentials=False, from_hosts=False,
+               cancel=False, nav_away=False, changes=True):
         """Updates a host in the UI. Better to use utils.update.update context manager than call
         this directly.
 
         Args:
-           updates (dict): fields that are changing.
+            updates (dict): fields that are changing.
+            validate_credentials (bool): if True, validate host credentials
+            from_hosts (bool): if True, select 'Edit Selected items' from hosts view
+                else, select 'Edit Selected items' from details view
+            cancel (bool): click cancel button to cancel the edit if True
+            nav_away (bool): navigate away from edit view before saving if True
+            changes (bool): expecting saved changes if True
         """
-        if from_details:
-            view = navigate_to(self, "Edit")
-        else:
+        if from_hosts:
             view = navigate_to(self.parent, "All")
             view.entities.get_entity(name=self.name, surf_pages=True).ensure_checked()
             view.toolbar.configuration.item_select('Edit Selected items')
             view = self.create_view(HostEditView)
             assert view.is_displayed
+        else:
+            view = navigate_to(self, "Edit")
+        if nav_away and not changes:
+            # navigate away before any changes have been made in the edit view
+            view.navigation.select('Compute', 'Infrastructure', 'Hosts',
+                                  handle_alert=False)
+            view = self.create_view(HostsView)
+            assert view.is_displayed
+            return
         changed = view.fill({
             "name": updates.get("name"),
             "hostname": updates.get("hostname") or updates.get("ip_address"),
@@ -136,7 +150,13 @@ def update(self, updates, validate_credentials=False, from_details=True):
             if validate_credentials:
                 view.endpoints.ipmi.validate_button.click()
         view.flash.assert_no_error()
-        changed = any([changed, credentials_changed, ipmi_credentials_changed])
+        if nav_away and changes:
+            # navigate away here after changes have been made in the edit view
+            view = navigate_to(self.parent, "All")
+            assert view.is_displayed
+            return
+        changed = False if cancel else any([changed, credentials_changed,
+                                            ipmi_credentials_changed])
         if changed:
             view.save_button.click()
             logger.debug("Trying to save update for host with id: %s", str(self.get_db_id))

cfme/tests/infrastructure/test_host.py

@@ -4,6 +4,7 @@
 import fauxfactory
 import pytest
 from wait_for import TimedOutError
+from widgetastic.exceptions import UnexpectedAlertPresentException
 
 from cfme import test_requirements
 from cfme.base.credential import Credential
@@ -86,7 +87,6 @@ def navigate_and_select_quads(provider):
 
     Returns:
         view: the provider nodes view, quadicons already selected"""
-    # TODO: prichard navigate instead of creating views and consider creaing EditableMixin
     hosts_view = navigate_to(provider, 'ProviderNodes')
     assert hosts_view.is_displayed
     [h.ensure_checked() for h in hosts_view.entities.get_all()]
@@ -462,6 +462,8 @@ def test_infrastructure_hosts_compare(appliance, setup_provider_min_hosts, provi
         casecomponent: Infra
         caseimportance: high
         initialEstimate: 1/6h
+    Bugzilla:
+        1746214
     """
 
     h_coll = locals()[hosts_collection].collections.hosts
@@ -487,6 +489,7 @@ def test_infrastructure_hosts_navigation_after_download_from_compare(
         initialEstimate: 1/3h
     Bugzilla:
         1747545
+
     """
     h_coll = locals()[hosts_collection].collections.hosts
     hosts_view = h_coll.compare_entities(provider, entities_list=h_coll.all()[:num_hosts])
@@ -526,26 +529,64 @@ def test_add_ipmi_refresh(appliance, setup_provider):
 
 
 @test_requirements.infra_hosts
-@pytest.mark.parametrize("crud_action", ['edit_from_hosts', 'edit_from_details', 'remove'])
+@pytest.mark.meta(automates=[1634794])
+@pytest.mark.parametrize("crud_action", ['edit_from_hosts', 'edit_from_details', 'cancel',
+                                         'nav_away_changes', 'nav_away_no_changes', 'remove'])
 def test_infrastructure_hosts_crud(appliance, setup_provider, crud_action):
     """
+    crud_action: (All are edit actions except for 'remove')
+        'edit_from_hosts'  : select host and click edit dropdown from the hosts view to edit
+        'edit_from_details' : click edit dropdown from the details view of host to edit
+        'cancel' : click the cancel button before saving edits
+        'nav_away_changes' : navigate away from the edit view after making changes (not saved)
+        'nav_away_no_changes' : navigate away from the edit view without having made changes
+        'remove' : remove the host
     Polarion:
         assignee: prichard
         casecomponent: Infra
         caseimportance: low
         initialEstimate: 1/6h
+    Bugzilla:
+        1634794
     """
     host = appliance.collections.hosts.all()[0]
-    if crud_action != 'remove':
-        stamp = fauxfactory.gen_alphanumeric()
-        new_custom_id = f'Edit host data. {stamp}'
-
-        with update(host, from_details=(crud_action == 'edit_from_details')):
-            host.custom_ident = new_custom_id
-
-        assert host.custom_ident == new_custom_id
-        assert navigate_to(host, 'Details').entities.summary("Properties").get_text_of(
-            "Custom Identifier") == new_custom_id
-    else:
-        host.delete()
+    if crud_action == 'remove':
+        host.delete(cancel=True)
         host.delete(cancel=False)
+    else:
+        if crud_action in ['cancel', 'nav_away_changes', 'nav_away_no_changes']:
+            # In these cases we need to capture the existing/initial custom id to check later that
+            # no changes were made.
+            try:
+                existing_custom_id = navigate_to(host, 'Details').entities.summary(
+                    "Properties").get_text_of("Custom Identifier")
+            except NameError:
+                existing_custom_id = None
+        # begin core/common edit steps
+        new_custom_id = f'Edit host data. {fauxfactory.gen_alphanumeric()}'
+        try:
+            with update(host,
+                        from_hosts=(crud_action == 'edit_from_hosts'),
+                        cancel=(crud_action == 'cancel'),
+                        nav_away=(crud_action in ['nav_away_changes', 'nav_away_no_changes']),
+                        changes=(crud_action == 'nav_away_changes')
+                        ):
+                host.custom_ident = new_custom_id
+        except UnexpectedAlertPresentException as e:
+            if crud_action in ['cancel', 'nav_away_no_changes'] and "Abandon changes" in e.msg:
+                pytest.fail("Abandon changes alert displayed, but no changes made. BZ1634794")
+            else:
+                raise
+        # now verify changes were made or not made according to scenario
+        if crud_action in ['cancel', 'nav_away_changes', 'nav_away_no_changes']:
+            # No changes are expected. Comparing to existing value captured above.
+            try:
+                assert navigate_to(host, 'Details').entities.summary("Properties").get_text_of(
+                    "Custom Identifier") == existing_custom_id
+            except NameError:
+                if existing_custom_id:
+                    raise
+        else:
+            # Changes are expected so compare to edited value.
+            assert navigate_to(host, 'Details').entities.summary("Properties").get_text_of(
+                "Custom Identifier") == new_custom_id