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

ServiceType for Marconi/Cloud Queues.

This commit is contained in:
Everett Toews 2013-10-11 12:27:26 -05:00
parent 747fde69e9
commit 3172e0bc11
7 changed files with 114 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public interface ServiceType {
public static final String IDENTITY = "identity";
/**
* Network Service (Quantum)
* Network Service (Neutron)
*/
public static final String NETWORK = "network";
@ -57,7 +57,12 @@ public interface ServiceType {
public static final String BLOCK_STORAGE = "volume";
/**
* Database Service (RedDwarf)
* Database Service (Trove)
*/
public static final String DATABASE_SERVICE = "databases";
/**
* Queues Service (Marconi)
*/
public static final String QUEUES = "queuing";
}

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

@ -31,13 +31,7 @@ import org.jclouds.openstack.keystone.v2_0.domain.User;
import org.jclouds.rest.annotations.SelectJson;
import org.testng.annotations.Test;
import static org.jclouds.openstack.v2_0.ServiceType.BLOCK_STORAGE;
import static org.jclouds.openstack.v2_0.ServiceType.COMPUTE;
import static org.jclouds.openstack.v2_0.ServiceType.DATABASE_SERVICE;
import static org.jclouds.openstack.v2_0.ServiceType.IDENTITY;
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.*;
/**
@ -137,6 +131,13 @@ public class ParseAccessTest extends BaseItemParserTest<Access> {
.publicURL("http://172.16.0.1:8776/v1/3456")
.tenantId("123123")
.region("RegionOne").build()).build())
.service(Service.builder().name("marconi").type(QUEUES)
.endpoint(Endpoint.builder()
.id("3456789")
.publicURL("http://172.16.0.1:8888")
.internalURL("http://10.0.2.15:8888")
.adminURL("http://10.0.2.15:8888")
.region("RegionOne").build()).build())
.service(Service.builder().name("dns").type("dns")
.endpoint(Endpoint.builder()
.publicURL("http://172.16.0.1:8776/v1/3456")

13
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceAccessTest.java
View File

@ -118,6 +118,17 @@ public class ParseRackspaceAccessTest extends BaseItemParserTest<Access> {
.endpoint(Endpoint.builder()
.tenantId("MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22")
.publicURL("https://cdn1.clouddrive.com/v1/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22")
.region("DFW").build()).build()).build();
.region("DFW").build()).build())
.service(Service.builder().name("cloudQueues").type("rax:queues")
.endpoint(Endpoint.builder()
.tenantId("40806637803162")
.publicURL("https://dfw.queues.api.rackspacecloud.com/v1/40806637803162")
.internalURL("https://snet-dfw.queues.api.rackspacecloud.com/v1/40806637803162")
.region("DFW").build())
.endpoint(Endpoint.builder()
.tenantId("40806637803162")
.publicURL("https://ord.queues.api.rackspacecloud.com/v1/40806637803162")
.internalURL("https://snet-ord.queues.api.rackspacecloud.com/v1/40806637803162")
.region("ORD").build()).build()).build();
}
}

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

@ -165,6 +165,20 @@
}
]
},
{
"type": "queuing",
"name": "marconi",
"endpoints": [
{
"adminURL": "http://10.0.2.15:8888",
"region": "RegionOne",
"internalURL": "http://10.0.2.15:8888",
"id": "3456789",
"publicURL": "http://172.16.0.1:8888"
}
],
"endpoints_links": []
},
{
"type": "dns",
"name": "dns",

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

@ -96,6 +96,20 @@
}],
"name": "cloudFilesCDN",
"type": "rax:object-cdn"
}, {
"endpoints": [{
"internalURL": "https:\/\/snet-dfw.queues.api.rackspacecloud.com/v1/40806637803162",
"publicURL": "https:\/\/dfw.queues.api.rackspacecloud.com\/v1\/40806637803162",
"tenantId": "40806637803162",
"region": "DFW"
}, {
"internalURL": "https:\/\/snet-ord.queues.api.rackspacecloud.com/v1/40806637803162",
"publicURL": "https:\/\/ord.queues.api.rackspacecloud.com\/v1\/40806637803162",
"tenantId": "40806637803162",
"region": "ORD"
}],
"type": "rax:queues",
"name": "cloudQueues"
}],
"user": {
"id": "54321",

7
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/ServiceType.java
View File

@ -29,7 +29,12 @@ public interface ServiceType {
public static final String LOAD_BALANCERS = "rax:load-balancer";
/**
* Cloud Load DNS
* Cloud DNS
*/
public static final String DNS = "rax:dns";
/**
* Cloud Queues
*/
public static final String QUEUES = "rax:queues";
}

18
apis/rackspace-cloudidentity/src/test/resources/rackspaceAuthResponse.json
View File

@ -149,6 +149,24 @@
"region": "DFW"
}
]
},
{
"type": "rax:queues",
"name": "cloudQueues",
"endpoints": [
{
"internalURL": "https://snet-ord.queues.api.rackspacecloud.com/v1/123123",
"publicURL": "https://ord.queues.api.rackspacecloud.com/v1/123123",
"tenantId": "123123",
"region": "ORD"
},
{
"internalURL": "https://snet-dfw.queues.api.rackspacecloud.com/v1/123123",
"publicURL": "https://dfw.queues.api.rackspacecloud.com/v1/123123",
"tenantId": "123123",
"region": "DFW"
}
]
}
],
"token": {