From c0f807294919cf6add64ec1f99f1b82e5a6330c3 Mon Sep 17 00:00:00 2001 From: Nguyen Hung Phuong Date: Thu, 15 Sep 2016 15:07:04 +0700 Subject: [PATCH] Clean imports in code In some part in the code we import objects. In the Openstack style guidelines they recommend to import only modules. http://docs.openstack.org/developer/hacking/#imports Change-Id: Ibdb1fc5b52b07ab9098dd9a72aecd938d1515132 --- ceilosca/ceilometer/publisher/monclient.py | 4 ++-- ceilosca/ceilometer/tests/unit/storage/test_impl_monasca.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ceilosca/ceilometer/publisher/monclient.py b/ceilosca/ceilometer/publisher/monclient.py index 66b4780..41952e3 100755 --- a/ceilosca/ceilometer/publisher/monclient.py +++ b/ceilosca/ceilometer/publisher/monclient.py @@ -24,7 +24,7 @@ import ceilometer from ceilometer.i18n import _ from ceilometer import monasca_client as mon_client from ceilometer import publisher -from ceilometer.publisher.monasca_data_filter import MonascaDataFilter +from ceilometer.publisher import monasca_data_filter from monascaclient import exc @@ -89,7 +89,7 @@ class MonascaPublisher(publisher.PublisherBase): self.time_of_last_batch_run = time.time() self.mon_client = mon_client.Client(parsed_url) - self.mon_filter = MonascaDataFilter() + self.mon_filter = monasca_data_filter.MonascaDataFilter() batch_timer = loopingcall.FixedIntervalLoopingCall(self.flush_batch) batch_timer.start(interval=cfg.CONF.monasca.batch_polling_interval) diff --git a/ceilosca/ceilometer/tests/unit/storage/test_impl_monasca.py b/ceilosca/ceilometer/tests/unit/storage/test_impl_monasca.py index 2e2d071..68cb215 100644 --- a/ceilosca/ceilometer/tests/unit/storage/test_impl_monasca.py +++ b/ceilosca/ceilometer/tests/unit/storage/test_impl_monasca.py @@ -22,7 +22,7 @@ from oslo_utils import timeutils from oslotest import base import ceilometer -from ceilometer.api.controllers.v2.meters import Aggregate +from ceilometer.api.controllers.v2 import meters from ceilometer import storage from ceilometer.storage import impl_monasca from ceilometer.storage import models as storage_models @@ -592,7 +592,7 @@ class MeterStatisticsTest(_BaseTestCase): sf = storage.SampleFilter() sf.meter = "image" - aggregate = Aggregate() + aggregate = meters.Aggregate() aggregate.func = 'min' sf.start_timestamp = timeutils.parse_isotime( '2014-10-24T12:12:42').replace(tzinfo=None)