openstack
/
magnum
Code Issues Proposed changes

Copy logs if test failed and bay nodes existed 

If the bay is pending on CREATE_IN_PROCESS, it won't contain the
IP addresses of the nodes. Therefore, we need to get them from
the Heat stack if missing.

Closes-Bug: #1571272
Change-Id: I487f9000b4c229be3e1b576258473e39cda66f9e
This commit is contained in:
Hongbin Lu 2016-04-16 14:51:23 -04:00
parent 391614e7bf
commit d1263387a6
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,7 @@ class BaseMagnumTest(base.BaseTestCase):
def int_copy_logs(exec_info):
try:
cls.LOG.debug("Copying logs...")
cls.LOG.info("Copying logs...")
fn = exec_info[2].tb_frame.f_locals['fn']
func_name = fn.im_self._get_test_method().__name__
msg = "Failed to copy logs for bay"
@ -199,6 +199,8 @@ class BaseMagnumTest(base.BaseTestCase):
full_location = os.path.join(base_path, COPY_LOG_HELPER)
def do_copy_logs(prefix, nodes_address):
cls.LOG.info("copy logs from : %s" %
','.join(nodes_address))
log_name = prefix + "-" + func_name
for node_address in nodes_address:
try:
@ -212,7 +214,7 @@ class BaseMagnumTest(base.BaseTestCase):
str(keypair)
])
except Exception:
cls.LOG.exception(msg)
cls.LOG.error(msg)
cls.LOG.exception(
"failed to copy from %s to %s%s-%s" %
(node_address, "/opt/stack/logs/bay-nodes/",

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

@ -25,6 +25,8 @@ import time
import fixtures
from six.moves import configparser
from heatclient import client as heatclient
from keystoneclient.v2_0 import client as ksclient
from magnum.common.utils import rmtree_without_raise
from magnum.tests.functional.common import base
from magnum.tests.functional.common import utils
@ -94,6 +96,14 @@ class BaseMagnumClient(base.BaseMagnumTest):
service_type='container',
region_name=region_name,
magnum_url=magnum_url)
cls.keystone = ksclient.Client(username=user,
password=passwd,
tenant_name=tenant,
auth_url=auth_url)
token = cls.keystone.auth_token
heat_endpoint = cls.keystone.service_catalog.url_for(
service_type='orchestration')
cls.heat = heatclient.Client('1', token=token, endpoint=heat_endpoint)
@classmethod
def _wait_on_status(cls, bay, wait_status, finish_status, timeout=6000):
@ -248,12 +258,41 @@ extendedKeyUsage = clientAuth
self.addOnException(
self.copy_logs_handler(
lambda: list([self.cs.bays.get(self.bay.uuid).master_addresses,
self.cs.bays.get(self.bay.uuid).node_addresses]),
self._get_nodes,
self.baymodel.coe,
'default'))
self._wait_for_bay_complete(self.bay)
def _get_nodes(self):
nodes = self._get_nodes_from_bay()
if not nodes:
self.LOG.info("the list of nodes from bay is empty")
nodes = self._get_nodes_from_stack()
return nodes
def _get_nodes_from_bay(self):
nodes = []
nodes.append(self.cs.bays.get(self.bay.uuid).master_addresses)
nodes.append(self.cs.bays.get(self.bay.uuid).node_addresses)
return nodes
def _get_nodes_from_stack(self):
nodes = []
stack = self.heat.stacks.get(self.bay.stack_id)
stack_outputs = stack.to_dict().get('outputs', [])
output_keys = []
if self.baymodel.coe == "kubernetes":
output_keys = ["kube_masters", "kube_minions"]
elif self.baymodel.coe == "swarm":
output_keys = ["swarm_masters", "swarm_nodes"]
elif self.baymodel.coe == "mesos":
output_keys = ["mesos_master", "mesos_slaves"]
for output in stack_outputs:
for key in output_keys:
if output['output_key'] == key:
nodes.append(output['output_value'])
return nodes
@classmethod
def _create_tls_ca_files(cls, client_conf_contents):
"""Creates ca files by client_conf_contents."""