Remove unused logging import
Change-Id: Ia449eaa87765a72a400e870807e9a8799d233802
This commit is contained in:
parent
7d451e6113
commit
2929a3d08f
@ -14,13 +14,10 @@
|
|||||||
|
|
||||||
import networkx as nx
|
import networkx as nx
|
||||||
from networkx.readwrite import json_graph
|
from networkx.readwrite import json_graph
|
||||||
from oslo_log import log
|
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
|
|
||||||
from vitrage.datasources import OPENSTACK_CLUSTER
|
from vitrage.datasources import OPENSTACK_CLUSTER
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class RootRestController(rest.RestController):
|
class RootRestController(rest.RestController):
|
||||||
|
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceAction
|
from vitrage.common.constants import DatasourceAction
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import GraphAction
|
from vitrage.common.constants import GraphAction
|
||||||
@ -21,8 +19,6 @@ from vitrage.common.exception import VitrageTransformerError
|
|||||||
from vitrage.datasources.alarm_properties import AlarmProperties as AlarmProps
|
from vitrage.datasources.alarm_properties import AlarmProperties as AlarmProps
|
||||||
from vitrage.datasources import transformer_base as tbase
|
from vitrage.datasources import transformer_base as tbase
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class AlarmTransformerBase(tbase.TransformerBase):
|
class AlarmTransformerBase(tbase.TransformerBase):
|
||||||
|
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -31,9 +29,6 @@ from vitrage.datasources.transformer_base import extract_field_value
|
|||||||
import vitrage.graph.utils as graph_utils
|
import vitrage.graph.utils as graph_utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class CinderVolumeTransformer(ResourceTransformerBase):
|
class CinderVolumeTransformer(ResourceTransformerBase):
|
||||||
|
|
||||||
# graph actions which need to refer them differently
|
# graph actions which need to refer them differently
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -27,8 +25,6 @@ from vitrage.datasources import transformer_base as tbase
|
|||||||
import vitrage.graph.utils as graph_utils
|
import vitrage.graph.utils as graph_utils
|
||||||
from vitrage.utils.datetime import format_unix_timestamp
|
from vitrage.utils.datetime import format_unix_timestamp
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class CollectdTransformer(AlarmTransformerBase):
|
class CollectdTransformer(AlarmTransformerBase):
|
||||||
|
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -26,8 +24,6 @@ from vitrage.datasources import transformer_base as tbase
|
|||||||
import vitrage.graph.utils as graph_utils
|
import vitrage.graph.utils as graph_utils
|
||||||
from vitrage.utils import datetime as datetime_utils
|
from vitrage.utils import datetime as datetime_utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class NagiosTransformer(AlarmTransformerBase):
|
class NagiosTransformer(AlarmTransformerBase):
|
||||||
|
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -28,9 +26,6 @@ from vitrage.datasources.transformer_base import extract_field_value
|
|||||||
import vitrage.graph.utils as graph_utils
|
import vitrage.graph.utils as graph_utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class InstanceTransformer(ResourceTransformerBase):
|
class InstanceTransformer(ResourceTransformerBase):
|
||||||
|
|
||||||
# graph actions which need to refer them differently
|
# graph actions which need to refer them differently
|
||||||
|
@ -12,14 +12,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.datasources import transformer_base as tbase
|
from vitrage.datasources import transformer_base as tbase
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class ResourceTransformerBase(tbase.TransformerBase):
|
class ResourceTransformerBase(tbase.TransformerBase):
|
||||||
|
|
||||||
def __init__(self, transformers, conf):
|
def __init__(self, transformers, conf):
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
from vitrage.common.constants import GraphAction
|
from vitrage.common.constants import GraphAction
|
||||||
@ -26,8 +24,6 @@ from vitrage.datasources.static_physical import SWITCH
|
|||||||
from vitrage.datasources import transformer_base
|
from vitrage.datasources import transformer_base
|
||||||
import vitrage.graph.utils as graph_utils
|
import vitrage.graph.utils as graph_utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class StaticPhysicalTransformer(ResourceTransformerBase):
|
class StaticPhysicalTransformer(ResourceTransformerBase):
|
||||||
|
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -31,8 +29,6 @@ import vitrage.graph.utils as graph_utils
|
|||||||
from vitrage.utils.datetime import change_time_str_format
|
from vitrage.utils.datetime import change_time_str_format
|
||||||
from vitrage.utils.datetime import format_unix_timestamp
|
from vitrage.utils.datetime import format_unix_timestamp
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class ZabbixTransformer(AlarmTransformerBase):
|
class ZabbixTransformer(AlarmTransformerBase):
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from six.moves import queue
|
from six.moves import queue
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
@ -34,8 +33,6 @@ from vitrage.evaluator.template_fields import TemplateFields as TFields
|
|||||||
from vitrage.opts import register_opts
|
from vitrage.opts import register_opts
|
||||||
from vitrage.tests.functional.base import TestFunctionalBase
|
from vitrage.tests.functional.base import TestFunctionalBase
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestActionExecutor(TestFunctionalBase):
|
class TestActionExecutor(TestFunctionalBase):
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from six.moves import queue
|
from six.moves import queue
|
||||||
from vitrage.common.constants import DatasourceAction
|
from vitrage.common.constants import DatasourceAction
|
||||||
@ -28,8 +27,6 @@ from vitrage.tests.functional.base import \
|
|||||||
import vitrage.tests.mocks.mock_driver as mock_driver
|
import vitrage.tests.mocks.mock_driver as mock_driver
|
||||||
from vitrage.tests.mocks import utils
|
from vitrage.tests.mocks import utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
_TARGET_HOST = 'host-2'
|
_TARGET_HOST = 'host-2'
|
||||||
_NAGIOS_TEST_INFO = {'resource_name': _TARGET_HOST,
|
_NAGIOS_TEST_INFO = {'resource_name': _TARGET_HOST,
|
||||||
DSProps.DATASOURCE_ACTION: DatasourceAction.SNAPSHOT}
|
DSProps.DATASOURCE_ACTION: DatasourceAction.SNAPSHOT}
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import UpdateMethod
|
from vitrage.common.constants import UpdateMethod
|
||||||
@ -24,8 +23,6 @@ from vitrage.tests import base
|
|||||||
from vitrage.tests.mocks import mock_driver
|
from vitrage.tests.mocks import mock_driver
|
||||||
from vitrage.tests.unit.datasources.aodh.mock_driver import MockAodhDriver
|
from vitrage.tests.unit.datasources.aodh.mock_driver import MockAodhDriver
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class AodhDriverTest(base.BaseTest):
|
class AodhDriverTest(base.BaseTest):
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import UpdateMethod
|
from vitrage.common.constants import UpdateMethod
|
||||||
@ -30,8 +29,6 @@ from vitrage.tests.unit.datasources.test_alarm_transformer_base import \
|
|||||||
BaseAlarmTransformerTest
|
BaseAlarmTransformerTest
|
||||||
from vitrage.utils.datetime import format_unix_timestamp
|
from vitrage.utils.datetime import format_unix_timestamp
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class TestCollectdTransformer(BaseAlarmTransformerTest):
|
class TestCollectdTransformer(BaseAlarmTransformerTest):
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EventProperties as EventProps
|
from vitrage.common.constants import EventProperties as EventProps
|
||||||
@ -31,8 +30,6 @@ from vitrage.tests.mocks import mock_transformer
|
|||||||
from vitrage.tests.unit.datasources.test_alarm_transformer_base import \
|
from vitrage.tests.unit.datasources.test_alarm_transformer_base import \
|
||||||
BaseAlarmTransformerTest
|
BaseAlarmTransformerTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class DoctorTransformerTest(BaseAlarmTransformerTest):
|
class DoctorTransformerTest(BaseAlarmTransformerTest):
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.datasources.nagios.config import NagiosConfig
|
from vitrage.datasources.nagios.config import NagiosConfig
|
||||||
from vitrage.datasources.nagios.config import NagiosHostMapping
|
from vitrage.datasources.nagios.config import NagiosHostMapping
|
||||||
@ -22,8 +21,6 @@ from vitrage.datasources.nova.instance import NOVA_INSTANCE_DATASOURCE
|
|||||||
from vitrage.tests import base
|
from vitrage.tests import base
|
||||||
from vitrage.tests.mocks import utils
|
from vitrage.tests.mocks import utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestNagiosConfig(base.BaseTest):
|
class TestNagiosConfig(base.BaseTest):
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import GraphAction
|
from vitrage.common.constants import GraphAction
|
||||||
from vitrage.datasources.nagios.properties import NagiosProperties as \
|
from vitrage.datasources.nagios.properties import NagiosProperties as \
|
||||||
@ -23,8 +22,6 @@ from vitrage.tests.unit.datasources.nagios.mock_driver import MockNagiosDriver
|
|||||||
from vitrage.tests.unit.datasources.nagios.nagios_base_test import \
|
from vitrage.tests.unit.datasources.nagios.nagios_base_test import \
|
||||||
NagiosBaseTest
|
NagiosBaseTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class NagiosDriverTest(NagiosBaseTest):
|
class NagiosDriverTest(NagiosBaseTest):
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.datasources.nagios.parser import NagiosParser
|
from vitrage.datasources.nagios.parser import NagiosParser
|
||||||
from vitrage.datasources.nagios.properties import NagiosProperties
|
from vitrage.datasources.nagios.properties import NagiosProperties
|
||||||
@ -19,8 +18,6 @@ from vitrage.tests.mocks import utils
|
|||||||
from vitrage.tests.unit.datasources.nagios.nagios_base_test \
|
from vitrage.tests.unit.datasources.nagios.nagios_base_test \
|
||||||
import NagiosBaseTest
|
import NagiosBaseTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class NagiosParserTest(NagiosBaseTest):
|
class NagiosParserTest(NagiosBaseTest):
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceAction
|
from vitrage.common.constants import DatasourceAction
|
||||||
from vitrage.common.constants import GraphAction
|
from vitrage.common.constants import GraphAction
|
||||||
@ -25,9 +24,6 @@ from vitrage.tests import base
|
|||||||
from vitrage.tests.mocks import utils
|
from vitrage.tests.mocks import utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestStaticDriver(base.BaseTest):
|
class TestStaticDriver(base.BaseTest):
|
||||||
|
|
||||||
OPTS = [
|
OPTS = [
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -29,8 +28,6 @@ from vitrage.datasources.static.transformer import StaticTransformer
|
|||||||
from vitrage.tests import base
|
from vitrage.tests import base
|
||||||
from vitrage.tests.mocks import mock_driver
|
from vitrage.tests.mocks import mock_driver
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestStaticTransformer(base.BaseTest):
|
class TestStaticTransformer(base.BaseTest):
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceAction
|
from vitrage.common.constants import DatasourceAction
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
@ -29,9 +28,6 @@ from vitrage.tests.mocks import utils
|
|||||||
from vitrage.utils import file as file_utils
|
from vitrage.utils import file as file_utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestStaticPhysicalDriver(base.BaseTest):
|
class TestStaticPhysicalDriver(base.BaseTest):
|
||||||
|
|
||||||
OPTS = [
|
OPTS = [
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import abc
|
import abc
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import EdgeLabel
|
from vitrage.common.constants import EdgeLabel
|
||||||
from vitrage.common.constants import EntityCategory
|
from vitrage.common.constants import EntityCategory
|
||||||
@ -24,8 +23,6 @@ from vitrage.datasources.nova.host import NOVA_HOST_DATASOURCE
|
|||||||
from vitrage.tests.unit.datasources.test_transformer_base import \
|
from vitrage.tests.unit.datasources.test_transformer_base import \
|
||||||
BaseTransformerTest
|
BaseTransformerTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class BaseAlarmTransformerTest(BaseTransformerTest):
|
class BaseAlarmTransformerTest(BaseTransformerTest):
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
from oslo_utils import importutils as utils
|
from oslo_utils import importutils as utils
|
||||||
|
|
||||||
from vitrage.common.constants import UpdateMethod
|
from vitrage.common.constants import UpdateMethod
|
||||||
@ -27,7 +26,6 @@ from vitrage.tests import base
|
|||||||
|
|
||||||
|
|
||||||
CHANGES_INTERVAL = 'changes_interval'
|
CHANGES_INTERVAL = 'changes_interval'
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
ZABBIX_DATASOURCE_NONE = '_'.join((ZABBIX_DATASOURCE, UpdateMethod.NONE))
|
ZABBIX_DATASOURCE_NONE = '_'.join((ZABBIX_DATASOURCE, UpdateMethod.NONE))
|
||||||
ZABBIX_DATASOURCE_PULL = '_'.join((ZABBIX_DATASOURCE, UpdateMethod.PULL))
|
ZABBIX_DATASOURCE_PULL = '_'.join((ZABBIX_DATASOURCE, UpdateMethod.PULL))
|
||||||
ZABBIX_DATASOURCE_PUSH = ZABBIX_DATASOURCE
|
ZABBIX_DATASOURCE_PUSH = ZABBIX_DATASOURCE
|
||||||
|
@ -12,13 +12,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import VertexProperties as VProps
|
from vitrage.common.constants import VertexProperties as VProps
|
||||||
from vitrage.tests import base
|
from vitrage.tests import base
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class BaseTransformerTest(base.BaseTest):
|
class BaseTransformerTest(base.BaseTest):
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.datasources.nova.host import NOVA_HOST_DATASOURCE
|
from vitrage.datasources.nova.host import NOVA_HOST_DATASOURCE
|
||||||
from vitrage.datasources.zabbix.driver import ZabbixDriver
|
from vitrage.datasources.zabbix.driver import ZabbixDriver
|
||||||
@ -23,9 +22,6 @@ from vitrage.tests import base
|
|||||||
from vitrage.tests.mocks import utils
|
from vitrage.tests.mocks import utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TestZabbixConfig(base.BaseTest):
|
class TestZabbixConfig(base.BaseTest):
|
||||||
|
|
||||||
OPTS = [
|
OPTS = [
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
import copy
|
import copy
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import DatasourceProperties as DSProps
|
from vitrage.common.constants import DatasourceProperties as DSProps
|
||||||
from vitrage.common.constants import GraphAction
|
from vitrage.common.constants import GraphAction
|
||||||
@ -25,8 +24,6 @@ from vitrage.tests.unit.datasources.zabbix.mock_driver import MockZabbixDriver
|
|||||||
from vitrage.tests.unit.datasources.zabbix.zabbix_base_test import \
|
from vitrage.tests.unit.datasources.zabbix.zabbix_base_test import \
|
||||||
ZabbixBaseTest
|
ZabbixBaseTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyProtectedMember
|
||||||
class ZabbixDriverTest(ZabbixBaseTest):
|
class ZabbixDriverTest(ZabbixBaseTest):
|
||||||
|
@ -15,13 +15,9 @@
|
|||||||
import random
|
import random
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage import os_clients
|
from vitrage import os_clients
|
||||||
from vitrage_tempest_tests.tests.api.base import BaseApiTest
|
from vitrage_tempest_tests.tests.api.base import BaseApiTest
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
TEMPLATES_RESOURCES_PATH = 'resources/templates/'
|
TEMPLATES_RESOURCES_PATH = 'resources/templates/'
|
||||||
TEMPLATES_SOURCES_PATH = '/etc/vitrage/templates/'
|
TEMPLATES_SOURCES_PATH = '/etc/vitrage/templates/'
|
||||||
|
|
||||||
|
@ -15,15 +15,10 @@
|
|||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo_log import log as logging
|
|
||||||
|
|
||||||
from vitrage.common.constants import VertexProperties as VProps
|
from vitrage.common.constants import VertexProperties as VProps
|
||||||
from vitrage_tempest_tests.tests.api.base import BaseApiTest
|
from vitrage_tempest_tests.tests.api.base import BaseApiTest
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class BaseTopologyTest(BaseApiTest):
|
class BaseTopologyTest(BaseApiTest):
|
||||||
"""Topology test class for Vitrage API tests."""
|
"""Topology test class for Vitrage API tests."""
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user