openstack/python-openstackclient
Code Issues Proposed changes

Merge "Move network stuff to v2 instead of v2_0"

Browse Source
This commit is contained in:
Jenkins 2014-07-07 22:53:12 +00:00 committed by Gerrit Code Review
commit ea938e8ddf
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/network/client.py
View File

@ -18,11 +18,11 @@ from openstackclient.common import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEFAULT_NETWORK_API_VERSION = '2.0' DEFAULT_NETWORK_API_VERSION = '2'
API_VERSION_OPTION = 'os_network_api_version' API_VERSION_OPTION = 'os_network_api_version'
API_NAME = "network" API_NAME = "network"
API_VERSIONS = { API_VERSIONS = {
"2.0": "neutronclient.v2_0.client.Client", "2": "neutronclient.v2_0.client.Client",
} }

0
openstackclient/network/v2_0/__init__.py → openstackclient/network/v2/__init__.py
View File

0
openstackclient/network/v2_0/network.py → openstackclient/network/v2/network.py
View File

0
openstackclient/tests/network/v2_0/__init__.py → openstackclient/tests/network/v2/__init__.py
View File

2
openstackclient/tests/network/v2_0/test_network.py → openstackclient/tests/network/v2/test_network.py
View File

@ -15,7 +15,7 @@ import copy
import mock import mock
from openstackclient.common import exceptions from openstackclient.common import exceptions
from openstackclient.network.v2_0 import network from openstackclient.network.v2 import network
from openstackclient.tests.network import common from openstackclient.tests.network import common
RESOURCE = 'network' RESOURCE = 'network'

4
openstackclient/tests/test_shell.py
View File

@ -39,13 +39,13 @@ DEFAULT_COMPUTE_API_VERSION = "2"
DEFAULT_IDENTITY_API_VERSION = "2.0" DEFAULT_IDENTITY_API_VERSION = "2.0"
DEFAULT_IMAGE_API_VERSION = "v2" DEFAULT_IMAGE_API_VERSION = "v2"
DEFAULT_VOLUME_API_VERSION = "1" DEFAULT_VOLUME_API_VERSION = "1"
DEFAULT_NETWORK_API_VERSION = "2.0" DEFAULT_NETWORK_API_VERSION = "2"
LIB_COMPUTE_API_VERSION = "2" LIB_COMPUTE_API_VERSION = "2"
LIB_IDENTITY_API_VERSION = "2.0" LIB_IDENTITY_API_VERSION = "2.0"
LIB_IMAGE_API_VERSION = "1" LIB_IMAGE_API_VERSION = "1"
LIB_VOLUME_API_VERSION = "1" LIB_VOLUME_API_VERSION = "1"
LIB_NETWORK_API_VERSION = "2.0" LIB_NETWORK_API_VERSION = "2"
def make_shell(): def make_shell():

12
setup.cfg
View File

@ -258,12 +258,12 @@ openstack.image.v2 =
image_save = openstackclient.image.v2.image:SaveImage image_save = openstackclient.image.v2.image:SaveImage
image_show = openstackclient.image.v2.image:ShowImage image_show = openstackclient.image.v2.image:ShowImage
openstack.network.v2_0 = openstack.network.v2 =
network_create = openstackclient.network.v2_0.network:CreateNetwork network_create = openstackclient.network.v2.network:CreateNetwork
network_delete = openstackclient.network.v2_0.network:DeleteNetwork network_delete = openstackclient.network.v2.network:DeleteNetwork
network_list = openstackclient.network.v2_0.network:ListNetwork network_list = openstackclient.network.v2.network:ListNetwork
network_set = openstackclient.network.v2_0.network:SetNetwork network_set = openstackclient.network.v2.network:SetNetwork
network_show = openstackclient.network.v2_0.network:ShowNetwork network_show = openstackclient.network.v2.network:ShowNetwork
openstack.object_store.v1 = openstack.object_store.v1 =
container_list = openstackclient.object.v1.container:ListContainer container_list = openstackclient.object.v1.container:ListContainer