Upgrade command version to v2
Because rsdclient provide new sub-commands for RSD 2.3, upgrade version to v2. Change-Id: I9f664aef08ac40b5a6b2c0c7705b2231e067ce58
This commit is contained in:
parent
4ada7530a5
commit
50913a252b
@ -24,11 +24,11 @@ from rsdclient.common import utils as rsdclient_utils
|
|||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
DEFAULT_API_VERSION = '1.2'
|
DEFAULT_API_VERSION = '2.3'
|
||||||
API_VERSION_OPTION = 'os_rsd_api_version'
|
API_VERSION_OPTION = 'os_rsd_api_version'
|
||||||
API_NAME = 'rsd'
|
API_NAME = 'rsd'
|
||||||
API_VERSIONS = {
|
API_VERSIONS = {
|
||||||
'1.2': 'rsdclient.v1.client.Client',
|
'2.3': 'rsdclient.v2.client.Client',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
import mock
|
import mock
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from rsdclient.v1 import client
|
from rsdclient.v2 import client
|
||||||
|
|
||||||
|
|
||||||
class ClientInitializeTest(testtools.TestCase):
|
class ClientInitializeTest(testtools.TestCase):
|
@ -17,7 +17,7 @@ import mock
|
|||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from rsdclient.tests.common import fakes
|
from rsdclient.tests.common import fakes
|
||||||
from rsdclient.v1 import fabric
|
from rsdclient.v2 import fabric
|
||||||
|
|
||||||
|
|
||||||
class FabricTest(testtools.TestCase):
|
class FabricTest(testtools.TestCase):
|
@ -17,7 +17,7 @@ import mock
|
|||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from rsdclient.tests.common import fakes
|
from rsdclient.tests.common import fakes
|
||||||
from rsdclient.v1 import node
|
from rsdclient.v2 import node
|
||||||
|
|
||||||
|
|
||||||
class NodeTest(testtools.TestCase):
|
class NodeTest(testtools.TestCase):
|
@ -17,7 +17,7 @@ import mock
|
|||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from rsdclient.tests.common import fakes
|
from rsdclient.tests.common import fakes
|
||||||
from rsdclient.v1 import storage_service
|
from rsdclient.v2 import storage_service
|
||||||
|
|
||||||
|
|
||||||
class StorageServiceTest(testtools.TestCase):
|
class StorageServiceTest(testtools.TestCase):
|
@ -15,9 +15,9 @@
|
|||||||
|
|
||||||
import rsd_lib
|
import rsd_lib
|
||||||
|
|
||||||
from rsdclient.v1 import fabric
|
from rsdclient.v2 import fabric
|
||||||
from rsdclient.v1 import node
|
from rsdclient.v2 import node
|
||||||
from rsdclient.v1 import storage_service
|
from rsdclient.v2 import storage_service
|
||||||
|
|
||||||
|
|
||||||
class Client(object):
|
class Client(object):
|
50
setup.cfg
50
setup.cfg
@ -27,33 +27,33 @@ packages =
|
|||||||
openstack.cli.extension =
|
openstack.cli.extension =
|
||||||
rsd = rsdclient.osc.plugin
|
rsd = rsdclient.osc.plugin
|
||||||
|
|
||||||
openstack.rsd.v1 =
|
openstack.rsd.v2 =
|
||||||
rsd_node_compose = rsdclient.osc.v1.node:ComposeNode
|
rsd_node_compose = rsdclient.osc.v2.node:ComposeNode
|
||||||
rsd_node_delete = rsdclient.osc.v1.node:DeleteNode
|
rsd_node_delete = rsdclient.osc.v2.node:DeleteNode
|
||||||
rsd_node_show = rsdclient.osc.v1.node:ShowNode
|
rsd_node_show = rsdclient.osc.v2.node:ShowNode
|
||||||
rsd_node_list = rsdclient.osc.v1.node:ListNode
|
rsd_node_list = rsdclient.osc.v2.node:ListNode
|
||||||
rsd_node_attach = rsdclient.osc.v1.node:AttachEndpoint
|
rsd_node_attach = rsdclient.osc.v2.node:AttachEndpoint
|
||||||
rsd_node_detach = rsdclient.osc.v1.node:DetachEndpoint
|
rsd_node_detach = rsdclient.osc.v2.node:DetachEndpoint
|
||||||
rsd_node_reset = rsdclient.osc.v1.node:ResetNode
|
rsd_node_reset = rsdclient.osc.v2.node:ResetNode
|
||||||
rsd_node_bootsource = rsdclient.osc.v1.node:SetBootSource
|
rsd_node_bootsource = rsdclient.osc.v2.node:SetBootSource
|
||||||
|
|
||||||
rsd_storage_list = rsdclient.osc.v1.storage_service:ListStorageServices
|
rsd_storage_list = rsdclient.osc.v2.storage_service:ListStorageServices
|
||||||
rsd_storage_show = rsdclient.osc.v1.storage_service:ShowStorageServices
|
rsd_storage_show = rsdclient.osc.v2.storage_service:ShowStorageServices
|
||||||
rsd_storage_volume_list = rsdclient.osc.v1.storage_service:ListVolumes
|
rsd_storage_volume_list = rsdclient.osc.v2.storage_service:ListVolumes
|
||||||
rsd_storage_volume_show = rsdclient.osc.v1.storage_service:ShowVolume
|
rsd_storage_volume_show = rsdclient.osc.v2.storage_service:ShowVolume
|
||||||
rsd_storage_volume_update = rsdclient.osc.v1.storage_service:UpdateVolume
|
rsd_storage_volume_update = rsdclient.osc.v2.storage_service:UpdateVolume
|
||||||
rsd_storage_volume_init = rsdclient.osc.v1.storage_service:InitializeVolume
|
rsd_storage_volume_init = rsdclient.osc.v2.storage_service:InitializeVolume
|
||||||
rsd_storage_volume_create = rsdclient.osc.v1.storage_service:CreateVolume
|
rsd_storage_volume_create = rsdclient.osc.v2.storage_service:CreateVolume
|
||||||
rsd_storage_volume_delete = rsdclient.osc.v1.storage_service:DeleteVolume
|
rsd_storage_volume_delete = rsdclient.osc.v2.storage_service:DeleteVolume
|
||||||
rsd_storage_drive_list = rsdclient.osc.v1.storage_service:ListDrives
|
rsd_storage_drive_list = rsdclient.osc.v2.storage_service:ListDrives
|
||||||
rsd_storage_drive_show = rsdclient.osc.v1.storage_service:ShowDrive
|
rsd_storage_drive_show = rsdclient.osc.v2.storage_service:ShowDrive
|
||||||
rsd_storage_storagepool_list = rsdclient.osc.v1.storage_service:ListStoragePools
|
rsd_storage_storagepool_list = rsdclient.osc.v2.storage_service:ListStoragePools
|
||||||
rsd_storage_storagepool_show = rsdclient.osc.v1.storage_service:ShowStoragePool
|
rsd_storage_storagepool_show = rsdclient.osc.v2.storage_service:ShowStoragePool
|
||||||
|
|
||||||
rsd_fabric_list = rsdclient.osc.v1.fabric:ListFabric
|
rsd_fabric_list = rsdclient.osc.v2.fabric:ListFabric
|
||||||
rsd_fabric_show = rsdclient.osc.v1.fabric:ShowFabric
|
rsd_fabric_show = rsdclient.osc.v2.fabric:ShowFabric
|
||||||
rsd_fabric_endpoint_list = rsdclient.osc.v1.fabric:ListEndpoint
|
rsd_fabric_endpoint_list = rsdclient.osc.v2.fabric:ListEndpoint
|
||||||
rsd_fabric_endpoint_show = rsdclient.osc.v1.fabric:ShowEndpoint
|
rsd_fabric_endpoint_show = rsdclient.osc.v2.fabric:ShowEndpoint
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
all-files = 1
|
all-files = 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user