From 07a8afaf554880e6a55b1db9a969f053d243f1c3 Mon Sep 17 00:00:00 2001 From: Kyrylo Romanenko Date: Mon, 29 May 2017 15:01:48 +0300 Subject: [PATCH] Skip checking of Devstack hosts Screen is not used in Devstack anymore. Change-Id: I7baf1af1d2951afe0fc0927e3f14b0c21b38ea4c --- os_faults/drivers/devstack.py | 8 +++----- os_faults/tests/unit/drivers/test_devstack.py | 9 --------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/os_faults/drivers/devstack.py b/os_faults/drivers/devstack.py index 5371f24..ae2fa58 100644 --- a/os_faults/drivers/devstack.py +++ b/os_faults/drivers/devstack.py @@ -247,11 +247,9 @@ class DevStackManagement(cloud_management.CloudManagement, def verify(self): """Verify connection to the cloud.""" nodes = self.get_nodes() - task = {'shell': 'screen -ls | grep -P "\\d+\\.stack"'} - results = self.execute_on_cloud(nodes.hosts, task) - hostnames = [result.host for result in results] - LOG.debug('DevStack hostnames: %s', hostnames) - LOG.info('Connected to cloud successfully') + if nodes: + LOG.debug('DevStack nodes: %s', nodes) + LOG.info('Connected to cloud successfully') def execute_on_cloud(self, hosts, task, raise_on_error=True): """Execute task on specified hosts within the cloud. diff --git a/os_faults/tests/unit/drivers/test_devstack.py b/os_faults/tests/unit/drivers/test_devstack.py index 7e2cd72..a916e1e 100644 --- a/os_faults/tests/unit/drivers/test_devstack.py +++ b/os_faults/tests/unit/drivers/test_devstack.py @@ -68,8 +68,6 @@ class DevStackManagementTestCase(test.TestCase): ansible_runner_inst.execute.assert_has_calls([ mock.call([self.host], {'command': 'cat /sys/class/net/eth0/address'}), - mock.call([self.discoverd_host], - {'shell': 'screen -ls | grep -P "\\d+\\.stack"'}) ]) @mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True) @@ -98,16 +96,9 @@ class DevStackManagementTestCase(test.TestCase): node_collection.Host('10.0.0.3'), node_collection.Host('10.0.0.4') ] - discoverd_hosts = [ - node_collection.Host('10.0.0.2', mac='mac1', fqdn=''), - node_collection.Host('10.0.0.3', mac='mac2', fqdn=''), - node_collection.Host('10.0.0.4', mac='mac3', fqdn='') - ] ansible_runner_inst.execute.assert_has_calls([ mock.call(hosts, {'command': 'cat /sys/class/net/eth0/address'}), - mock.call(discoverd_hosts, - {'shell': 'screen -ls | grep -P "\\d+\\.stack"'}) ]) @mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)