From 02d1ac4648b31fef1e2a64fa482ecd17f914321d Mon Sep 17 00:00:00 2001 From: Andrey Trubitsyn Date: Mon, 8 Jul 2013 15:03:41 +0300 Subject: [PATCH] Added test environment for Quantum v2.0 client This patch adds test environment for the future Quantum v2.0 client implementation. Signed-off-by: Andrey Trubitsyn --- .../keystone/v2_0/parse/ParseAccessTest.java | 9 +++++++++ .../src/test/resources/keystoneAuthResponse.json | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java index b8b8749d47..fffb4e812d 100644 --- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java +++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java @@ -116,6 +116,15 @@ public class ParseAccessTest extends BaseItemParserTest { .adminURL("https://csnode.jclouds.org:9696/v1.0") .region("region-a.geo-1") .versionId("1.0").build()).build()) + .service(Service.builder().name("Quantum Service").type(NETWORK) + .endpoint(Endpoint.builder() + .tenantId("3456") + .publicURL("https://csnode.jclouds.org:9696") + .internalURL("https://csnode.jclouds.org:9696") + .adminURL("https://csnode.jclouds.org:9696") + .region("region-a.geo-1") + .versionId("2.0").build()).build()) + .service(Service.builder().name("cinder").type(BLOCK_STORAGE) .endpoint(Endpoint.builder() .id("08330c2dcbfc4c6c8dc7a0949fbf5da7") diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json index dac6a2b74c..a05c52188b 100644 --- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json +++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json @@ -125,6 +125,21 @@ ], "endpoints_links": [] }, + { + "type": "network", + "name": "Quantum Service", + "endpoints": [ + { + "tenantId": "3456", + "adminURL": "https://csnode.jclouds.org:9696", + "region": "region-a.geo-1", + "versionId": "2.0", + "publicURL": "https://csnode.jclouds.org:9696", + "internalURL": "https://csnode.jclouds.org:9696" + } + ], + "endpoints_links": [] + }, { "type": "volume", "name": "cinder",