Remove compat cfg wrapper

This wrapper was there to allow oslo-config changes through the gate
while keystoneclient hadn't been updated.

Also update to 2013.1b4.

Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd

diff --git a/quantum/api/api_common.py b/quantum/api/api_common.py
index cc67f79d893e42b40c9271133fd0dcf15fabf98a..dfabb3c687d160b707ef07c1ec17a3a8df39fae2 100644 (file)
--- a/quantum/api/api_common.py
+++ b/quantum/api/api_common.py
@@ -17,11 +17,11 @@
 
 import urllib
 
+from oslo.config import cfg
 from webob import exc
 
 from quantum.common import constants
 from quantum.common import exceptions
-from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 
 

diff --git a/quantum/db/agents_db.py b/quantum/db/agents_db.py
index 70c56780e1f953e41db93a5076941f80de97c874..bebacf420f87cbb89d92b1114e00eeb75454c4f7 100644 (file)
--- a/quantum/db/agents_db.py
+++ b/quantum/db/agents_db.py
@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 import sqlalchemy as sa
 from sqlalchemy.orm import exc
 
@@ -22,7 +23,6 @@ from quantum.db import model_base
 from quantum.db import models_v2
 from quantum.extensions import agent as ext_agent
 from quantum import manager
-from quantum.openstack.common import cfg
 from quantum.openstack.common import jsonutils
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import timeutils

diff --git a/quantum/extensions/loadbalancer.py b/quantum/extensions/loadbalancer.py
index 9b6ab5802f151e6a147c7de49018820849110cc1..9a5c6f3764418c5c12ed2d287c6579dfa9cb92cb 100644 (file)
--- a/quantum/extensions/loadbalancer.py
+++ b/quantum/extensions/loadbalancer.py
@@ -17,12 +17,13 @@
 
 import abc
 
+from oslo.config import cfg
+
 from quantum.api import extensions
 from quantum.api.v2 import attributes as attr
 from quantum.api.v2 import base
 from quantum.common import exceptions as qexception
 from quantum import manager
-from quantum.openstack.common import cfg
 from quantum.plugins.common import constants
 from quantum.plugins.services.service_base import ServicePluginBase
 

diff --git a/quantum/openstack/common/cfg.py b/quantum/openstack/common/cfg.py
deleted file mode 100644 (file)
index c35dcb8..0000000
--- a/quantum/openstack/common/cfg.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Red Hat, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo.config.cfg import *

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/extensions/nvp_networkgw.py b/quantum/plugins/nicira/nicira_nvp_plugin/extensions/nvp_networkgw.py
index 36feb1748455493831a89ab80457a02ff5d22d3a..ae2295c0ae2cf1be1de6d8ebfb881b6660192d01 100644 (file)
--- a/quantum/plugins/nicira/nicira_nvp_plugin/extensions/nvp_networkgw.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/extensions/nvp_networkgw.py
@@ -18,11 +18,12 @@
 
 from abc import abstractmethod
 
+from oslo.config import cfg
+
 from quantum.api import extensions
 from quantum.api.v2 import attributes
 from quantum.api.v2 import base
 from quantum import manager
-from quantum.openstack.common import cfg
 from quantum import quota
 
 RESOURCE_NAME = "network-gateway"

diff --git a/quantum/plugins/openvswitch/Makefile b/quantum/plugins/openvswitch/Makefile
index 7d6c133b6ad2c9237e219662c64379ed0ae1fe75..b668cfdbba1b16bed8dfd03bbea2a8347be7f24c 100644 (file)
--- a/quantum/plugins/openvswitch/Makefile
+++ b/quantum/plugins/openvswitch/Makefile
@@ -39,7 +39,6 @@ agent-dist-xen agent-dist-xen-python26: distclean
        cp __init__.py $(QUANTUM_LIBS)/quantum/plugins/openvswitch/
        cp common/{config.py,__init__.py} $(QUANTUM_LIBS)/quantum/plugins/openvswitch/common/
        cp ../../openstack/__init__.py $(QUANTUM_LIBS)/quantum/openstack/
-       cp ../../openstack/common/{cfg.py,iniparser.py,__init__.py} $(QUANTUM_LIBS)/quantum/openstack/common/
        tar -czvpf ${RPM_BUILD_ROOT}/SOURCES/ovs-quantum-agent-${VERSION}.tgz -C $(AGENT_DIST_DIR)/build ovs-quantum-agent-${VERSION}
        rpmbuild -ba --define "_topdir $(shell pwd)/$(RPM_BUILD_ROOT)" --clean $(AGENT_DIST_DIR)/ovs-quantum-agent-xs_xcp.spec
        @echo "Agent package created: ovs_quantum_agent/build/rpm/RPMS/noarch/ovs-quantum-agent-${VERSION}-1.noarch.rpm"

diff --git a/quantum/plugins/ryu/ryu_quantum_plugin.py b/quantum/plugins/ryu/ryu_quantum_plugin.py
index 58dc0e4e452204b4426467dd89a96c227d280049..09e8749e45322430b01a62d89e4bdbdf7c4c42de 100644 (file)
--- a/quantum/plugins/ryu/ryu_quantum_plugin.py
+++ b/quantum/plugins/ryu/ryu_quantum_plugin.py
@@ -33,7 +33,6 @@ from quantum.db import l3_rpc_base
 from quantum.db import models_v2
 from quantum.db import securitygroups_rpc_base as sg_db_rpc
 from quantum.extensions import securitygroup as ext_sg
-from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import proxy

diff --git a/quantum/tests/unit/nicira/test_networkgw.py b/quantum/tests/unit/nicira/test_networkgw.py
index ecc7c0eebbd63fdc11747220f80624deced37763..563b56d918b04ff75cf6091d58489f62bbe90b4e 100644 (file)
--- a/quantum/tests/unit/nicira/test_networkgw.py
+++ b/quantum/tests/unit/nicira/test_networkgw.py
@@ -16,6 +16,7 @@
 import contextlib
 
 import mock
+from oslo.config import cfg
 import testtools
 from webob import exc
 import webtest
@@ -28,7 +29,6 @@ from quantum import context
 from quantum.db import api as db_api
 from quantum.db import db_base_plugin_v2
 from quantum import manager
-from quantum.openstack.common import cfg
 from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_networkgw
                                                                  as networkgw)
 from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db

diff --git a/quantum/tests/unit/ryu/test_ryu_agent.py b/quantum/tests/unit/ryu/test_ryu_agent.py
index 6c3c91ced7bb067b96e83c6c18ebedec4d144ada..0ebd6aeacd467659b2cc4902a246c300236017ad 100644 (file)
--- a/quantum/tests/unit/ryu/test_ryu_agent.py
+++ b/quantum/tests/unit/ryu/test_ryu_agent.py
@@ -17,6 +17,7 @@ from contextlib import nested
 import httplib
 
 import mock
+from oslo.config import cfg
 import testtools
 
 from quantum.openstack.common import importutils
@@ -494,7 +495,7 @@ class TestRyuQuantumAgent(RyuAgentTestCase):
         netifs_attrs = {'AF_INET': 0,
                         'ifaddresses.return_value': [[{'addr': '10.0.0.1'}]]}
         with nested(
-            mock.patch('quantum.openstack.common.cfg.CONF.OVS', **cfg_attrs),
+            mock.patch('oslo.config.cfg.CONF.OVS', **cfg_attrs),
             mock.patch(self._AGENT_NAME + '.netifaces', **netifs_attrs),
             mock.patch(self._AGENT_NAME + '._get_my_ip',
                        return_value='172.16.0.1')
@@ -511,7 +512,7 @@ class TestRyuQuantumAgent(RyuAgentTestCase):
         netifs_attrs = {'AF_INET': 0,
                         'ifaddresses.return_value': [[{'addr': '10.0.0.1'}]]}
         with nested(
-            mock.patch('quantum.openstack.common.cfg.CONF.OVS', **cfg_attrs),
+            mock.patch('oslo.config.cfg.CONF.OVS', **cfg_attrs),
             mock.patch(self._AGENT_NAME + '.netifaces', **netifs_attrs),
             mock.patch(self._AGENT_NAME + '._get_my_ip',
                        return_value='172.16.0.1')
@@ -530,7 +531,7 @@ class TestRyuQuantumAgent(RyuAgentTestCase):
         netifs_attrs = {'AF_INET': 0,
                         'ifaddresses.return_value': [[{'addr': '10.0.0.1'}]]}
         with nested(
-            mock.patch('quantum.openstack.common.cfg.CONF.OVS', **cfg_attrs),
+            mock.patch('oslo.config.cfg.CONF.OVS', **cfg_attrs),
             mock.patch(self._AGENT_NAME + '.netifaces', **netifs_attrs),
             mock.patch(self._AGENT_NAME + '._get_my_ip',
                        return_value='172.16.0.1')
@@ -568,7 +569,7 @@ class TestRyuQuantumAgent(RyuAgentTestCase):
                      'OVS.ovsdb_port': 16634,
                      'AGENT.root_helper': 'helper'}
         with nested(
-            mock.patch('quantum.openstack.common.cfg.CONF', **cfg_attrs),
+            mock.patch('oslo.config.cfg.CONF', **cfg_attrs),
             mock.patch(self._AGENT_NAME + '.logging_config'),
             mock.patch(self._AGENT_NAME + '._get_tunnel_ip',
                        return_value='10.0.0.1'),

diff --git a/quantum/tests/unit/test_agent_ext_plugin.py b/quantum/tests/unit/test_agent_ext_plugin.py
index f38b72c48968e8693880366c95fbf9a1bfe6ffc4..6695bc4f57996ef3621dc5112d3328726706cfc5 100644 (file)
--- a/quantum/tests/unit/test_agent_ext_plugin.py
+++ b/quantum/tests/unit/test_agent_ext_plugin.py
@@ -18,6 +18,7 @@
 import copy
 import time
 
+from oslo.config import cfg
 from webob import exc
 
 from quantum.common import constants
@@ -27,7 +28,6 @@ from quantum import context
 from quantum.db import agents_db
 from quantum.db import db_base_plugin_v2
 from quantum.extensions import agent
-from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import uuidutils
 from quantum.tests.unit import test_api_v2

diff --git a/quantum/tests/unit/test_routerserviceinsertion.py b/quantum/tests/unit/test_routerserviceinsertion.py
index a5e51623177ae5361423048132fabcef04ef58bf..1a7ecddcd171b3fe5d0634e670f55fe951ad671e 100644 (file)
--- a/quantum/tests/unit/test_routerserviceinsertion.py
+++ b/quantum/tests/unit/test_routerserviceinsertion.py
@@ -14,6 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 import testtools
 import webob.exc as webexc
 
@@ -29,7 +30,6 @@ from quantum.db import routerservicetype_db as rst_db
 from quantum.db import servicetype_db as st_db
 from quantum.extensions import routedserviceinsertion as rsi
 from quantum.extensions import routerservicetype as rst
-from quantum.openstack.common import cfg
 from quantum.plugins.common import constants
 from quantum.tests.unit import test_api_v2
 from quantum.tests.unit import testlib_api

diff --git a/tools/pip-requires b/tools/pip-requires
index 1f91e1ec17118d3ed531e7bd1ee95a1c004aa26c..abe7c7c6e318b82a2393d96e26f0ee2c9aea06b8 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -16,7 +16,7 @@ sqlalchemy==0.7.9
 WebOb>=1.2
 python-keystoneclient>=0.2.0
 alembic>=0.4.1
-http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config
+http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b4.tar.gz#egg=oslo-config
 
 # Cisco plugin dependencies
 python-novaclient