Updated Branches: refs/heads/trunk 9984babe6 -> a935af083
Add the Hong Kong (HKG) endpoint for Rackspace Rackspace has opened a datacenter in Hong Kong with an endpoint name of HKG. This change adds the endpoint to the endpoint mappings for the compute and loadbalancer packages. Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/29828594 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/29828594 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/29828594 Branch: refs/heads/trunk Commit: 298285944db663d49e1a76787a09ad22ee56a5c4 Parents: 9984bab Author: briancurtin <[email protected]> Authored: Mon Oct 21 19:01:39 2013 -0500 Committer: Tomaz Muraus <[email protected]> Committed: Tue Oct 22 10:53:45 2013 +0200 ---------------------------------------------------------------------- docs/upgrade_notes.rst | 3 ++- libcloud/compute/drivers/rackspace.py | 4 ++++ libcloud/loadbalancer/drivers/rackspace.py | 4 ++++ libcloud/test/compute/fixtures/openstack/_v2_0__auth.json | 8 ++++++++ .../fixtures/openstack/_v2_0__auth_deployment.json | 9 +++++++++ libcloud/test/compute/test_rackspace.py | 10 ++++++++++ 6 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/docs/upgrade_notes.rst ---------------------------------------------------------------------- diff --git a/docs/upgrade_notes.rst b/docs/upgrade_notes.rst index 96b38f2..dab8d16 100644 --- a/docs/upgrade_notes.rst +++ b/docs/upgrade_notes.rst @@ -93,7 +93,8 @@ And replaced with two new constants: * ``RACKSPACE`` - Supported values for ``region`` argument are: ``us``, ``uk``. Default value is ``us``. * ``RACKSPACE_FIRST_GEN`` - Supported values for the ``region`` argument are: - ``dfw``, ``ord``, ``iad``, ``lon``, ``syd``. Default value is ``dfw``. + ``dfw``, ``ord``, ``iad``, ``lon``, ``syd``, ``hkg``. + Default value is ``dfw``. Besides that, ``RACKSPACE`` provider constant now defaults to next-generation OpenStack based servers. Previously it defaulted to first generation cloud http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/libcloud/compute/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/rackspace.py b/libcloud/compute/drivers/rackspace.py index ccfae90..a96f9d6 100644 --- a/libcloud/compute/drivers/rackspace.py +++ b/libcloud/compute/drivers/rackspace.py @@ -40,6 +40,10 @@ ENDPOINT_ARGS_MAP = { 'syd': {'service_type': 'compute', 'name': 'cloudServersOpenStack', 'region': 'SYD'}, + 'hkg': {'service_type': 'compute', + 'name': 'cloudServersOpenStack', + 'region': 'HKG'}, + } http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/libcloud/loadbalancer/drivers/rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/loadbalancer/drivers/rackspace.py b/libcloud/loadbalancer/drivers/rackspace.py index 4797901..dc9eb05 100644 --- a/libcloud/loadbalancer/drivers/rackspace.py +++ b/libcloud/loadbalancer/drivers/rackspace.py @@ -47,6 +47,10 @@ ENDPOINT_ARGS_MAP = { 'syd': {'service_type': 'rax:load-balancer', 'name': 'cloudLoadBalancers', 'region': 'SYD'}, + 'hkg': {'service_type': 'rax:load-balancer', + 'name': 'cloudLoadBalancers', + 'region': 'HKG'}, + } http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/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 e381662..fa75970 100644 --- a/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json +++ b/libcloud/test/compute/fixtures/openstack/_v2_0__auth.json @@ -101,6 +101,14 @@ "versionInfo": "https://syd.servers.api.rackspacecloud.com/v2/";, "versionList": "https://syd.servers.api.rackspacecloud.com/";, "versionId": "2" + }, + { + "region": "HKG", + "tenantId": "613469", + "publicURL": "https://hkg.servers.api.rackspacecloud.com/v2/1337";, + "versionInfo": "https://hkg.servers.api.rackspacecloud.com/v2/";, + "versionList": "https://hkg.servers.api.rackspacecloud.com/";, + "versionId": "2" } ], http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/libcloud/test/compute/fixtures/openstack/_v2_0__auth_deployment.json ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/openstack/_v2_0__auth_deployment.json b/libcloud/test/compute/fixtures/openstack/_v2_0__auth_deployment.json index 49fb180..9c59431 100644 --- a/libcloud/test/compute/fixtures/openstack/_v2_0__auth_deployment.json +++ b/libcloud/test/compute/fixtures/openstack/_v2_0__auth_deployment.json @@ -101,8 +101,17 @@ "versionInfo": "https://syd.servers.api.rackspacecloud.com/v2/";, "versionList": "https://syd.servers.api.rackspacecloud.com/";, "versionId": "2" + }, + { + "region": "HKG", + "tenantId": "613469", + "publicURL": "https://hkg.servers.api.rackspacecloud.com/v2/slug";, + "versionInfo": "https://hkg.servers.api.rackspacecloud.com/v2/";, + "versionList": "https://hkg.servers.api.rackspacecloud.com/";, + "versionId": "2" } + ], "name": "cloudServersOpenStack", "type": "compute" http://git-wip-us.apache.org/repos/asf/libcloud/blob/29828594/libcloud/test/compute/test_rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_rackspace.py b/libcloud/test/compute/test_rackspace.py index 002747a..62940c4 100644 --- a/libcloud/test/compute/test_rackspace.py +++ b/libcloud/test/compute/test_rackspace.py @@ -199,5 +199,15 @@ class RackspaceNovaSydTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests): expected_endpoint = 'https://syd.servers.api.rackspacecloud.com/v2/1337' + +class RackspaceNovaHkgTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests): + + driver_klass = RackspaceNodeDriver + driver_type = RackspaceNodeDriver + driver_args = RACKSPACE_NOVA_PARAMS + driver_kwargs = {'region': 'hkg'} + + expected_endpoint = 'https://hkg.servers.api.rackspacecloud.com/v2/1337' + if __name__ == '__main__': sys.exit(unittest.main())
