You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/07/27 14:36:11 UTC
jclouds git commit: Add awareness of Manila and SHARED_FILESYSTEM
openstack projects to keystone
Repository: jclouds
Updated Branches:
refs/heads/master d7c486775 -> 35b71c572
Add awareness of Manila and SHARED_FILESYSTEM openstack projects to keystone
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/35b71c57
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/35b71c57
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/35b71c57
Branch: refs/heads/master
Commit: 35b71c572833c066276121c67748b9e0d2f6336b
Parents: d7c4867
Author: Marcus Wanner <ma...@wanners.net>
Authored: Tue Jul 21 10:35:09 2015 -0400
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Mon Jul 27 07:22:43 2015 -0500
----------------------------------------------------------------------
.../java/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(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/35b71c57/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
----------------------------------------------------------------------
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 9cd8ffa..cd5ff0e 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");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/35b71c57/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
----------------------------------------------------------------------
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 b4dba5c..57bcd82 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<Access> {
.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")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/35b71c57/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
index eab46bd..5afc607 100644
--- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
+++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
@@ -155,6 +155,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",
"endpoints": [