Merge pull request #27 from alvarolopez/oslo_updates

Oslo updates

Author: enolfc

.coveragerc

@@ -2,6 +2,3 @@
 branch = True
 source = caso
 omit = caso/tests/*,caso/openstack/*
-
-[report]
-ignore-errors = True

.travis.yml

@@ -1,7 +1,6 @@
+sudo: false
+
 language: python
-python:
-        - "2.7"
-        - "3.4"
 
 install:
         - pip install tox

caso/cmd/extract.py

@@ -16,18 +16,18 @@
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
+from oslo_log import log
 
 import caso.config
-from caso import log
 import caso.manager
 
 CONF = cfg.CONF
 
 
 def main():
     caso.config.parse_args(sys.argv)
-    log.setup('caso')
+    log.setup(cfg.CONF, 'caso')
     manager = caso.manager.Manager()
     manager.run()
 

caso/config.py

@@ -14,10 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
+from oslo_log import log
 
 import caso
 
+log.register_options(cfg.CONF)
+
 
 def parse_args(argv, default_config_files=None):
     cfg.CONF(argv[1:],

caso/contrib/config/generator.py

@@ -27,8 +27,8 @@
 import sys
 import textwrap
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import six
 import stevedore.named
 
@@ -104,7 +104,7 @@ def generate(argv):
     # and the list of Opt instances for that group.
     if parsed_args.libraries:
         loader = stevedore.named.NamedExtensionManager(
-            'oslo.config.opts',
+            'oslo_config.opts',
             names=list(set(parsed_args.libraries)),
             invoke_on_load=False,
             on_load_failure_callback=raise_extension_exception
@@ -149,7 +149,7 @@ def _is_in_group(opt, group):
     "Check if opt is in group."
     for value in group._opts.values():
         # NOTE(llu): Temporary workaround for bug #1262148, wait until
-        # newly released oslo.config support '==' operator.
+        # newly released oslo_config support '==' operator.
         if not(value['opt'] != opt):
             return True
     return False

caso/exception.py

@@ -16,10 +16,9 @@
 
 import sys
 
+from oslo_log import log
 import six
 
-from caso import log
-
 LOG = log.getLogger(__name__)
 
 

caso/extract/base.py

@@ -18,7 +18,7 @@
 import json
 
 import keystoneclient.v2_0.client
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 opts = [

caso/extract/ceilometer.py

@@ -16,10 +16,10 @@
 
 import ceilometerclient.client
 import dateutil.parser
-from oslo.config import cfg
+from oslo_config import cfg
+from oslo_log import log
 
 from caso.extract import nova
-from caso import log
 
 CONF = cfg.CONF
 CONF.import_opt("user", "caso.extract.base", "extractor")

caso/extract/manager.py

@@ -16,12 +16,11 @@
 
 import dateutil.parser
 from dateutil import tz
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_log import log
+from oslo_utils import importutils
 import six
 
-from caso import log
-
 SUPPORTED_EXTRACTORS = {
     'nova': 'caso.extract.nova.OpenStackExtractor',
     'ceilometer': 'caso.extract.ceilometer.CeilometerExtractor',
@@ -68,10 +67,15 @@ def __init__(self):
     def _extract(self, extract_from):
         self.records = {}
         for tenant in CONF.tenants:
-            records = self.extractor.extract_for_tenant(tenant,
-                                                        extract_from)
-            LOG.info("Extracted %d records for tenant '%s' from %s to now" %
-                     (len(records), tenant, extract_from))
+            try:
+                records = self.extractor.extract_for_tenant(tenant,
+                                                            extract_from)
+            except Exception:
+                records = []
+                LOG.exception("Cannot extrat records for '%s'" % tenant)
+            else:
+                LOG.info("Extracted %d records for tenant '%s' from "
+                         "%s to now" % (len(records), tenant, extract_from))
             self.records.update(records)
 
     def get_records(self, lastrun="1970-01-01"):

caso/extract/nova.py

@@ -20,7 +20,7 @@
 import dateutil.parser
 from dateutil import tz
 import novaclient.client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from caso.extract import base
 from caso import record
@@ -35,8 +35,9 @@
 
 class OpenStackExtractor(base.BaseExtractor):
     def _get_conn(self, tenant):
-        client = novaclient.client.get_client_class("2")
+        client = novaclient.client.Client
         conn = client(
+            2,
             CONF.extractor.user,
             CONF.extractor.password,
             tenant,
@@ -74,7 +75,7 @@ def extract_for_tenant(self, tenant, lastrun):
 
         if servers:
             start = dateutil.parser.parse(servers[0].created)
-            start.replace(tzinfo=None)
+            start = start.replace(tzinfo=None)
         else:
             start = lastrun