diff options
| -rw-r--r-- | baro_tests/collectd.py | 9 | ||||
| -rw-r--r-- | baro_tests/config_server.py | 14 |
2 files changed, 17 insertions, 6 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py index f07b4cea..8d127052 100644 --- a/baro_tests/collectd.py +++ b/baro_tests/collectd.py @@ -11,7 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# Patch on October 05 2017 +# Patch on October 09 2017 """Executing test of plugins""" @@ -743,8 +743,9 @@ def main(bt_logger=None): create_ovs_bridge() gnocchi_running_on_con = False aodh_running_on_con = False - snmp_running = True - _print_label('Testing Gnocchi, AODH and SNMP on nodes') + # Disabling SNMP write plug-in + snmp_running = False + _print_label('Testing Gnocchi and AODH plugins on nodes') for controller in controllers: gnocchi_running = ( @@ -779,7 +780,7 @@ def main(bt_logger=None): compute_node)) aodh_running = ( aodh_running and conf.check_aodh_plugin_included(compute_node)) - logger.info("SNMP enabled on {}" .format(node_name)) + # logger.info("SNMP enabled on {}" .format(node_name)) if gnocchi_running: out_plugins[node_id].append("Gnocchi") if aodh_running: diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py index a5c8c701..8b597cc5 100644 --- a/baro_tests/config_server.py +++ b/baro_tests/config_server.py @@ -269,8 +269,13 @@ class ConfigServer(object): stdout = node.run_cmd( "source overcloudrc.v3;" + "openstack catalog list | grep gnocchi") - if 'gnocchi' in stdout: + if stdout is None: + return False + elif 'gnocchi' in stdout: gnocchi_present = True + return gnocchi_present + else: + return False return gnocchi_present def is_aodh_running(self, controller): @@ -287,8 +292,13 @@ class ConfigServer(object): stdout = node.run_cmd( "source overcloudrc.v3;" + "openstack catalog list | grep aodh") - if 'aodh' in stdout: + if stdout is None: + return False + elif 'aodh' in stdout: aodh_present = True + return aodh_present + else: + return False return aodh_present def is_mcelog_installed(self, compute, package): |