Rename Bay to Cluster in functional tests

This patch updates the functional tests to use the client cluster
commands instead of bay commands. Bay and BayModel tests remain
in the functional API tests to test backwards compatiblity, but
all other functional tests will use the new Cluster and
ClusterTemplate versions.

Change-Id: Ib86f39caba04b7e81754da2db51d36470c4f3660
Implements: blueprint rename-bay-to-cluster

magnum/tests/functional/api/base.py

@@ -153,7 +153,7 @@ class BaseTempestTest(base.BaseMagnumTest):
 
         :param name: name, will be used for dynamic creds
         :param type_of_creds: admin, alt or default
-        :param request_type: baymodel or service
+        :param request_type: ClusterTemplate or service
         :returns: MagnumClient -- client with isolated creds.
         :returns: KeypairClient -- allows for creating of keypairs
         """

magnum/tests/functional/api/v1/test_cluster.py

@@ -156,7 +156,7 @@ class ClusterTest(base.BaseTempestTest):
             cluster_model.uuid)
         self.LOG.debug("cert resp: %s" % resp)
         self.assertEqual(200, resp.status)
-        self.assertEqual(cert_model.bay_uuid, cluster_model.uuid)
+        self.assertEqual(cert_model.cluster_uuid, cluster_model.uuid)
         self.assertIsNotNone(cert_model.pem)
         self.assertIn('-----BEGIN CERTIFICATE-----', cert_model.pem)
         self.assertIn('-----END CERTIFICATE-----', cert_model.pem)

magnum/tests/functional/common/base.py

@@ -36,7 +36,7 @@ class BaseMagnumTest(base.BaseTestCase):
     def copy_logs_handler(cls, get_nodes_fn, coe, keypair):
         """Copy logs closure.
 
-        This method will retrieve all running nodes for a specified bay
+        This method will retrieve all running nodes for a specified cluster
         and copy addresses from there locally.
 
         :param get_nodes_fn: function that takes no parameters and returns
@@ -49,7 +49,7 @@ class BaseMagnumTest(base.BaseTestCase):
                 cls.LOG.info(_LI("Copying logs..."))
                 fn = exec_info[2].tb_frame.f_locals['fn']
                 func_name = fn.im_self._get_test_method().__name__
-                msg = (_LE("Failed to copy logs for bay"))
+                msg = (_LE("Failed to copy logs for cluster"))
                 nodes_addresses = get_nodes_fn()
 
                 master_nodes = nodes_addresses[0]
@@ -79,12 +79,13 @@ class BaseMagnumTest(base.BaseTestCase):
                             ])
                         except Exception:
                             cls.LOG.error(msg)
-                            msg = (_LE("failed to copy from %(node_address)s "
-                                       "to %(base_path)s%(log_name)s-"
-                                       "%(node_address)s") %
-                                   {'node_address': node_address,
-                                    'base_path': "/opt/stack/logs/bay-nodes/",
-                                    'log_name': log_name})
+                            msg = (
+                                _LE("failed to copy from %(node_address)s "
+                                    "to %(base_path)s%(log_name)s-"
+                                    "%(node_address)s") %
+                                {'node_address': node_address,
+                                 'base_path': "/opt/stack/logs/cluster-nodes/",
+                                 'log_name': log_name})
                             cls.LOG.exception(msg)
 
                 do_copy_logs('master', master_nodes)

magnum/tests/functional/common/datagen.py

@@ -390,7 +390,7 @@ def cluster_template_remove_patch_data(path):
     """Generates ClusterTempalte patch data by removing value
 
     :param path: path to remove
-    :returns: BayModelPatchCollection with generated data
+    :returns: ClusterTemplatePatchCollection with generated data
     """
 
     data = [{

magnum/tests/functional/tempest_tests/config.py

@@ -30,7 +30,7 @@ magnum_group = cfg.OptGroup(name="magnum", title="Magnum Options")
 MagnumGroup = [
     cfg.StrOpt("image_id",
                default="fedora-atomic-latest",
-               help="Image id to be used for baymodel."),
+               help="Image id to be used for ClusterTemplate."),
 
     cfg.StrOpt("nic_id",
                default="public",
@@ -42,7 +42,7 @@ MagnumGroup = [
 
     cfg.StrOpt("flavor_id",
                default="s1.magnum",
-               help="Flavor id to use for baymodels."),
+               help="Flavor id to use for ClusterTemplate."),
 
     cfg.StrOpt("magnum_url",
                default=None,
@@ -50,7 +50,7 @@ MagnumGroup = [
 
     cfg.StrOpt("master_flavor_id",
                default="m1.magnum",
-               help="Master flavor id to use for baymodels."),
+               help="Master flavor id to use for ClusterTemplate."),
 
     cfg.StrOpt("csr_location",
                default="/opt/stack/new/magnum/default.csr",
@@ -60,7 +60,7 @@ MagnumGroup = [
 
     cfg.StrOpt("dns_nameserver",
                default="8.8.8.8",
-               help="DNS nameserver to use for baymodels."),
+               help="DNS nameserver to use for ClusterTemplate."),
 
     cfg.StrOpt("copy_logs",
                default=True,