Fix policyd call to _login

8681b023 changed the signature of _login but did not update the
policyd test. This was not immediately picked up because the
policyd test is skipped before groovy due to Bug #1880959

Closes-Bug: #1911923

zaza/openstack/charm_tests/openstack_dashboard/tests.py

@@ -67,7 +67,6 @@ def _login(dashboard_url, domain, username, password, cafile=None):
     # start session, get csrftoken
     client = requests.session()
     client.get(auth_url, verify=cafile)
-
     if 'csrftoken' in client.cookies:
         csrftoken = client.cookies['csrftoken']
     else:
@@ -163,7 +162,60 @@ def _do_request(request, cafile=None):
     return urllib.request.urlopen(request, cafile=cafile)
 
 
-class OpenStackDashboardTests(test_utils.OpenStackBaseTest):
+class OpenStackDashboardBase():
+    """Mixin for interacting with Horizon."""
+
+    def get_base_url(self):
+        """Return the base url for http(s) requests.
+
+        :returns: URL
+        :rtype: str
+        """
+        vip = (zaza_model.get_application_config(self.application_name)
+               .get("vip").get("value"))
+        if vip:
+            ip = vip
+        else:
+            unit = zaza_model.get_unit_from_name(
+                zaza_model.get_lead_unit_name(self.application_name))
+            ip = unit.public_address
+
+        logging.debug("Dashboard ip is:{}".format(ip))
+        scheme = 'http'
+        if self.use_https:
+            scheme = 'https'
+        url = '{}://{}'.format(scheme, ip)
+        return url
+
+    def get_horizon_url(self):
+        """Return the url for acccessing horizon.
+
+        :returns: Horizon URL
+        :rtype: str
+        """
+        url = '{}/horizon'.format(self.get_base_url())
+        logging.info("Horizon URL is: {}".format(url))
+        return url
+
+    @property
+    def use_https(self):
+        """Whether dashboard is using https.
+
+        :returns: Whether dashboard is using https
+        :rtype: boolean
+        """
+        use_https = False
+        vault_relation = zaza_model.get_relation_id(
+            self.application,
+            'vault',
+            remote_interface_name='certificates')
+        if vault_relation:
+            use_https = True
+        return use_https
+
+
+class OpenStackDashboardTests(test_utils.OpenStackBaseTest,
+                              OpenStackDashboardBase):
     """Encapsulate openstack dashboard charm tests."""
 
     @classmethod
@@ -171,13 +223,6 @@ class OpenStackDashboardTests(test_utils.OpenStackBaseTest):
         """Run class setup for running openstack dashboard charm tests."""
         super(OpenStackDashboardTests, cls).setUpClass()
         cls.application = 'openstack-dashboard'
-        cls.use_https = False
-        vault_relation = zaza_model.get_relation_id(
-            cls.application,
-            'vault',
-            remote_interface_name='certificates')
-        if vault_relation:
-            cls.use_https = True
 
     def test_050_local_settings_permissions_regression_check_lp1755027(self):
         """Assert regression check lp1755027.
@@ -302,39 +347,6 @@ class OpenStackDashboardTests(test_utils.OpenStackBaseTest):
                         mismatches.append(msg)
         return mismatches
 
-    def get_base_url(self):
-        """Return the base url for http(s) requests.
-
-        :returns: URL
-        :rtype: str
-        """
-        vip = (zaza_model.get_application_config(self.application_name)
-               .get("vip").get("value"))
-        if vip:
-            ip = vip
-        else:
-            unit = zaza_model.get_unit_from_name(
-                zaza_model.get_lead_unit_name(self.application_name))
-            ip = unit.public_address
-
-        logging.debug("Dashboard ip is:{}".format(ip))
-        scheme = 'http'
-        if self.use_https:
-            scheme = 'https'
-        url = '{}://{}'.format(scheme, ip)
-        logging.debug("Base URL is: {}".format(url))
-        return url
-
-    def get_horizon_url(self):
-        """Return the url for acccessing horizon.
-
-        :returns: Horizon URL
-        :rtype: str
-        """
-        url = '{}/horizon'.format(self.get_base_url())
-        logging.info("Horizon URL is: {}".format(url))
-        return url
-
     def test_400_connection(self):
         """Test that dashboard responds to http request.
 
@@ -450,7 +462,8 @@ class OpenStackDashboardTests(test_utils.OpenStackBaseTest):
             logging.info("Testing pause resume")
 
 
-class OpenStackDashboardPolicydTests(policyd.BasePolicydSpecialization):
+class OpenStackDashboardPolicydTests(policyd.BasePolicydSpecialization,
+                                     OpenStackDashboardBase):
     """Test the policyd override using the dashboard."""
 
     good = {
@@ -476,6 +489,7 @@ class OpenStackDashboardPolicydTests(policyd.BasePolicydSpecialization):
         super(OpenStackDashboardPolicydTests, cls).setUpClass(
             application_name="openstack-dashboard")
         cls.application_name = "openstack-dashboard"
+        cls.application = cls.application_name
 
     def get_client_and_attempt_operation(self, ip):
         """Attempt to list users on the openstack-dashboard service.
@@ -500,7 +514,7 @@ class OpenStackDashboardPolicydTests(policyd.BasePolicydSpecialization):
         username = 'admin',
         password = overcloud_auth['OS_PASSWORD'],
         client, response = _login(
-            unit.public_address, domain, username, password)
+            self.get_horizon_url(), domain, username, password)
         # now attempt to get the domains page
         _url = self.url.format(unit.public_address)
         result = client.get(_url)