Merge "TrivialFix: Remove cfg import unused"

watcher/api/controllers/v1/goal.py

@@ -32,8 +32,6 @@ Here are some examples of :ref:`Goals <goal_definition>`:
    modification, ...
 """
 
-from oslo_config import cfg
-
 import pecan
 from pecan import rest
 import wsme
@@ -49,8 +47,6 @@ from watcher.common import exception
 from watcher.common import policy
 from watcher import objects
 
-CONF = cfg.CONF
-
 
 class Goal(base.APIBase):
     """API representation of a goal.

watcher/api/controllers/v1/strategy.py

@@ -27,8 +27,6 @@ Some strategies may provide better optimization results but may take more time
 to find an optimal :ref:`Solution <solution_definition>`.
 """
 
-from oslo_config import cfg
-
 import pecan
 from pecan import rest
 import wsme
@@ -45,8 +43,6 @@ from watcher.common import policy
 from watcher.common import utils as common_utils
 from watcher import objects
 
-CONF = cfg.CONF
-
 
 class Strategy(base.APIBase):
     """API representation of a strategy.

watcher/decision_engine/cluster/history/ceilometer.py

@@ -17,14 +17,10 @@
 # limitations under the License.
 #
 
-
-from oslo_config import cfg
 from watcher.common import ceilometer_helper
 
 from watcher.decision_engine.cluster.history import base
 
-CONF = cfg.CONF
-
 
 class CeilometerClusterHistory(base.BaseClusterHistory):
     def __init__(self, osc=None):

watcher/decision_engine/model/collector/manager.py

@@ -17,15 +17,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_config import cfg
-
 from watcher.common import utils
 from watcher.decision_engine.loading import default
 
 
-CONF = cfg.CONF
-
-
 class CollectorManager(object):
 
     def __init__(self):

watcher/decision_engine/strategy/selection/default.py

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_config import cfg
 from oslo_log import log
 
 from watcher._i18n import _
@@ -23,7 +22,6 @@ from watcher.decision_engine.loading import default
 from watcher.decision_engine.strategy.selection import base
 
 LOG = log.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class DefaultStrategySelector(base.BaseSelector):

watcher/tests/common/test_ceilometer_helper.py

@@ -18,14 +18,11 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import mock
-from oslo_config import cfg
 
 from watcher.common import ceilometer_helper
 from watcher.common import clients
 from watcher.tests import base
 
-CONF = cfg.CONF
-
 
 @mock.patch.object(clients.OpenStackClients, 'ceilometer')
 class TestCeilometerHelper(base.BaseTestCase):

watcher/tests/decision_engine/fake_strategies.py

@@ -18,8 +18,6 @@ from oslo_config import cfg
 
 from watcher.decision_engine.strategy.strategies import base as base_strategy
 
-CONF = cfg.CONF
-
 
 class FakeStrategy(base_strategy.BaseStrategy):
 

watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 import mock
-from oslo_config import cfg
 
 from watcher.common import exception
 from watcher.decision_engine.loading import default as default_loader
@@ -24,8 +23,6 @@ from watcher.decision_engine.strategy.selection import (
 from watcher.decision_engine.strategy import strategies
 from watcher.tests import base
 
-CONF = cfg.CONF
-
 
 class TestStrategySelector(base.TestCase):