openstack
/
magnum
Code Issues Proposed changes

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
This commit is contained in:
Jaycen Grant 2016-08-29 15:54:03 -07:00
parent 4650a4b5a1
commit 8a6c6a32c2
12 changed files with 113 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/tests/functional/api/base.py
View File

@ -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
"""

2
magnum/tests/functional/api/v1/test_cluster.py
View File

@ -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)

17
magnum/tests/functional/common/base.py
View File

@ -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)

2
magnum/tests/functional/common/datagen.py
View File

@ -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 = [{

2
magnum/tests/functional/k8s/test_k8s_python_client.py
View File

@ -14,7 +14,7 @@ from magnum.tests.functional import python_client_base as base
class TestKubernetesAPIs(base.BaseK8sTest):
baymodel_kwargs = {
cluster_template_kwargs = {
"tls_disabled": False,
"network_driver": 'flannel',
"volume_driver": 'cinder',

8
magnum/tests/functional/k8s/test_magnum_python_client.py
View File

@ -15,8 +15,8 @@ from magnum.tests.functional.python_client_base import BaseMagnumClient
class TestListResources(BaseMagnumClient):
def test_bay_model_list(self):
self.assertIsNotNone(self.cs.baymodels.list())
def test_cluster_model_list(self):
self.assertIsNotNone(self.cs.cluster_templates.list())
def test_bay_list(self):
self.assertIsNotNone(self.cs.bays.list())
def test_cluster_list(self):
self.assertIsNotNone(self.cs.clusters.list())

2
magnum/tests/functional/k8s_coreos/test_k8s_python_client.py
View File

@ -14,7 +14,7 @@ from magnum.tests.functional import python_client_base as base
class TestCoreosKubernetesAPIs(base.BaseK8sTest):
baymodel_kwargs = {
cluster_template_kwargs = {
"tls_disabled": True,
"network_driver": 'flannel',
"volume_driver": None,

4
magnum/tests/functional/k8s_ironic/test_k8s_python_client.py
View File

@ -14,8 +14,8 @@ from magnum.tests.functional import python_client_base as base
class TestFedoraKubernetesIronicAPIs(base.BaseK8sTest):
bay_complete_timeout = 3200
baymodel_kwargs = {
cluster_complete_timeout = 3200
cluster_template_kwargs = {
"tls_disabled": True,
"network_driver": 'flannel',
"volume_driver": None,

8
magnum/tests/functional/mesos/test_mesos_python_client.py
View File

@ -10,16 +10,16 @@
# License for the specific language governing permissions and limitations
# under the License.
from magnum.tests.functional.python_client_base import BayTest
from magnum.tests.functional.python_client_base import ClusterTest
class TestBayResource(BayTest):
class TestClusterResource(ClusterTest):
coe = 'mesos'
baymodel_kwargs = {
cluster_template_kwargs = {
"tls_disabled": True,
"network_driver": 'docker',
"volume_driver": 'rexray'
}
def test_bay_create_and_delete(self):
def test_cluster_create_and_delete(self):
pass

129
magnum/tests/functional/python_client_base.py
View File

@ -110,12 +110,13 @@ class BaseMagnumClient(base.BaseMagnumTest):
cls.heat = heatclient.Client('1', token=token, endpoint=heat_endpoint)
@classmethod
def _wait_on_status(cls, bay, wait_status, finish_status, timeout=6000):
def _wait_on_status(cls, cluster, wait_status, finish_status,
timeout=6000):
# Check status every 60 seconds for a total of 100 minutes
def _check_status():
status = cls.cs.bays.get(bay.uuid).status
cls.LOG.debug("Bay status is %s" % status)
status = cls.cs.clusters.get(cluster.uuid).status
cls.LOG.debug("Cluster status is %s" % status)
if status in wait_status:
return False
elif status in finish_status:
@ -123,16 +124,17 @@ class BaseMagnumClient(base.BaseMagnumTest):
else:
raise Exception("Unexpected Status: %s" % status)
# sleep 1s to wait bay status changes, this will be useful for
# sleep 1s to wait cluster status changes, this will be useful for
# the first time we wait for the status, to avoid another 59s
time.sleep(1)
utils.wait_for_condition(_check_status, interval=60, timeout=timeout)
@classmethod
def _create_baymodel(cls, name, **kwargs):
def _create_cluster_template(cls, name, **kwargs):
# TODO(eliqiao): We don't want these to be have default values,
# just leave them here to make things work.
# Plan is to support other kinds of baymodel creation.
# Plan is to support other kinds of ClusterTemplate
# creation.
coe = kwargs.pop('coe', 'kubernetes')
docker_volume_size = kwargs.pop('docker_volume_size', 3)
network_driver = kwargs.pop('network_driver', 'flannel')
@ -142,7 +144,7 @@ class BaseMagnumClient(base.BaseMagnumTest):
fixed_subnet = kwargs.pop('fixed_subnet', None)
server_type = kwargs.pop('server_type', 'vm')
baymodel = cls.cs.baymodels.create(
cluster_template = cls.cs.cluster_templates.create(
name=name,
keypair_id=cls.keypair_id,
external_network_id=cls.nic_id,
@ -159,33 +161,33 @@ class BaseMagnumClient(base.BaseMagnumTest):
fixed_subnet=fixed_subnet,
server_type=server_type,
**kwargs)
return baymodel
return cluster_template
@classmethod
def _create_bay(cls, name, baymodel_uuid):
bay = cls.cs.bays.create(
def _create_cluster(cls, name, cluster_template_uuid):
cluster = cls.cs.clusters.create(
name=name,
baymodel_id=baymodel_uuid
cluster_template_id=cluster_template_uuid
)
return bay
return cluster
@classmethod
def _show_bay(cls, name):
bay = cls.cs.bays.get(name)
return bay
def _show_cluster(cls, name):
cluster = cls.cs.clusters.get(name)
return cluster
@classmethod
def _delete_baymodel(cls, baymodel_uuid):
cls.cs.baymodels.delete(baymodel_uuid)
def _delete_cluster_template(cls, cluster_template_uuid):
cls.cs.cluster_templates.delete(cluster_template_uuid)
@classmethod
def _delete_bay(cls, bay_uuid):
cls.cs.bays.delete(bay_uuid)
def _delete_cluster(cls, cluster_uuid):
cls.cs.clusters.delete(cluster_uuid)
try:
cls._wait_on_status(
cls.bay,
cls.cluster,
["CREATE_COMPLETE", "DELETE_IN_PROGRESS", "CREATE_FAILED"],
["DELETE_FAILED", "DELETE_COMPLETE"],
timeout=600
@ -193,32 +195,32 @@ class BaseMagnumClient(base.BaseMagnumTest):
except exceptions.NotFound:
pass
else:
if cls._show_bay(cls.bay.uuid).status == 'DELETE_FAILED':
raise Exception("bay %s delete failed" % cls.bay.uuid)
if cls._show_cluster(cls.clustser.uuid).status == 'DELETE_FAILED':
raise Exception("Cluster %s delete failed" % cls.cluster.uuid)
@classmethod
def get_copy_logs(cls):
return cls.copy_logs
def _wait_for_bay_complete(self, bay):
def _wait_for_cluster_complete(self, cluster):
self._wait_on_status(
bay,
cluster,
[None, "CREATE_IN_PROGRESS"],
["CREATE_FAILED", "CREATE_COMPLETE"],
timeout=self.bay_complete_timeout
timeout=self.cluster_complete_timeout
)
if self.cs.bays.get(bay.uuid).status == 'CREATE_FAILED':
raise Exception("bay %s created failed" % bay.uuid)
if self.cs.clusters.get(cluster.uuid).status == 'CREATE_FAILED':
raise Exception("Cluster %s created failed" % cluster.uuid)
return bay
return cluster
class BayTest(BaseMagnumClient):
class ClusterTest(BaseMagnumClient):
# NOTE (eliqiao) coe should be specified in subclasses
coe = None
baymodel_kwargs = {}
cluster_template_kwargs = {}
config_contents = """[req]
distinguished_name = req_distinguished_name
req_extensions = req_ext
@ -230,35 +232,36 @@ extendedKeyUsage = clientAuth
"""
ca_dir = None
bay = None
baymodel = None
cluster = None
cluster_template = None
key_file = None
cert_file = None
ca_file = None
bay_complete_timeout = 1800
cluster_complete_timeout = 1800
@classmethod
def setUpClass(cls):
super(BayTest, cls).setUpClass()
cls.baymodel = cls._create_baymodel(
cls.__name__, coe=cls.coe, **cls.baymodel_kwargs)
cls.bay = cls._create_bay(cls.__name__, cls.baymodel.uuid)
if not cls.baymodel_kwargs.get('tls_disabled', False):
super(ClusterTest, cls).setUpClass()
cls.cluster_template = cls._create_cluster_template(
cls.__name__, coe=cls.coe, **cls.cluster_template_kwargs)
cls.cluster = cls._create_cluster(cls.__name__,
cls.cluster_template.uuid)
if not cls.cluster_template_kwargs.get('tls_disabled', False):
cls._create_tls_ca_files(cls.config_contents)
@classmethod
def tearDownClass(cls):
if cls.ca_dir:
rmtree_without_raise(cls.ca_dir)
if cls.bay:
cls._delete_bay(cls.bay.uuid)
if cls.baymodel:
cls._delete_baymodel(cls.baymodel.uuid)
super(BayTest, cls).tearDownClass()
if cls.cluster:
cls._delete_cluster(cls.cluster.uuid)
if cls.cluster_template:
cls._delete_cluster_template(cls.cluster_template.uuid)
super(ClusterTest, cls).tearDownClass()
def setUp(self):
super(BayTest, self).setUp()
super(ClusterTest, self).setUp()
test_timeout = os.environ.get('OS_TEST_TIMEOUT', 60)
try:
@ -275,37 +278,38 @@ extendedKeyUsage = clientAuth
self.addOnException(
self.copy_logs_handler(
self._get_nodes,
self.baymodel.coe,
self.cluster_template.coe,
'default'))
self._wait_for_bay_complete(self.bay)
self._wait_for_cluster_complete(self.cluster)
def _get_nodes(self):
nodes = self._get_nodes_from_bay()
nodes = self._get_nodes_from_cluster()
if not [x for x in nodes if x]:
self.LOG.info(_LI("the list of nodes from bay is empty"))
self.LOG.info(_LI("the list of nodes from cluster is empty"))
nodes = self._get_nodes_from_stack()
if not [x for x in nodes if x]:
self.LOG.info(_LI("the list of nodes from stack is empty"))
self.LOG.info(_LI("Nodes are: %s") % nodes)
return nodes
def _get_nodes_from_bay(self):
def _get_nodes_from_cluster(self):
nodes = []
nodes.append(self.cs.bays.get(self.bay.uuid).master_addresses)
nodes.append(self.cs.bays.get(self.bay.uuid).node_addresses)
nodes.append(self.cs.clusters.get(self.cluster.uuid).master_addresses)
nodes.append(self.cs.clusters.get(self.cluster.uuid).node_addresses)
return nodes
def _get_nodes_from_stack(self):
nodes = []
stack = self.heat.stacks.get(self.bay.stack_id)
stack = self.heat.stacks.get(self.cluster.stack_id)
stack_outputs = stack.to_dict().get('outputs', [])
output_keys = []
if self.baymodel.coe == "kubernetes":
if self.cluster_template.coe == "kubernetes":
output_keys = ["kube_masters", "kube_minions"]
elif self.baymodel.coe == "swarm":
elif self.cluster_template.coe == "swarm":
output_keys = ["swarm_masters", "swarm_nodes"]
elif self.baymodel.coe == "mesos":
elif self.cluster_template.coe == "mesos":
output_keys = ["mesos_master", "mesos_slaves"]
for output in stack_outputs:
for key in output_keys:
if output['output_key'] == key:
@ -345,26 +349,27 @@ extendedKeyUsage = clientAuth
with open(cls.csr_file, 'r') as f:
csr_content = f.read()
# magnum ca-sign --bay secure-k8sbay --csr client.csr > client.crt
resp = cls.cs.certificates.create(bay_uuid=cls.bay.uuid,
# magnum ca-sign --cluster secure-k8scluster --csr client.csr \
# > client.crt
resp = cls.cs.certificates.create(cluster_uuid=cls.cluster.uuid,
csr=csr_content)
with open(cls.cert_file, 'w') as f:
f.write(resp.pem)
# magnum ca-show --bay secure-k8sbay > ca.crt
resp = cls.cs.certificates.get(cls.bay.uuid)
# magnum ca-show --cluster secure-k8scluster > ca.crt
resp = cls.cs.certificates.get(cls.cluster.uuid)
with open(cls.ca_file, 'w') as f:
f.write(resp.pem)
class BaseK8sTest(BayTest):
class BaseK8sTest(ClusterTest):
coe = 'kubernetes'
@classmethod
def setUpClass(cls):
super(BaseK8sTest, cls).setUpClass()
cls.kube_api_url = cls.cs.bays.get(cls.bay.uuid).api_address
cls.kube_api_url = cls.cs.clusters.get(cls.cluster.uuid).api_address
k8s_client = api_client.ApiClient(cls.kube_api_url,
key_file=cls.key_file,
cert_file=cls.cert_file,
@ -373,7 +378,7 @@ class BaseK8sTest(BayTest):
def setUp(self):
super(BaseK8sTest, self).setUp()
self.kube_api_url = self.cs.bays.get(self.bay.uuid).api_address
self.kube_api_url = self.cs.clusters.get(self.cluster.uuid).api_address
k8s_client = api_client.ApiClient(self.kube_api_url,
key_file=self.key_file,
cert_file=self.cert_file,

36
magnum/tests/functional/swarm/test_swarm_python_client.py
View File

@ -18,7 +18,7 @@ from requests import exceptions as req_exceptions
from magnum.common import docker_utils
from magnum.i18n import _LI
from magnum.tests.functional.python_client_base import BayTest
from magnum.tests.functional.python_client_base import ClusterTest
CONF = cfg.CONF
@ -28,14 +28,14 @@ CONF.import_opt('default_timeout', 'magnum.common.docker_utils',
group='docker')
class TestSwarmAPIs(BayTest):
"""This class will cover swarm bay basic functional testing.
class TestSwarmAPIs(ClusterTest):
"""This class will cover swarm cluster basic functional testing.
Will test all kinds of container action with tls_disabled=False mode.
"""
coe = "swarm"
baymodel_kwargs = {
cluster_template_kwargs = {
"tls_disabled": False,
"network_driver": None,
"volume_driver": None,
@ -46,31 +46,31 @@ class TestSwarmAPIs(BayTest):
@classmethod
def setUpClass(cls):
super(TestSwarmAPIs, cls).setUpClass()
cls.bay_is_ready = None
cls.cluster_is_ready = None
def setUp(self):
super(TestSwarmAPIs, self).setUp()
if self.bay_is_ready is True:
if self.cluster_is_ready is True:
return
# Note(eliqiao): In our test cases, docker client or magnum client will
# try to connect to swarm service which is running on master node,
# the endpoint is bay.api_address(listen port is included), but the
# service is not ready right after the bay was created, sleep for an
# acceptable time to wait for service being started.
# the endpoint is cluster.api_address(listen port is included), but the
# service is not ready right after the cluster was created, sleep for
# an acceptable time to wait for service being started.
# This is required, without this any api call will fail as
# 'ConnectionError: [Errno 111] Connection refused'.
msg = ("If you see this error in the functional test, it means "
"the docker service took too long to come up. This may not "
"be an actual error, so an option is to rerun the "
"functional test.")
if self.bay_is_ready is False:
if self.cluster_is_ready is False:
# In such case, no need to test below cases on gate, raise a
# meanful exception message to indicate ca setup failed after
# bay creation, better to do a `recheck`
# We don't need to test since bay is not ready.
# cluster creation, better to do a `recheck`
# We don't need to test since cluster is not ready.
raise Exception(msg)
url = self.cs.bays.get(self.bay.uuid).api_address
url = self.cs.clusters.get(self.cluster.uuid).api_address
# Note(eliqiao): docker_utils.CONF.docker.default_timeout is 10,
# tested this default configure option not works on gate, it will
@ -93,9 +93,9 @@ class TestSwarmAPIs(BayTest):
docker_api_time_out)
def _container_operation(self, func, *args, **kwargs):
# NOTE(hongbin): Swarm bay occasionally aborts the connection, so we
# re-try the operation several times here. In long-term, we need to
# investigate the cause of this issue. See bug #1583337.
# NOTE(hongbin): Swarm cluster occasionally aborts the connection,
# so we re-try the operation several times here. In long-term, we
# need to investigate the cause of this issue. See bug #1583337.
for i in range(150):
try:
self.LOG.info(_LI("Calling function ") + func.__name__)
@ -118,8 +118,8 @@ class TestSwarmAPIs(BayTest):
image=image, command=command)
def test_start_stop_container_from_api(self):
# Leverage docker client to create a container on the bay we created,
# and try to start and stop it then delete it.
# Leverage docker client to create a container on the cluster we
# created, and try to start and stop it then delete it.
resp = self._create_container(image="docker.io/cirros",
command="ping -c 1000 8.8.8.8")

8
magnum/tests/functional/tempest_tests/config.py
View File

@ -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,