Add cinder support LIBCLOUD-874
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d66638a0 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d66638a0 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d66638a0 Branch: refs/heads/trunk Commit: d66638a0db0549353ff7c2856458127283ca5529 Parents: c8d253f Author: micafer <[email protected]> Authored: Mon Sep 24 16:32:58 2018 +0200 Committer: Rick van de Loo <[email protected]> Committed: Tue Dec 4 09:45:48 2018 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/openstack.py | 2 +- libcloud/test/common/test_openstack_identity.py | 2 +- libcloud/test/compute/fixtures/openstack/_v2_0__auth.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/d66638a0/libcloud/compute/drivers/openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/openstack.py b/libcloud/compute/drivers/openstack.py index 4fcdda6..df42acd 100644 --- a/libcloud/compute/drivers/openstack.py +++ b/libcloud/compute/drivers/openstack.py @@ -91,7 +91,7 @@ class OpenStackNetworkConnection(OpenStackBaseConnection): class OpenStackVolumeV2Connection(OpenStackBaseConnection): service_type = 'volumev2' - service_name = 'cinder' + service_name = 'cinderv2' service_region = 'RegionOne' http://git-wip-us.apache.org/repos/asf/libcloud/blob/d66638a0/libcloud/test/common/test_openstack_identity.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_openstack_identity.py b/libcloud/test/common/test_openstack_identity.py index c93cee3..3d7d074 100644 --- a/libcloud/test/common/test_openstack_identity.py +++ b/libcloud/test/common/test_openstack_identity.py @@ -626,7 +626,7 @@ class OpenStackServiceCatalogTestCase(unittest.TestCase): auth_version='2.0') service_names = catalog.get_service_names() - self.assertEqual(service_names, ['cinder', 'cloudFiles', + self.assertEqual(service_names, ['cinderv2', 'cloudFiles', 'cloudFilesCDN', 'cloudServers', 'cloudServersOpenStack', 'cloudServersPreprod', http://git-wip-us.apache.org/repos/asf/libcloud/blob/d66638a0/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json b/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json index d2bd3c3..3727df8 100644 --- a/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json +++ b/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json @@ -139,7 +139,7 @@ "versionId": "2" } ], - "name": "cinder", + "name": "cinderv2", "type": "volumev2" }, {
