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

Merge "Renamed api.py to base.py in metrics engine"

Browse Source
This commit is contained in:
Jenkins
2016-03-18 10:59:59 +00:00
committed by Gerrit Code Review
parent bdc0eb196a c68d33f341
commit cb644fcef9
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
watcher/metrics_engine/cluster_history/api.py → watcher/metrics_engine/cluster_history/base.py
View File

4
watcher/metrics_engine/cluster_history/ceilometer.py
View File

@@ -22,13 +22,13 @@ from oslo_config import cfg
from oslo_log import log from oslo_log import log
from watcher.common import ceilometer_helper from watcher.common import ceilometer_helper
from watcher.metrics_engine.cluster_history import api from watcher.metrics_engine.cluster_history import base
CONF = cfg.CONF CONF = cfg.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class CeilometerClusterHistory(api.BaseClusterHistory): class CeilometerClusterHistory(base.BaseClusterHistory):
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""
super(CeilometerClusterHistory, self).__init__() super(CeilometerClusterHistory, self).__init__()

0
watcher/metrics_engine/cluster_model_collector/api.py → watcher/metrics_engine/cluster_model_collector/base.py
View File

4
watcher/metrics_engine/cluster_model_collector/nova.py
View File

@@ -23,12 +23,12 @@ from watcher.decision_engine.model import hypervisor as obj_hypervisor
from watcher.decision_engine.model import model_root from watcher.decision_engine.model import model_root
from watcher.decision_engine.model import resource from watcher.decision_engine.model import resource
from watcher.decision_engine.model import vm as obj_vm from watcher.decision_engine.model import vm as obj_vm
from watcher.metrics_engine.cluster_model_collector import api from watcher.metrics_engine.cluster_model_collector import base
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class NovaClusterModelCollector(api.BaseClusterModelCollector): class NovaClusterModelCollector(base.BaseClusterModelCollector):
def __init__(self, wrapper): def __init__(self, wrapper):
super(NovaClusterModelCollector, self).__init__() super(NovaClusterModelCollector, self).__init__()
self.wrapper = wrapper self.wrapper = wrapper

4
watcher/tests/decision_engine/strategy/strategies/faker_cluster_state.py
View File

@@ -20,10 +20,10 @@ from watcher.decision_engine.model import hypervisor
from watcher.decision_engine.model import model_root as modelroot from watcher.decision_engine.model import model_root as modelroot
from watcher.decision_engine.model import resource from watcher.decision_engine.model import resource
from watcher.decision_engine.model import vm as modelvm from watcher.decision_engine.model import vm as modelvm
from watcher.metrics_engine.cluster_model_collector import api from watcher.metrics_engine.cluster_model_collector import base
class FakerModelCollector(api.BaseClusterModelCollector): class FakerModelCollector(base.BaseClusterModelCollector):
def __init__(self): def __init__(self):
pass pass