diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-07 22:53:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-07 22:53:12 +0000 |
| commit | ea938e8ddfa0f5f8832e09d61537f1e81e3121e9 (patch) | |
| tree | 3016840f118cdb7bcecdc81c25347d996c19bc68 /openstackclient | |
| parent | dad5b1051057b7adf1bffb43563491e93d7adf95 (diff) | |
| parent | b157dc937e95b7334b0c1816b6b165d080fc3be6 (diff) | |
| download | python-openstackclient-ea938e8ddfa0f5f8832e09d61537f1e81e3121e9.tar.gz | |
Merge "Move network stuff to v2 instead of v2_0"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/client.py | 4 | ||||
| -rw-r--r-- | openstackclient/network/v2/__init__.py (renamed from openstackclient/network/v2_0/__init__.py) | 0 | ||||
| -rw-r--r-- | openstackclient/network/v2/network.py (renamed from openstackclient/network/v2_0/network.py) | 0 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/__init__.py (renamed from openstackclient/tests/network/v2_0/__init__.py) | 0 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py (renamed from openstackclient/tests/network/v2_0/test_network.py) | 2 | ||||
| -rw-r--r-- | openstackclient/tests/test_shell.py | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py index 3c87e135..db0b5279 100644 --- a/openstackclient/network/client.py +++ b/openstackclient/network/client.py @@ -18,11 +18,11 @@ from openstackclient.common import utils LOG = logging.getLogger(__name__) -DEFAULT_NETWORK_API_VERSION = '2.0' +DEFAULT_NETWORK_API_VERSION = '2' API_VERSION_OPTION = 'os_network_api_version' API_NAME = "network" API_VERSIONS = { - "2.0": "neutronclient.v2_0.client.Client", + "2": "neutronclient.v2_0.client.Client", } diff --git a/openstackclient/network/v2_0/__init__.py b/openstackclient/network/v2/__init__.py index e69de29b..e69de29b 100644 --- a/openstackclient/network/v2_0/__init__.py +++ b/openstackclient/network/v2/__init__.py diff --git a/openstackclient/network/v2_0/network.py b/openstackclient/network/v2/network.py index c0c25e71..c0c25e71 100644 --- a/openstackclient/network/v2_0/network.py +++ b/openstackclient/network/v2/network.py diff --git a/openstackclient/tests/network/v2_0/__init__.py b/openstackclient/tests/network/v2/__init__.py index e69de29b..e69de29b 100644 --- a/openstackclient/tests/network/v2_0/__init__.py +++ b/openstackclient/tests/network/v2/__init__.py diff --git a/openstackclient/tests/network/v2_0/test_network.py b/openstackclient/tests/network/v2/test_network.py index ef7d24ee..b0c6af70 100644 --- a/openstackclient/tests/network/v2_0/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -15,7 +15,7 @@ import copy import mock from openstackclient.common import exceptions -from openstackclient.network.v2_0 import network +from openstackclient.network.v2 import network from openstackclient.tests.network import common RESOURCE = 'network' diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index dfb8021a..c180289e 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -39,13 +39,13 @@ DEFAULT_COMPUTE_API_VERSION = "2" DEFAULT_IDENTITY_API_VERSION = "2.0" DEFAULT_IMAGE_API_VERSION = "v2" DEFAULT_VOLUME_API_VERSION = "1" -DEFAULT_NETWORK_API_VERSION = "2.0" +DEFAULT_NETWORK_API_VERSION = "2" LIB_COMPUTE_API_VERSION = "2" LIB_IDENTITY_API_VERSION = "2.0" LIB_IMAGE_API_VERSION = "1" LIB_VOLUME_API_VERSION = "1" -LIB_NETWORK_API_VERSION = "2.0" +LIB_NETWORK_API_VERSION = "2" def make_shell(): |