Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add awareness of Manila and SHARED_FILESYSTEM openstack projects to keystone

This commit is contained in:
Marcus Wanner 2015-07-21 10:35:09 -04:00 committed by Zack Shoylev
parent 48c0794b09
commit 8e5d378372
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
View File

@ -72,6 +72,11 @@ public final class ServiceType {
*/ */
public static final String CDN = "cdn"; public static final String CDN = "cdn";
/**
* Shared Filsystem Service (Manila)
*/
public static final String SHARED_FILESYSTEM = "share";
private ServiceType() { private ServiceType() {
throw new AssertionError("intentionally unimplemented"); throw new AssertionError("intentionally unimplemented");
} }

8
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
View File

@ -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.NETWORK;
import static org.jclouds.openstack.v2_0.ServiceType.OBJECT_STORE; 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.QUEUES;
import static org.jclouds.openstack.v2_0.ServiceType.SHARED_FILESYSTEM;
@Test(groups = "unit", testName = "ParseAccessTest") @Test(groups = "unit", testName = "ParseAccessTest")
@ -129,6 +130,13 @@ public class ParseAccessTest extends BaseItemParserTest<Access> {
.internalURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d") .internalURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d")
.adminURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d") .adminURL("http://10.0.2.15:8776/v1/50cdb4c60374463198695d9f798fa34d")
.region("RegionOne").build()).build()) .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) .service(Service.builder().name("trove").type(DATABASE)
.endpoint(Endpoint.builder() .endpoint(Endpoint.builder()
.publicURL("http://172.16.0.1:8776/v1/3456") .publicURL("http://172.16.0.1:8776/v1/3456")

14
apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
View File

@ -154,6 +154,20 @@
], ],
"endpoints_links": [] "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", "type": "database",
"name": "trove", "name": "trove",