From 50913a252b4913fa64508680fb4dc7cb8befec52 Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Thu, 6 Sep 2018 20:45:08 -0700 Subject: [PATCH] Upgrade command version to v2 Because rsdclient provide new sub-commands for RSD 2.3, upgrade version to v2. Change-Id: I9f664aef08ac40b5a6b2c0c7705b2231e067ce58 --- rsdclient/osc/plugin.py | 4 +- rsdclient/osc/{v1 => v2}/__init__.py | 0 rsdclient/osc/{v1 => v2}/fabric.py | 0 rsdclient/osc/{v1 => v2}/node.py | 0 rsdclient/osc/{v1 => v2}/storage_service.py | 0 rsdclient/tests/{v1 => v2}/__init__.py | 0 rsdclient/tests/{v1 => v2}/test_client.py | 2 +- rsdclient/tests/{v1 => v2}/test_fabric.py | 2 +- rsdclient/tests/{v1 => v2}/test_node.py | 2 +- .../tests/{v1 => v2}/test_storage_service.py | 2 +- rsdclient/{v1 => v2}/__init__.py | 0 rsdclient/{v1 => v2}/client.py | 6 +-- rsdclient/{v1 => v2}/fabric.py | 0 rsdclient/{v1 => v2}/node.py | 0 rsdclient/{v1 => v2}/storage_service.py | 0 setup.cfg | 50 +++++++++---------- 16 files changed, 34 insertions(+), 34 deletions(-) rename rsdclient/osc/{v1 => v2}/__init__.py (100%) rename rsdclient/osc/{v1 => v2}/fabric.py (100%) rename rsdclient/osc/{v1 => v2}/node.py (100%) rename rsdclient/osc/{v1 => v2}/storage_service.py (100%) rename rsdclient/tests/{v1 => v2}/__init__.py (100%) rename rsdclient/tests/{v1 => v2}/test_client.py (97%) rename rsdclient/tests/{v1 => v2}/test_fabric.py (99%) rename rsdclient/tests/{v1 => v2}/test_node.py (99%) rename rsdclient/tests/{v1 => v2}/test_storage_service.py (99%) rename rsdclient/{v1 => v2}/__init__.py (100%) rename rsdclient/{v1 => v2}/client.py (94%) rename rsdclient/{v1 => v2}/fabric.py (100%) rename rsdclient/{v1 => v2}/node.py (100%) rename rsdclient/{v1 => v2}/storage_service.py (100%) diff --git a/rsdclient/osc/plugin.py b/rsdclient/osc/plugin.py index 4797ff1..9a54f02 100644 --- a/rsdclient/osc/plugin.py +++ b/rsdclient/osc/plugin.py @@ -24,11 +24,11 @@ from rsdclient.common import utils as rsdclient_utils LOG = logging.getLogger(__name__) -DEFAULT_API_VERSION = '1.2' +DEFAULT_API_VERSION = '2.3' API_VERSION_OPTION = 'os_rsd_api_version' API_NAME = 'rsd' API_VERSIONS = { - '1.2': 'rsdclient.v1.client.Client', + '2.3': 'rsdclient.v2.client.Client', } diff --git a/rsdclient/osc/v1/__init__.py b/rsdclient/osc/v2/__init__.py similarity index 100% rename from rsdclient/osc/v1/__init__.py rename to rsdclient/osc/v2/__init__.py diff --git a/rsdclient/osc/v1/fabric.py b/rsdclient/osc/v2/fabric.py similarity index 100% rename from rsdclient/osc/v1/fabric.py rename to rsdclient/osc/v2/fabric.py diff --git a/rsdclient/osc/v1/node.py b/rsdclient/osc/v2/node.py similarity index 100% rename from rsdclient/osc/v1/node.py rename to rsdclient/osc/v2/node.py diff --git a/rsdclient/osc/v1/storage_service.py b/rsdclient/osc/v2/storage_service.py similarity index 100% rename from rsdclient/osc/v1/storage_service.py rename to rsdclient/osc/v2/storage_service.py diff --git a/rsdclient/tests/v1/__init__.py b/rsdclient/tests/v2/__init__.py similarity index 100% rename from rsdclient/tests/v1/__init__.py rename to rsdclient/tests/v2/__init__.py diff --git a/rsdclient/tests/v1/test_client.py b/rsdclient/tests/v2/test_client.py similarity index 97% rename from rsdclient/tests/v1/test_client.py rename to rsdclient/tests/v2/test_client.py index 285d70c..7e9cbba 100644 --- a/rsdclient/tests/v1/test_client.py +++ b/rsdclient/tests/v2/test_client.py @@ -16,7 +16,7 @@ import mock import testtools -from rsdclient.v1 import client +from rsdclient.v2 import client class ClientInitializeTest(testtools.TestCase): diff --git a/rsdclient/tests/v1/test_fabric.py b/rsdclient/tests/v2/test_fabric.py similarity index 99% rename from rsdclient/tests/v1/test_fabric.py rename to rsdclient/tests/v2/test_fabric.py index f73078d..28a9d14 100644 --- a/rsdclient/tests/v1/test_fabric.py +++ b/rsdclient/tests/v2/test_fabric.py @@ -17,7 +17,7 @@ import mock import testtools from rsdclient.tests.common import fakes -from rsdclient.v1 import fabric +from rsdclient.v2 import fabric class FabricTest(testtools.TestCase): diff --git a/rsdclient/tests/v1/test_node.py b/rsdclient/tests/v2/test_node.py similarity index 99% rename from rsdclient/tests/v1/test_node.py rename to rsdclient/tests/v2/test_node.py index 893074a..03cb6c8 100644 --- a/rsdclient/tests/v1/test_node.py +++ b/rsdclient/tests/v2/test_node.py @@ -17,7 +17,7 @@ import mock import testtools from rsdclient.tests.common import fakes -from rsdclient.v1 import node +from rsdclient.v2 import node class NodeTest(testtools.TestCase): diff --git a/rsdclient/tests/v1/test_storage_service.py b/rsdclient/tests/v2/test_storage_service.py similarity index 99% rename from rsdclient/tests/v1/test_storage_service.py rename to rsdclient/tests/v2/test_storage_service.py index b9c2e06..c55e8ca 100644 --- a/rsdclient/tests/v1/test_storage_service.py +++ b/rsdclient/tests/v2/test_storage_service.py @@ -17,7 +17,7 @@ import mock import testtools from rsdclient.tests.common import fakes -from rsdclient.v1 import storage_service +from rsdclient.v2 import storage_service class StorageServiceTest(testtools.TestCase): diff --git a/rsdclient/v1/__init__.py b/rsdclient/v2/__init__.py similarity index 100% rename from rsdclient/v1/__init__.py rename to rsdclient/v2/__init__.py diff --git a/rsdclient/v1/client.py b/rsdclient/v2/client.py similarity index 94% rename from rsdclient/v1/client.py rename to rsdclient/v2/client.py index 9223616..d3810f4 100644 --- a/rsdclient/v1/client.py +++ b/rsdclient/v2/client.py @@ -15,9 +15,9 @@ import rsd_lib -from rsdclient.v1 import fabric -from rsdclient.v1 import node -from rsdclient.v1 import storage_service +from rsdclient.v2 import fabric +from rsdclient.v2 import node +from rsdclient.v2 import storage_service class Client(object): diff --git a/rsdclient/v1/fabric.py b/rsdclient/v2/fabric.py similarity index 100% rename from rsdclient/v1/fabric.py rename to rsdclient/v2/fabric.py diff --git a/rsdclient/v1/node.py b/rsdclient/v2/node.py similarity index 100% rename from rsdclient/v1/node.py rename to rsdclient/v2/node.py diff --git a/rsdclient/v1/storage_service.py b/rsdclient/v2/storage_service.py similarity index 100% rename from rsdclient/v1/storage_service.py rename to rsdclient/v2/storage_service.py diff --git a/setup.cfg b/setup.cfg index cde0220..e6e5a01 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,33 +27,33 @@ packages = openstack.cli.extension = rsd = rsdclient.osc.plugin -openstack.rsd.v1 = - rsd_node_compose = rsdclient.osc.v1.node:ComposeNode - rsd_node_delete = rsdclient.osc.v1.node:DeleteNode - rsd_node_show = rsdclient.osc.v1.node:ShowNode - rsd_node_list = rsdclient.osc.v1.node:ListNode - rsd_node_attach = rsdclient.osc.v1.node:AttachEndpoint - rsd_node_detach = rsdclient.osc.v1.node:DetachEndpoint - rsd_node_reset = rsdclient.osc.v1.node:ResetNode - rsd_node_bootsource = rsdclient.osc.v1.node:SetBootSource +openstack.rsd.v2 = + rsd_node_compose = rsdclient.osc.v2.node:ComposeNode + rsd_node_delete = rsdclient.osc.v2.node:DeleteNode + rsd_node_show = rsdclient.osc.v2.node:ShowNode + rsd_node_list = rsdclient.osc.v2.node:ListNode + rsd_node_attach = rsdclient.osc.v2.node:AttachEndpoint + rsd_node_detach = rsdclient.osc.v2.node:DetachEndpoint + rsd_node_reset = rsdclient.osc.v2.node:ResetNode + rsd_node_bootsource = rsdclient.osc.v2.node:SetBootSource - rsd_storage_list = rsdclient.osc.v1.storage_service:ListStorageServices - rsd_storage_show = rsdclient.osc.v1.storage_service:ShowStorageServices - rsd_storage_volume_list = rsdclient.osc.v1.storage_service:ListVolumes - rsd_storage_volume_show = rsdclient.osc.v1.storage_service:ShowVolume - rsd_storage_volume_update = rsdclient.osc.v1.storage_service:UpdateVolume - rsd_storage_volume_init = rsdclient.osc.v1.storage_service:InitializeVolume - rsd_storage_volume_create = rsdclient.osc.v1.storage_service:CreateVolume - rsd_storage_volume_delete = rsdclient.osc.v1.storage_service:DeleteVolume - rsd_storage_drive_list = rsdclient.osc.v1.storage_service:ListDrives - rsd_storage_drive_show = rsdclient.osc.v1.storage_service:ShowDrive - rsd_storage_storagepool_list = rsdclient.osc.v1.storage_service:ListStoragePools - rsd_storage_storagepool_show = rsdclient.osc.v1.storage_service:ShowStoragePool + rsd_storage_list = rsdclient.osc.v2.storage_service:ListStorageServices + rsd_storage_show = rsdclient.osc.v2.storage_service:ShowStorageServices + rsd_storage_volume_list = rsdclient.osc.v2.storage_service:ListVolumes + rsd_storage_volume_show = rsdclient.osc.v2.storage_service:ShowVolume + rsd_storage_volume_update = rsdclient.osc.v2.storage_service:UpdateVolume + rsd_storage_volume_init = rsdclient.osc.v2.storage_service:InitializeVolume + rsd_storage_volume_create = rsdclient.osc.v2.storage_service:CreateVolume + rsd_storage_volume_delete = rsdclient.osc.v2.storage_service:DeleteVolume + rsd_storage_drive_list = rsdclient.osc.v2.storage_service:ListDrives + rsd_storage_drive_show = rsdclient.osc.v2.storage_service:ShowDrive + rsd_storage_storagepool_list = rsdclient.osc.v2.storage_service:ListStoragePools + rsd_storage_storagepool_show = rsdclient.osc.v2.storage_service:ShowStoragePool - rsd_fabric_list = rsdclient.osc.v1.fabric:ListFabric - rsd_fabric_show = rsdclient.osc.v1.fabric:ShowFabric - rsd_fabric_endpoint_list = rsdclient.osc.v1.fabric:ListEndpoint - rsd_fabric_endpoint_show = rsdclient.osc.v1.fabric:ShowEndpoint + rsd_fabric_list = rsdclient.osc.v2.fabric:ListFabric + rsd_fabric_show = rsdclient.osc.v2.fabric:ShowFabric + rsd_fabric_endpoint_list = rsdclient.osc.v2.fabric:ListEndpoint + rsd_fabric_endpoint_show = rsdclient.osc.v2.fabric:ShowEndpoint [build_sphinx] all-files = 1