Merge "Fix copying logs from nodes"
This commit is contained in:
commit
35bec1887c
|
@ -58,6 +58,9 @@ class BaseMagnumTest(base.BaseTestCase):
|
||||||
full_location = os.path.join(base_path, COPY_LOG_HELPER)
|
full_location = os.path.join(base_path, COPY_LOG_HELPER)
|
||||||
|
|
||||||
def do_copy_logs(prefix, nodes_address):
|
def do_copy_logs(prefix, nodes_address):
|
||||||
|
if not nodes_address:
|
||||||
|
return
|
||||||
|
|
||||||
cls.LOG.info("copy logs from : %s" %
|
cls.LOG.info("copy logs from : %s" %
|
||||||
','.join(nodes_address))
|
','.join(nodes_address))
|
||||||
log_name = prefix + "-" + func_name
|
log_name = prefix + "-" + func_name
|
||||||
|
|
|
@ -274,9 +274,12 @@ extendedKeyUsage = clientAuth
|
||||||
|
|
||||||
def _get_nodes(self):
|
def _get_nodes(self):
|
||||||
nodes = self._get_nodes_from_bay()
|
nodes = self._get_nodes_from_bay()
|
||||||
if not nodes:
|
if not [x for x in nodes if x]:
|
||||||
self.LOG.info("the list of nodes from bay is empty")
|
self.LOG.info("the list of nodes from bay is empty")
|
||||||
nodes = self._get_nodes_from_stack()
|
nodes = self._get_nodes_from_stack()
|
||||||
|
if not [x for x in nodes if x]:
|
||||||
|
self.LOG.info("the list of nodes from stack is empty")
|
||||||
|
self.LOG.info("Nodes are: %s" % nodes)
|
||||||
return nodes
|
return nodes
|
||||||
|
|
||||||
def _get_nodes_from_bay(self):
|
def _get_nodes_from_bay(self):
|
||||||
|
|
Loading…
Reference in New Issue