From 433eabb8d1cc9848b1043b66c75cd0898ed14b73 Mon Sep 17 00:00:00 2001 From: Dantali0n Date: Fri, 12 Jul 2019 08:54:09 +0200 Subject: [PATCH] Move datasources folder into decision_engine The datasources are only used by the decision_engine, however, they are placed in a directory one level higher. This patch moves the datasources code into the decision_engine folder. Change-Id: Ia54531fb899b79a59bb77adea079ff27c0d518fa --- watcher/conf/datasources.py | 2 +- .../{ => decision_engine}/datasources/__init__.py | 0 watcher/{ => decision_engine}/datasources/base.py | 0 .../datasources/ceilometer.py | 2 +- .../{ => decision_engine}/datasources/gnocchi.py | 2 +- .../{ => decision_engine}/datasources/grafana.py | 4 ++-- .../datasources/grafana_translator/__init__.py | 0 .../datasources/grafana_translator/base.py | 2 +- .../datasources/grafana_translator/influxdb.py | 3 ++- .../{ => decision_engine}/datasources/manager.py | 8 ++++---- .../{ => decision_engine}/datasources/monasca.py | 2 +- .../decision_engine/strategy/strategies/base.py | 2 +- .../{ => decision_engine}/datasources/__init__.py | 0 .../datasources/grafana_translators/__init__.py | 0 .../datasources/grafana_translators/test_base.py | 3 ++- .../grafana_translators/test_influxdb.py | 5 +++-- .../{ => decision_engine}/datasources/test_base.py | 2 +- .../datasources/test_ceilometer_helper.py | 2 +- .../datasources/test_gnocchi_helper.py | 2 +- .../datasources/test_grafana_helper.py | 2 +- .../datasources/test_manager.py | 14 ++++++++------ .../datasources/test_monasca_helper.py | 2 +- .../strategy/strategies/test_base.py | 2 +- 23 files changed, 33 insertions(+), 28 deletions(-) rename watcher/{ => decision_engine}/datasources/__init__.py (100%) rename watcher/{ => decision_engine}/datasources/base.py (100%) rename watcher/{ => decision_engine}/datasources/ceilometer.py (99%) rename watcher/{ => decision_engine}/datasources/gnocchi.py (99%) rename watcher/{ => decision_engine}/datasources/grafana.py (98%) rename watcher/{ => decision_engine}/datasources/grafana_translator/__init__.py (100%) rename watcher/{ => decision_engine}/datasources/grafana_translator/base.py (98%) rename watcher/{ => decision_engine}/datasources/grafana_translator/influxdb.py (96%) rename watcher/{ => decision_engine}/datasources/manager.py (95%) rename watcher/{ => decision_engine}/datasources/monasca.py (99%) rename watcher/tests/{ => decision_engine}/datasources/__init__.py (100%) rename watcher/tests/{ => decision_engine}/datasources/grafana_translators/__init__.py (100%) rename watcher/tests/{ => decision_engine}/datasources/grafana_translators/test_base.py (97%) rename watcher/tests/{ => decision_engine}/datasources/grafana_translators/test_influxdb.py (97%) rename watcher/tests/{ => decision_engine}/datasources/test_base.py (97%) rename watcher/tests/{ => decision_engine}/datasources/test_ceilometer_helper.py (98%) rename watcher/tests/{ => decision_engine}/datasources/test_gnocchi_helper.py (98%) rename watcher/tests/{ => decision_engine}/datasources/test_grafana_helper.py (99%) rename watcher/tests/{ => decision_engine}/datasources/test_manager.py (93%) rename watcher/tests/{ => decision_engine}/datasources/test_monasca_helper.py (98%) diff --git a/watcher/conf/datasources.py b/watcher/conf/datasources.py index 6c2751288..d9ae239c0 100644 --- a/watcher/conf/datasources.py +++ b/watcher/conf/datasources.py @@ -18,7 +18,7 @@ from oslo_config import cfg -from watcher.datasources import manager +from watcher.decision_engine.datasources import manager datasources = cfg.OptGroup(name='watcher_datasources', title='Configuration Options for watcher' diff --git a/watcher/datasources/__init__.py b/watcher/decision_engine/datasources/__init__.py similarity index 100% rename from watcher/datasources/__init__.py rename to watcher/decision_engine/datasources/__init__.py diff --git a/watcher/datasources/base.py b/watcher/decision_engine/datasources/base.py similarity index 100% rename from watcher/datasources/base.py rename to watcher/decision_engine/datasources/base.py diff --git a/watcher/datasources/ceilometer.py b/watcher/decision_engine/datasources/ceilometer.py similarity index 99% rename from watcher/datasources/ceilometer.py rename to watcher/decision_engine/datasources/ceilometer.py index b04608bc9..3a8011277 100644 --- a/watcher/datasources/ceilometer.py +++ b/watcher/decision_engine/datasources/ceilometer.py @@ -24,7 +24,7 @@ from oslo_utils import timeutils from watcher._i18n import _ from watcher.common import clients from watcher.common import exception -from watcher.datasources import base +from watcher.decision_engine.datasources import base LOG = log.getLogger(__name__) diff --git a/watcher/datasources/gnocchi.py b/watcher/decision_engine/datasources/gnocchi.py similarity index 99% rename from watcher/datasources/gnocchi.py rename to watcher/decision_engine/datasources/gnocchi.py index 02a7998a6..0f6f0a660 100644 --- a/watcher/datasources/gnocchi.py +++ b/watcher/decision_engine/datasources/gnocchi.py @@ -24,7 +24,7 @@ from oslo_log import log from watcher.common import clients from watcher.common import exception -from watcher.datasources import base +from watcher.decision_engine.datasources import base CONF = cfg.CONF LOG = log.getLogger(__name__) diff --git a/watcher/datasources/grafana.py b/watcher/decision_engine/datasources/grafana.py similarity index 98% rename from watcher/datasources/grafana.py rename to watcher/decision_engine/datasources/grafana.py index 043e1ad35..e384d18f4 100644 --- a/watcher/datasources/grafana.py +++ b/watcher/decision_engine/datasources/grafana.py @@ -22,8 +22,8 @@ import six.moves.urllib.parse as urlparse from watcher.common import clients from watcher.common import exception -from watcher.datasources import base -from watcher.datasources.grafana_translator import influxdb +from watcher.decision_engine.datasources import base +from watcher.decision_engine.datasources.grafana_translator import influxdb import requests diff --git a/watcher/datasources/grafana_translator/__init__.py b/watcher/decision_engine/datasources/grafana_translator/__init__.py similarity index 100% rename from watcher/datasources/grafana_translator/__init__.py rename to watcher/decision_engine/datasources/grafana_translator/__init__.py diff --git a/watcher/datasources/grafana_translator/base.py b/watcher/decision_engine/datasources/grafana_translator/base.py similarity index 98% rename from watcher/datasources/grafana_translator/base.py rename to watcher/decision_engine/datasources/grafana_translator/base.py index 8325c4e4f..5edbf9321 100644 --- a/watcher/datasources/grafana_translator/base.py +++ b/watcher/decision_engine/datasources/grafana_translator/base.py @@ -20,7 +20,7 @@ import abc from watcher._i18n import _ from watcher.common import exception -from watcher.datasources import base +from watcher.decision_engine.datasources import base class BaseGrafanaTranslator(object): diff --git a/watcher/datasources/grafana_translator/influxdb.py b/watcher/decision_engine/datasources/grafana_translator/influxdb.py similarity index 96% rename from watcher/datasources/grafana_translator/influxdb.py rename to watcher/decision_engine/datasources/grafana_translator/influxdb.py index f10263b94..60b249d58 100644 --- a/watcher/datasources/grafana_translator/influxdb.py +++ b/watcher/decision_engine/datasources/grafana_translator/influxdb.py @@ -21,7 +21,8 @@ from oslo_log import log from oslo_serialization import jsonutils from watcher.common import exception -from watcher.datasources.grafana_translator.base import BaseGrafanaTranslator +from watcher.decision_engine.datasources.grafana_translator.base import \ + BaseGrafanaTranslator CONF = cfg.CONF LOG = log.getLogger(__name__) diff --git a/watcher/datasources/manager.py b/watcher/decision_engine/datasources/manager.py similarity index 95% rename from watcher/datasources/manager.py rename to watcher/decision_engine/datasources/manager.py index 9739329e2..dfde0d9f6 100644 --- a/watcher/datasources/manager.py +++ b/watcher/decision_engine/datasources/manager.py @@ -21,10 +21,10 @@ from oslo_config import cfg from oslo_log import log from watcher.common import exception -from watcher.datasources import ceilometer as ceil -from watcher.datasources import gnocchi as gnoc -from watcher.datasources import grafana as graf -from watcher.datasources import monasca as mon +from watcher.decision_engine.datasources import ceilometer as ceil +from watcher.decision_engine.datasources import gnocchi as gnoc +from watcher.decision_engine.datasources import grafana as graf +from watcher.decision_engine.datasources import monasca as mon LOG = log.getLogger(__name__) diff --git a/watcher/datasources/monasca.py b/watcher/decision_engine/datasources/monasca.py similarity index 99% rename from watcher/datasources/monasca.py rename to watcher/decision_engine/datasources/monasca.py index a2f5b8917..7600c7e69 100644 --- a/watcher/datasources/monasca.py +++ b/watcher/decision_engine/datasources/monasca.py @@ -22,7 +22,7 @@ from monascaclient import exc from watcher.common import clients from watcher.common import exception -from watcher.datasources import base +from watcher.decision_engine.datasources import base class MonascaHelper(base.DataSourceBase): diff --git a/watcher/decision_engine/strategy/strategies/base.py b/watcher/decision_engine/strategy/strategies/base.py index d19ce1564..dc49a76f3 100755 --- a/watcher/decision_engine/strategy/strategies/base.py +++ b/watcher/decision_engine/strategy/strategies/base.py @@ -48,7 +48,7 @@ from watcher.common import context from watcher.common import exception from watcher.common.loader import loadable from watcher.common import utils -from watcher.datasources import manager as ds_manager +from watcher.decision_engine.datasources import manager as ds_manager from watcher.decision_engine.loading import default as loading from watcher.decision_engine.model.collector import manager from watcher.decision_engine.solution import default diff --git a/watcher/tests/datasources/__init__.py b/watcher/tests/decision_engine/datasources/__init__.py similarity index 100% rename from watcher/tests/datasources/__init__.py rename to watcher/tests/decision_engine/datasources/__init__.py diff --git a/watcher/tests/datasources/grafana_translators/__init__.py b/watcher/tests/decision_engine/datasources/grafana_translators/__init__.py similarity index 100% rename from watcher/tests/datasources/grafana_translators/__init__.py rename to watcher/tests/decision_engine/datasources/grafana_translators/__init__.py diff --git a/watcher/tests/datasources/grafana_translators/test_base.py b/watcher/tests/decision_engine/datasources/grafana_translators/test_base.py similarity index 97% rename from watcher/tests/datasources/grafana_translators/test_base.py rename to watcher/tests/decision_engine/datasources/grafana_translators/test_base.py index b46a15617..aab1425f9 100644 --- a/watcher/tests/datasources/grafana_translators/test_base.py +++ b/watcher/tests/decision_engine/datasources/grafana_translators/test_base.py @@ -22,7 +22,8 @@ from oslo_config import cfg from oslo_log import log from watcher.common import exception -from watcher.datasources.grafana_translator import base as base_translator +from watcher.decision_engine.datasources.grafana_translator import \ + base as base_translator from watcher.tests import base CONF = cfg.CONF diff --git a/watcher/tests/datasources/grafana_translators/test_influxdb.py b/watcher/tests/decision_engine/datasources/grafana_translators/test_influxdb.py similarity index 97% rename from watcher/tests/datasources/grafana_translators/test_influxdb.py rename to watcher/tests/decision_engine/datasources/grafana_translators/test_influxdb.py index ec52077e8..6153be596 100644 --- a/watcher/tests/datasources/grafana_translators/test_influxdb.py +++ b/watcher/tests/decision_engine/datasources/grafana_translators/test_influxdb.py @@ -23,8 +23,9 @@ from oslo_config import cfg from oslo_log import log from watcher.common import exception -from watcher.datasources.grafana_translator import influxdb -from watcher.tests.datasources.grafana_translators import test_base +from watcher.decision_engine.datasources.grafana_translator import influxdb +from watcher.tests.decision_engine.datasources.grafana_translators import \ + test_base CONF = cfg.CONF LOG = log.getLogger(__name__) diff --git a/watcher/tests/datasources/test_base.py b/watcher/tests/decision_engine/datasources/test_base.py similarity index 97% rename from watcher/tests/datasources/test_base.py rename to watcher/tests/decision_engine/datasources/test_base.py index 78daa3f83..1ce495c64 100644 --- a/watcher/tests/datasources/test_base.py +++ b/watcher/tests/decision_engine/datasources/test_base.py @@ -20,7 +20,7 @@ import mock from oslo_config import cfg from watcher.common import exception -from watcher.datasources import base as datasource +from watcher.decision_engine.datasources import base as datasource from watcher.tests import base CONF = cfg.CONF diff --git a/watcher/tests/datasources/test_ceilometer_helper.py b/watcher/tests/decision_engine/datasources/test_ceilometer_helper.py similarity index 98% rename from watcher/tests/datasources/test_ceilometer_helper.py rename to watcher/tests/decision_engine/datasources/test_ceilometer_helper.py index 9bebbebf8..11051415b 100644 --- a/watcher/tests/datasources/test_ceilometer_helper.py +++ b/watcher/tests/decision_engine/datasources/test_ceilometer_helper.py @@ -21,7 +21,7 @@ import mock from watcher.common import clients from watcher.common import exception -from watcher.datasources import ceilometer as ceilometer_helper +from watcher.decision_engine.datasources import ceilometer as ceilometer_helper from watcher.tests import base diff --git a/watcher/tests/datasources/test_gnocchi_helper.py b/watcher/tests/decision_engine/datasources/test_gnocchi_helper.py similarity index 98% rename from watcher/tests/datasources/test_gnocchi_helper.py rename to watcher/tests/decision_engine/datasources/test_gnocchi_helper.py index ea8ea91ac..f69678f4a 100644 --- a/watcher/tests/datasources/test_gnocchi_helper.py +++ b/watcher/tests/decision_engine/datasources/test_gnocchi_helper.py @@ -19,7 +19,7 @@ from oslo_config import cfg from watcher.common import clients from watcher.common import exception -from watcher.datasources import gnocchi as gnocchi_helper +from watcher.decision_engine.datasources import gnocchi as gnocchi_helper from watcher.tests import base CONF = cfg.CONF diff --git a/watcher/tests/datasources/test_grafana_helper.py b/watcher/tests/decision_engine/datasources/test_grafana_helper.py similarity index 99% rename from watcher/tests/datasources/test_grafana_helper.py rename to watcher/tests/decision_engine/datasources/test_grafana_helper.py index 7e0097b60..ee80358a9 100644 --- a/watcher/tests/datasources/test_grafana_helper.py +++ b/watcher/tests/decision_engine/datasources/test_grafana_helper.py @@ -23,7 +23,7 @@ from oslo_log import log from watcher.common import clients from watcher.common import exception -from watcher.datasources import grafana +from watcher.decision_engine.datasources import grafana from watcher.tests import base import requests diff --git a/watcher/tests/datasources/test_manager.py b/watcher/tests/decision_engine/datasources/test_manager.py similarity index 93% rename from watcher/tests/datasources/test_manager.py rename to watcher/tests/decision_engine/datasources/test_manager.py index 790ec55b7..003d827c7 100644 --- a/watcher/tests/datasources/test_manager.py +++ b/watcher/tests/decision_engine/datasources/test_manager.py @@ -19,10 +19,10 @@ import mock from mock import MagicMock from watcher.common import exception -from watcher.datasources import gnocchi -from watcher.datasources import grafana -from watcher.datasources import manager as ds_manager -from watcher.datasources import monasca +from watcher.decision_engine.datasources import gnocchi +from watcher.decision_engine.datasources import grafana +from watcher.decision_engine.datasources import manager as ds_manager +from watcher.decision_engine.datasources import monasca from watcher.tests import base @@ -47,7 +47,8 @@ class TestDataSourceManager(base.BaseTestCase): self.assertEqual({}, manager.load_metric_map('/nope/nope/nope.yaml')) def test_metric_file_metric_override(self): - path = 'watcher.datasources.manager.DataSourceManager.load_metric_map' + path = 'watcher.decision_engine.datasources.manager.' \ + 'DataSourceManager.load_metric_map' retval = { monasca.MonascaHelper.NAME: {"host_airflow": "host_fnspid"} } @@ -65,7 +66,8 @@ class TestDataSourceManager(base.BaseTestCase): "eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk==" m_config.grafana_client.base_url = "https://grafana.proxy/api/" - path = 'watcher.datasources.manager.DataSourceManager.load_metric_map' + path = 'watcher.decision_engine.datasources.manager.' \ + 'DataSourceManager.load_metric_map' metric_map = { 'db': 'production_cloud', 'project': '7485', diff --git a/watcher/tests/datasources/test_monasca_helper.py b/watcher/tests/decision_engine/datasources/test_monasca_helper.py similarity index 98% rename from watcher/tests/datasources/test_monasca_helper.py rename to watcher/tests/decision_engine/datasources/test_monasca_helper.py index 77f08db11..52b6166f3 100644 --- a/watcher/tests/datasources/test_monasca_helper.py +++ b/watcher/tests/decision_engine/datasources/test_monasca_helper.py @@ -19,7 +19,7 @@ from oslo_config import cfg from watcher.common import clients from watcher.common import exception -from watcher.datasources import monasca as monasca_helper +from watcher.decision_engine.datasources import monasca as monasca_helper from watcher.tests import base CONF = cfg.CONF diff --git a/watcher/tests/decision_engine/strategy/strategies/test_base.py b/watcher/tests/decision_engine/strategy/strategies/test_base.py index 802408243..b4bce31b0 100644 --- a/watcher/tests/decision_engine/strategy/strategies/test_base.py +++ b/watcher/tests/decision_engine/strategy/strategies/test_base.py @@ -17,7 +17,7 @@ import mock from watcher.common import exception -from watcher.datasources import manager +from watcher.decision_engine.datasources import manager from watcher.decision_engine.model import model_root from watcher.decision_engine.strategy import strategies from watcher.tests import base