From 8e5d37837285669268c798c05f607d590f405d90 Mon Sep 17 00:00:00 2001 From: Marcus Wanner Date: Tue, 21 Jul 2015 10:35:09 -0400 Subject: [PATCH] Add awareness of Manila and SHARED_FILESYSTEM openstack projects to keystone --- .../org/jclouds/openstack/v2_0/ServiceType.java | 5 +++++ .../keystone/v2_0/parse/ParseAccessTest.java | 8 ++++++++ .../src/test/resources/keystoneAuthResponse.json | 14 ++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java index 9cd8ffa58a..cd5ff0efbc 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java @@ -72,6 +72,11 @@ public final class ServiceType { */ public static final String CDN = "cdn"; + /** + * Shared Filsystem Service (Manila) + */ + public static final String SHARED_FILESYSTEM = "share"; + private ServiceType() { throw new AssertionError("intentionally unimplemented"); } 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 b4dba5cdb2..57bcd82c87 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 @@ -39,6 +39,7 @@ import static org.jclouds.openstack.v2_0.ServiceType.IMAGE; import static org.jclouds.openstack.v2_0.ServiceType.NETWORK; import static org.jclouds.openstack.v2_0.ServiceType.OBJECT_STORE; import static org.jclouds.openstack.v2_0.ServiceType.QUEUES; +import static org.jclouds.openstack.v2_0.ServiceType.SHARED_FILESYSTEM; @Test(groups = "unit", testName = "ParseAccessTest") @@ -129,6 +130,13 @@ public class ParseAccessTest extends BaseItemParserTest { .internalURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d") .adminURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d") .region("RegionOne").build()).build()) + .service(Service.builder().name("manila").type(SHARED_FILESYSTEM) + .endpoint(Endpoint.builder() + .id("c06b43bc23e44be6b079ac319718014e") + .publicURL("http://172.16.0.1:8786/v1/50cdb4c60374463198695d9f798fa34d") + .internalURL("http://10.0.2.15:8786/v1/50cdb4c60374463198695d9f798fa34d") + .adminURL("http://10.0.2.15:8786/v1/50cdb4c60374463198695d9f798fa34d") + .region("RegionOne").build()).build()) .service(Service.builder().name("trove").type(DATABASE) .endpoint(Endpoint.builder() .publicURL("http://172.16.0.1:8776/v1/3456") diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json index eab46bd1d5..5afc607535 100644 --- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json +++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json @@ -154,6 +154,20 @@ ], "endpoints_links": [] }, + { + "type": "share", + "name": "manila", + "endpoints": [ + { + "adminURL": "http://10.0.2.15:8786/v1/50cdb4c60374463198695d9f798fa34d", + "region": "RegionOne", + "internalURL": "http://10.0.2.15:8786/v1/50cdb4c60374463198695d9f798fa34d", + "id": "c06b43bc23e44be6b079ac319718014e", + "publicURL": "http://172.16.0.1:8786/v1/50cdb4c60374463198695d9f798fa34d" + } + ], + "endpoints_links": [] + }, { "type": "database", "name": "trove",