Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TrivialFix: Remove cfg import unused"

Browse Source
This commit is contained in:
Jenkins
2016-08-29 14:44:40 +00:00
committed by Gerrit Code Review
parent 6e8dc5297e deb5cb3fc2
commit 107cc76cdb
8 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/api/controllers/v1/goal.py
View File

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

4
watcher/api/controllers/v1/strategy.py
View File

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

4
watcher/decision_engine/cluster/history/ceilometer.py
View File

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

5
watcher/decision_engine/model/collector/manager.py
View File

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

2
watcher/decision_engine/strategy/selection/default.py
View File

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

3
watcher/tests/common/test_ceilometer_helper.py
View File

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

2
watcher/tests/decision_engine/fake_strategies.py
View File

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

3
watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py
View File

@@ -15,7 +15,6 @@
# limitations under the License. # limitations under the License.
import mock import mock
from oslo_config import cfg
from watcher.common import exception from watcher.common import exception
from watcher.decision_engine.loading import default as default_loader 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.decision_engine.strategy import strategies
from watcher.tests import base from watcher.tests import base
CONF = cfg.CONF
class TestStrategySelector(base.TestCase): class TestStrategySelector(base.TestCase):