diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2015-05-15 11:03:32 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-05-19 15:39:27 +0900 |
| commit | c73d7303a66edf459a9a415b5662f197f6c296fe (patch) | |
| tree | 5645ac90d9dd353347c622b015539678519899fa | |
| parent | e14c49abc891f132f867943ca5f5c7eae7a7c763 (diff) | |
Adapt to namespace-less oslo
oslo packages got away from namespaces while ago.
Update ryu to use the new namespace-less import path.
Bump oslo.config requirement version accordingly.
Reference:
https://blueprints.launchpad.net/oslo-incubator/+spec/drop-namespace-packages
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/cfg.py | 24 | ||||
| -rwxr-xr-x | ryu/cmd/manager.py | 1 | ||||
| -rw-r--r-- | ryu/services/protocols/bgp/application.py | 2 | ||||
| -rwxr-xr-x | ryu/tests/switch/run_mininet.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
5 files changed, 15 insertions, 16 deletions
@@ -14,13 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import oslo.config.cfg +import oslo_config.cfg # there are 3 ways to access the configuration. # # a. ryu.cfg.CONF (used to register cli options) # b. RyuApp.CONF (preferred way for ryu applications) -# c. oslo.config.cfg.CONF +# c. oslo_config.cfg.CONF # # Currently a. and b. shares a single ConfigOpts instance. # We intentionally avoid using c. for our options as a python program @@ -30,18 +30,18 @@ import oslo.config.cfg # At some point later we might want to unshare a. and b. as well, in order # to allow app-specific options. -CONF = oslo.config.cfg.ConfigOpts() +CONF = oslo_config.cfg.ConfigOpts() # re-export for convenience -from oslo.config.cfg import ConfigOpts +from oslo_config.cfg import ConfigOpts -from oslo.config.cfg import BoolOpt -from oslo.config.cfg import IntOpt -from oslo.config.cfg import ListOpt -from oslo.config.cfg import MultiStrOpt -from oslo.config.cfg import StrOpt -from oslo.config.cfg import FloatOpt +from oslo_config.cfg import BoolOpt +from oslo_config.cfg import IntOpt +from oslo_config.cfg import ListOpt +from oslo_config.cfg import MultiStrOpt +from oslo_config.cfg import StrOpt +from oslo_config.cfg import FloatOpt -from oslo.config.cfg import RequiredOptError -from oslo.config.cfg import ConfigFilesNotFoundError +from oslo_config.cfg import RequiredOptError +from oslo_config.cfg import ConfigFilesNotFoundError diff --git a/ryu/cmd/manager.py b/ryu/cmd/manager.py index f17d0eab..b1ce8da2 100755 --- a/ryu/cmd/manager.py +++ b/ryu/cmd/manager.py @@ -25,7 +25,6 @@ hub.patch(thread=False) # use it # # NOTE: this modifies sys.path and thus affects the following imports. -# eg. oslo.config.cfg. import ryu.contrib ryu.contrib.update_module_path() diff --git a/ryu/services/protocols/bgp/application.py b/ryu/services/protocols/bgp/application.py index fc8e7a71..0eb9da4c 100644 --- a/ryu/services/protocols/bgp/application.py +++ b/ryu/services/protocols/bgp/application.py @@ -19,7 +19,7 @@ import imp import logging import traceback from os import path -from oslo.config import cfg +from oslo_config import cfg from ryu.lib import hub from ryu.base.app_manager import RyuApp diff --git a/ryu/tests/switch/run_mininet.py b/ryu/tests/switch/run_mininet.py index 333efcbe..5d30d010 100755 --- a/ryu/tests/switch/run_mininet.py +++ b/ryu/tests/switch/run_mininet.py @@ -10,7 +10,7 @@ from mininet.node import OVSSwitch from mininet.node import UserSwitch from mininet.term import makeTerm -from oslo.config import cfg +from oslo_config import cfg from ryu import version if '__main__' == __name__: diff --git a/tools/pip-requires b/tools/pip-requires index 5753ce52..96eba22c 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,7 +1,7 @@ eventlet msgpack-python>=0.3.0 # RPC library, BGP speaker(net_cntl) netaddr -oslo.config>=1.2.0 +oslo.config>=1.6.0 routes # wsgi six>=1.4.0 webob>=1.2 # wsgi |