From 18d8407029906855a219a964257b82009ff6ddc6 Mon Sep 17 00:00:00 2001 From: Eyal Date: Tue, 5 Dec 2017 15:06:03 +0200 Subject: [PATCH] remove redundant code Change-Id: I7b9a59f2beca322682c7c247a6a079a6d839d32d --- run_vitrage_tempest.sh | 31 ----- vitrage_tempest_tests/tests/base_mock.py | 64 --------- .../tests/run_vitrage_env.py | 124 ------------------ .../tests/stop_vitrage_env.py | 37 ------ 4 files changed, 256 deletions(-) delete mode 100755 run_vitrage_tempest.sh delete mode 100644 vitrage_tempest_tests/tests/base_mock.py delete mode 100644 vitrage_tempest_tests/tests/run_vitrage_env.py delete mode 100644 vitrage_tempest_tests/tests/stop_vitrage_env.py diff --git a/run_vitrage_tempest.sh b/run_vitrage_tempest.sh deleted file mode 100755 index d0c90bca7..000000000 --- a/run_vitrage_tempest.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -function usage { - echo "Usage: run_vitrage_tempest.sh [OPTIONS]" - echo "Run Vitrage Tempest tests" - echo "" - echo " -h, --help Print this usage message" -} - -#case "$1" in -# -h|--help) usage; exit;; -# *) echo "Unknown command"; usage; exit;; -#esac - -function run_tests { - - find . -type f -name "*.pyc" -delete - - echo "run env" - nosetests -vx vitrage_tempest_tests/tests/run_vitrage_env.py - sleep 10s - - echo "run tests" - nosetests -vx vitrage_tempest_tests/tests/api/topology/* - sleep 5s - - echo "stop env" - nosetests -vx vitrage_tempest_tests/tests/stop_vitrage_env.py -} - -run_tests \ No newline at end of file diff --git a/vitrage_tempest_tests/tests/base_mock.py b/vitrage_tempest_tests/tests/base_mock.py deleted file mode 100644 index 5d65c3121..000000000 --- a/vitrage_tempest_tests/tests/base_mock.py +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2016 Nokia -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# noinspection PyPackageRequirements -import testtools - -from oslo_config import cfg - -from vitrage.common.constants import DatasourceAction -from vitrage.common.constants import DatasourceProperties -from vitrage.entity_graph.processor import processor as proc -from vitrage.entity_graph.vitrage_init import VitrageInit -from vitrage.graph.driver.networkx_graph import NXGraph -from vitrage.tests.mocks import mock_driver as mock_sync -from vitrage.tests.mocks import utils - - -class BaseMock(testtools.TestCase): - """Base test class for Vitrage API tests.""" - - PROCESSOR_OPTS = [ - cfg.StrOpt('datasources_values_dir', - default=utils.get_resources_dir() + '/datasources_values'), - ] - - def create_processor_with_graph(self): - conf = cfg.ConfigOpts() - conf.register_opts(self.PROCESSOR_OPTS, group='entity_graph') - events = self._create_mock_events() - e_graph = NXGraph("Entity Graph") - init = VitrageInit(conf) - processor = proc.Processor(conf, init, e_graph) - - for event in events: - processor.process_event(event) - - return processor - - @staticmethod - def _create_mock_events(): - gen_list = mock_sync.simple_zone_generators( - 2, 4, snapshot_events=2, - snap_vals={DatasourceProperties.DATASOURCE_ACTION: - DatasourceAction.INIT_SNAPSHOT}) - gen_list += mock_sync.simple_host_generators( - 2, 4, 4, - snap_vals={DatasourceProperties.DATASOURCE_ACTION: - DatasourceAction.INIT_SNAPSHOT}) - gen_list += mock_sync.simple_instance_generators( - 4, 15, 15, - snap_vals={DatasourceProperties.DATASOURCE_ACTION: - DatasourceAction.INIT_SNAPSHOT}) - return mock_sync.generate_sequential_events_list(gen_list) diff --git a/vitrage_tempest_tests/tests/run_vitrage_env.py b/vitrage_tempest_tests/tests/run_vitrage_env.py deleted file mode 100644 index 2b79edee3..000000000 --- a/vitrage_tempest_tests/tests/run_vitrage_env.py +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2016 Nokia -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg -from oslo_log import log as logging -from oslotest import base - -import vitrage_tempest_tests.tests.utils as utils - -LOG = logging.getLogger(__name__) -CONF = cfg.CONF -logging.register_options(CONF) -logging.setup(CONF, "vitrage") -logging.set_defaults(default_log_levels=utils.extra_log_level_defaults) - - -class RunVitrageEnv(base.BaseTestCase): - """RunVitrageEnv class. Run Vitrage env.""" - - def __init__(self, *args, **kwds): - super(RunVitrageEnv, self).__init__(*args, **kwds) - - def test_run_env(self): - if self._show_vitrage_processes() is True: - LOG.debug('The vitrage processed existed and should be removed') - self._stop_vitrage_processes() - - self._get_env_params() - - utils.change_terminal_dir('/home/stack/devstack') - utils.run_vitrage_command(". openrc " + self.user + " " + - self.user) - utils.run_from_terminal("openstack service create rca" + - " --name vitrage") - utils.run_from_terminal("openstack endpoint create rca" + - # " --os-username " + self.user + - # " --os-username " + self.user + - # " --os-password " + self.password + - # " --os-auth-url " + self.url + - # " --os-project-name admin" + - " --adminurl http://" + self.host + - ":" + str(self.port) + - " --internalurl http://" + self.host + - ":" + str(self.port) + - " --publicurl http://" + self.host + - ":" + str(self.port) + - " --region RegionOne") - - utils.run_from_terminal("nohup vitrage-graph > /tmp/nohup-graph.out &") - utils.run_from_terminal("nohup vitrage-api > /tmp/nohup-api.out &") - - if self._show_vitrage_processes() is False: - LOG.error("No vitrage processes founded") - raise ValueError("No vitrage processes founded") - else: - LOG.info('The vitrage processes exists') - - if self._validate_vitrage_processes() is False: - LOG.error("The vitrage processes are not correct") - self._stop_vitrage_processes() - raise ValueError("The vitrage processes are not correct") - - @staticmethod - def _show_vitrage_processes(): - text_out = utils.get_from_terminal( - "ps -ef | grep vitrage-api | grep -v grep") - text_out2 = utils.get_from_terminal( - "ps -ef | grep vitrage-graph | grep -v grep") - - if ("vitrage-api" in text_out) and ("vitrage-graph" in text_out2): - LOG.debug('The vitrage processes exists') - return True - elif "vitrage-api" in text_out: - LOG.debug('Only vitrage-api process exist') - return True - elif "vitrage-graph" in text_out2: - LOG.debug('Only vitrage-graph process exist') - return True - else: - LOG.debug('The vitrage process does not run') - return False - - def _get_env_params(self): - conf = utils.get_conf() - self.port = conf.api.port - self.user = conf.service_credentials.user - self.password = conf.service_credentials.password - self.url = conf.service_credentials.auth_url + "/v2.0" - self.host = utils.get_regex_result( - "(\d+\.\d+\.\d+\.\d+)", self.url) - self.identity_uri = conf.keystone_authtoken.identity_uri - - @staticmethod - def _stop_vitrage_processes(): - text_out = utils.get_from_terminal("pgrep vitrage-api") - if text_out != '': - LOG.debug("The vitrage-api process exist") - utils.run_from_terminal("kill -9 " + text_out) - - text_out2 = utils.get_from_terminal("pgrep vitrage-graph") - if text_out2 != '': - LOG.debug("The vitrage-graph process exist") - utils.run_from_terminal("kill -9 " + text_out2) - - @staticmethod - def _validate_vitrage_processes(): - errors_out = utils.get_from_terminal( - "grep ERROR /tmp/nohup-graph.out | " + - "grep ERROR /tmp/nohup-api.out | grep -v \'ERROR %\'") - if errors_out != '': - LOG.error("The errors are : " + errors_out) - return False - return True diff --git a/vitrage_tempest_tests/tests/stop_vitrage_env.py b/vitrage_tempest_tests/tests/stop_vitrage_env.py deleted file mode 100644 index 0d9945913..000000000 --- a/vitrage_tempest_tests/tests/stop_vitrage_env.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2016 Nokia -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg -from oslo_log import log as logging -from oslotest import base - -import vitrage_tempest_tests.tests.utils as utils - -LOG = logging.getLogger(__name__) -CONF = cfg.CONF -logging.register_options(CONF) -logging.setup(CONF, "vitrage") -logging.set_defaults(default_log_levels=utils.extra_log_level_defaults) - - -class StopVitrageEnv(base.BaseTestCase): - """StopVitrageEnv class. Stop Vitrage env.""" - - def __init__(self, *args, **kwds): - super(StopVitrageEnv, self).__init__(*args, **kwds) - - @staticmethod - def test_stop_vitrage_processes(): - LOG.debug("Stop vitrage processes") - utils.run_from_terminal("pkill vitrage")