Skip to content
This repository was archived by the owner on Mar 25, 2018. It is now read-only.

Commit 2bbd039

Browse files
author
Everett Toews
committed
Removed trystack-nova provider.
1 parent 6d6be56 commit 2bbd039

28 files changed

+71
-857
lines changed

‎allcompute/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@
180180
<artifactId>hpcloud-compute</artifactId>
181181
<version>${project.version}</version>
182182
</dependency>
183-
<dependency>
184-
<groupId>org.jclouds.provider</groupId>
185-
<artifactId>trystack-nova</artifactId>
186-
<version>${project.version}</version>
187-
</dependency>
188183
<dependency>
189184
<groupId>org.jclouds.provider</groupId>
190185
<artifactId>rackspace-cloudservers-us</artifactId>

‎apis/openstack-keystone/src/test/resources/keystoneAuthResponse_trystack.json ‎apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
},
1111
"serviceCatalog": [{
1212
"endpoints": [{
13-
"adminURL": "https://nova-api.trystack.org:9774/v1.1/3456",
13+
"adminURL": "https://nova-api.openstack.org:9774/v1.1/3456",
1414
"region": "RegionOne",
15-
"internalURL": "https://nova-api.trystack.org:9774/v1.1/3456",
16-
"publicURL": "https://nova-api.trystack.org:9774/v1.1/3456"
15+
"internalURL": "https://nova-api.openstack.org:9774/v1.1/3456",
16+
"publicURL": "https://nova-api.openstack.org:9774/v1.1/3456"
1717
}],
1818
"type": "compute",
1919
"name": "nova"
@@ -28,7 +28,7 @@
2828
"name": "glance"
2929
}, {
3030
"endpoints": [{
31-
"adminURL": "https://nova-api.trystack.org:5443/v2.0",
31+
"adminURL": "https://nova-api.openstack.org:5443/v2.0",
3232
"region": "RegionOne",
3333
"internalURL": "https://keystone.thefreecloud.org:5000/v2.0",
3434
"publicURL": "https://keystone.thefreecloud.org:5000/v2.0"

‎apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/CreateSecurityGroupIfNeeded.java

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public SecurityGroupInZone apply(ZoneSecurityGroupNameAndPorts zoneSecurityGroup
8686

8787
private void authorizeGroupToItselfAndAllIPsToTCPPort(SecurityGroupApi securityGroupApi,
8888
SecurityGroup securityGroup, int port) {
89-
// NOTE that permission to itself isn't supported on trystack!
9089
logger.debug(">> authorizing securityGroup(%s) permission to 0.0.0.0/0 on port %d", securityGroup, port);
9190
securityGroupApi.createRuleAllowingCidrBlock(securityGroup.getId(), Ingress.builder().ipProtocol(
9291
IpProtocol.TCP).fromPort(port).toPort(port).build(), "0.0.0.0/0");

‎apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
5858
protected Properties setupProperties() {
5959
Properties overrides = super.setupProperties();
6060
// only specify limited zones so that we don't have to configure requests for multiple zones.
61-
// since we are doing tests with keystone responses from hpcloud and also trystack, we have
61+
// since we are doing tests with keystone responses from hpcloud and also openstack, we have
6262
// to whitelist one zone from each
6363
overrides.setProperty("jclouds.zones", "az-1.region-a.geo-1,RegionOne");
6464
return overrides;
@@ -85,39 +85,39 @@ public void testListLocationsWhenResponseIs2xx() throws Exception {
8585
assertEquals(apiWhenServersExist.listNodes().iterator().next().getName(), "sample-server");
8686
}
8787

88-
Map<HttpRequest, HttpResponse> defaultTemplateTryStack = ImmutableMap
88+
Map<HttpRequest, HttpResponse> defaultTemplateOpenStack = ImmutableMap
8989
.<HttpRequest, HttpResponse> builder()
9090
.put(keystoneAuthWithUsernameAndPasswordAndTenantName,
9191
HttpResponse
9292
.builder()
9393
.statusCode(200)
9494
.message("HTTP/1.1 200")
9595
.payload(
96-
payloadFromResourceWithContentType("/keystoneAuthResponse_trystack.json", "application/json"))
96+
payloadFromResourceWithContentType("/keystoneAuthResponse_openstack.json", "application/json"))
9797
.build())
9898
.put(extensionsOfNovaRequest.toBuilder()
99-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/extensions").build(),
100-
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/extension_list_trystack.json"))
99+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/extensions").build(),
100+
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/extension_list_openstack.json"))
101101
.build())
102102
.put(listDetail.toBuilder()
103-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/images/detail").build(),
104-
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/image_list_detail_trystack.json"))
103+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/images/detail").build(),
104+
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/image_list_detail_openstack.json"))
105105
.build())
106106
.put(listServers.toBuilder()
107-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/servers/detail").build(),
107+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/detail").build(),
108108
listServersResponse)
109109
.put(listFlavorsDetail.toBuilder()
110-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/flavors/detail").build(),
111-
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list_detail_trystack.json"))
110+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/flavors/detail").build(),
111+
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list_detail_openstack.json"))
112112
.build()).build();
113113

114-
public void testDefaultTemplateTryStack() throws Exception {
114+
public void testDefaultTemplateOpenStack() throws Exception {
115115

116-
ComputeService apiForTryStack = requestsSendResponses(defaultTemplateTryStack);
116+
ComputeService apiForOpenStack = requestsSendResponses(defaultTemplateOpenStack);
117117

118-
Template defaultTemplate = apiForTryStack.templateBuilder().imageId("RegionOne/15").build();
118+
Template defaultTemplate = apiForOpenStack.templateBuilder().imageId("RegionOne/15").build();
119119
checkTemplate(defaultTemplate);
120-
checkTemplate(apiForTryStack.templateBuilder().fromTemplate(defaultTemplate).build());
120+
checkTemplate(apiForOpenStack.templateBuilder().fromTemplate(defaultTemplate).build());
121121

122122
}
123123

@@ -149,7 +149,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
149149
HttpRequest list = HttpRequest
150150
.builder()
151151
.method("GET")
152-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/os-security-groups")
152+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
153153
.addHeader("Accept", "application/json")
154154
.addHeader("X-Auth-Token", authToken).build();
155155

@@ -158,7 +158,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
158158
HttpRequest createWithPrefixOnGroup = HttpRequest
159159
.builder()
160160
.method("POST")
161-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/os-security-groups")
161+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
162162
.addHeader("Accept", "application/json")
163163
.addHeader("X-Auth-Token", authToken)
164164
.payload(
@@ -172,7 +172,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
172172
HttpRequest createRuleForDefaultPort22 = HttpRequest
173173
.builder()
174174
.method("POST")
175-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/os-security-group-rules")
175+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-group-rules")
176176
.addHeader("Accept", "application/json")
177177
.addHeader("X-Auth-Token", authToken)
178178
.payload(
@@ -186,7 +186,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
186186
HttpRequest getSecurityGroup = HttpRequest
187187
.builder()
188188
.method("GET")
189-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/os-security-groups/160")
189+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups/160")
190190
.addHeader("Accept", "application/json")
191191
.addHeader("X-Auth-Token", authToken).build();
192192

@@ -196,7 +196,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
196196
HttpRequest create = HttpRequest
197197
.builder()
198198
.method("POST")
199-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/os-keypairs")
199+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-keypairs")
200200
.addHeader("Accept", "application/json")
201201
.addHeader("X-Auth-Token", authToken)
202202
.payload(
@@ -210,7 +210,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
210210
HttpRequest serverDetail = HttpRequest
211211
.builder()
212212
.method("GET")
213-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/servers/71752")
213+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/71752")
214214
.addHeader("Accept", "application/json")
215215
.addHeader("X-Auth-Token", authToken).build();
216216

@@ -220,7 +220,7 @@ public void testListServersWhenReponseIs404IsEmpty() throws Exception {
220220
@Test
221221
public void testCreateNodeWithGeneratedKeyPair() throws Exception {
222222
Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
223-
.putAll(defaultTemplateTryStack);
223+
.putAll(defaultTemplateOpenStack);
224224
requestResponseMap.put(list, notFound);
225225

226226
requestResponseMap.put(createWithPrefixOnGroup, securityGroupCreated);
@@ -236,7 +236,7 @@ public void testCreateNodeWithGeneratedKeyPair() throws Exception {
236236
HttpRequest createServerWithGeneratedKeyPair = HttpRequest
237237
.builder()
238238
.method("POST")
239-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/servers")
239+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
240240
.addHeader("Accept", "application/json")
241241
.addHeader("X-Auth-Token", authToken)
242242
.payload(
@@ -276,7 +276,7 @@ public String get() {
276276
@Test
277277
public void testCreateNodeWhileUserSpecifiesKeyPair() throws Exception {
278278
Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
279-
.putAll(defaultTemplateTryStack);
279+
.putAll(defaultTemplateOpenStack);
280280
requestResponseMap.put(list, notFound);
281281

282282
requestResponseMap.put(createWithPrefixOnGroup, securityGroupCreated);
@@ -290,7 +290,7 @@ public void testCreateNodeWhileUserSpecifiesKeyPair() throws Exception {
290290
HttpRequest createServerWithSuppliedKeyPair = HttpRequest
291291
.builder()
292292
.method("POST")
293-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/servers")
293+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
294294
.addHeader("Accept", "application/json")
295295
.addHeader("X-Auth-Token", authToken)
296296
.payload(
@@ -332,15 +332,15 @@ public String get() {
332332
@Test
333333
public void testCreateNodeWhileUserSpecifiesKeyPairAndUserSpecifiedGroups() throws Exception {
334334
Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
335-
.putAll(defaultTemplateTryStack);
335+
.putAll(defaultTemplateOpenStack);
336336
requestResponseMap.put(list, notFound);
337337

338338
requestResponseMap.put(serverDetail, serverDetailResponse);
339339

340340
HttpRequest createServerWithSuppliedKeyPairAndGroup = HttpRequest
341341
.builder()
342342
.method("POST")
343-
.endpoint("https://nova-api.trystack.org:9774/v1.1/3456/servers")
343+
.endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
344344
.addHeader("Accept", "application/json")
345345
.addHeader("X-Auth-Token", authToken)
346346
.payload(

‎apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ParseServerWithInternetAddressesTest extends BaseItemParserTest<Ser
4848

4949
@Override
5050
public String resource() {
51-
return "/server_details_trystack.json";
51+
return "/server_details_openstack.json";
5252
}
5353

5454
@Override
@@ -73,7 +73,7 @@ public Server expected() {
7373
.links(
7474
Link.create(
7575
Relation.BOOKMARK,
76-
URI.create("https://nova-api.trystack.org:9774/37/images/14")))
76+
URI.create("https://nova-api.openstack.org:9774/37/images/14")))
7777
.build())
7878
.flavor(
7979
Resource
@@ -82,15 +82,15 @@ public Server expected() {
8282
.links(
8383
Link.create(
8484
Relation.BOOKMARK,
85-
URI.create("https://nova-api.trystack.org:9774/37/flavors/1")))
85+
URI.create("https://nova-api.openstack.org:9774/37/flavors/1")))
8686
.build())
8787
.links(
8888
Link.create(
8989
Relation.SELF,
90-
URI.create("https://nova-api.trystack.org:9774/v1.1/37/servers/1459")),
90+
URI.create("https://nova-api.openstack.org:9774/v1.1/37/servers/1459")),
9191
Link.create(
9292
Relation.BOOKMARK,
93-
URI.create("https://nova-api.trystack.org:9774/37/servers/1459")))
93+
URI.create("https://nova-api.openstack.org:9774/37/servers/1459")))
9494
.addresses(ImmutableMultimap.of("internet", Address.createV4("8.21.28.47"))).build();
9595
}
9696

‎apis/openstack-nova/src/test/resources/extension_list_trystack.json ‎apis/openstack-nova/src/test/resources/extension_list_openstack.json

File renamed without changes.

‎apis/openstack-nova/src/test/resources/flavor_list_detail_trystack.json ‎apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"rxtx_quota": 0,
44
"name": "m1.medium",
55
"links": [{
6-
"href": "https://nova-api.trystack.org:9774/v1.1/37/flavors/3",
6+
"href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/3",
77
"rel": "self"
88
}, {
9-
"href": "https://nova-api.trystack.org:9774/37/flavors/3",
9+
"href": "https://nova-api.openstack.org:9774/37/flavors/3",
1010
"rel": "bookmark"
1111
}],
1212
"ram": 4096,
@@ -19,10 +19,10 @@
1919
"rxtx_quota": 0,
2020
"name": "m1.large",
2121
"links": [{
22-
"href": "https://nova-api.trystack.org:9774/v1.1/37/flavors/4",
22+
"href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/4",
2323
"rel": "self"
2424
}, {
25-
"href": "https://nova-api.trystack.org:9774/37/flavors/4",
25+
"href": "https://nova-api.openstack.org:9774/37/flavors/4",
2626
"rel": "bookmark"
2727
}],
2828
"ram": 8192,
@@ -35,10 +35,10 @@
3535
"rxtx_quota": 0,
3636
"name": "m1.tiny",
3737
"links": [{
38-
"href": "https://nova-api.trystack.org:9774/v1.1/37/flavors/1",
38+
"href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/1",
3939
"rel": "self"
4040
}, {
41-
"href": "https://nova-api.trystack.org:9774/37/flavors/1",
41+
"href": "https://nova-api.openstack.org:9774/37/flavors/1",
4242
"rel": "bookmark"
4343
}],
4444
"ram": 512,
@@ -51,10 +51,10 @@
5151
"rxtx_quota": 0,
5252
"name": "m1.xlarge",
5353
"links": [{
54-
"href": "https://nova-api.trystack.org:9774/v1.1/37/flavors/5",
54+
"href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/5",
5555
"rel": "self"
5656
}, {
57-
"href": "https://nova-api.trystack.org:9774/37/flavors/5",
57+
"href": "https://nova-api.openstack.org:9774/37/flavors/5",
5858
"rel": "bookmark"
5959
}],
6060
"ram": 16384,
@@ -67,10 +67,10 @@
6767
"rxtx_quota": 0,
6868
"name": "m1.small",
6969
"links": [{
70-
"href": "https://nova-api.trystack.org:9774/v1.1/37/flavors/2",
70+
"href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/2",
7171
"rel": "self"
7272
}, {
73-
"href": "https://nova-api.trystack.org:9774/37/flavors/2",
73+
"href": "https://nova-api.openstack.org:9774/37/flavors/2",
7474
"rel": "bookmark"
7575
}],
7676
"ram": 2048,

‎apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"updated": "2012-02-02T19:11:00Z",
55
"name": "oneiric-server-cloudimg-amd64",
66
"links": [{
7-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/15",
7+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/15",
88
"rel": "self"
99
}, {
10-
"href": "https://nova-api.trystack.org:9774/37/images/15",
10+
"href": "https://nova-api.openstack.org:9774/37/images/15",
1111
"rel": "bookmark"
1212
}],
1313
"created": "2012-02-02T19:10:52Z",
@@ -24,10 +24,10 @@
2424
"updated": "2012-02-02T19:10:51Z",
2525
"name": "oneiric-server-cloudimg-amd64-kernel",
2626
"links": [{
27-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/14",
27+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/14",
2828
"rel": "self"
2929
}, {
30-
"href": "https://nova-api.trystack.org:9774/37/images/14",
30+
"href": "https://nova-api.openstack.org:9774/37/images/14",
3131
"rel": "bookmark"
3232
}],
3333
"created": "2012-02-02T19:10:50Z",
@@ -43,10 +43,10 @@
4343
"updated": "2012-02-02T19:10:41Z",
4444
"name": "natty-server-cloudimg-amd64",
4545
"links": [{
46-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/13",
46+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/13",
4747
"rel": "self"
4848
}, {
49-
"href": "https://nova-api.trystack.org:9774/37/images/13",
49+
"href": "https://nova-api.openstack.org:9774/37/images/13",
5050
"rel": "bookmark"
5151
}],
5252
"created": "2012-02-02T19:10:33Z",
@@ -63,10 +63,10 @@
6363
"updated": "2012-02-02T19:10:33Z",
6464
"name": "natty-server-cloudimg-amd64-kernel",
6565
"links": [{
66-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/12",
66+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/12",
6767
"rel": "self"
6868
}, {
69-
"href": "https://nova-api.trystack.org:9774/37/images/12",
69+
"href": "https://nova-api.openstack.org:9774/37/images/12",
7070
"rel": "bookmark"
7171
}],
7272
"created": "2012-02-02T19:10:32Z",
@@ -82,10 +82,10 @@
8282
"updated": "2012-02-02T19:10:41Z",
8383
"name": "natty-server-cloudimg-amd64",
8484
"links": [{
85-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/11",
85+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/11",
8686
"rel": "self"
8787
}, {
88-
"href": "https://nova-api.trystack.org:9774/37/images/11",
88+
"href": "https://nova-api.openstack.org:9774/37/images/11",
8989
"rel": "bookmark"
9090
}],
9191
"created": "2012-02-02T19:10:33Z",
@@ -102,10 +102,10 @@
102102
"updated": "2012-02-02T19:10:41Z",
103103
"name": "natty-server-cloudimg-amd64",
104104
"links": [{
105-
"href": "https://nova-api.trystack.org:9774/v1.1/37/images/10",
105+
"href": "https://nova-api.openstack.org:9774/v1.1/37/images/10",
106106
"rel": "self"
107107
}, {
108-
"href": "https://nova-api.trystack.org:9774/37/images/10",
108+
"href": "https://nova-api.openstack.org:9774/37/images/10",
109109
"rel": "bookmark"
110110
}],
111111
"created": "2012-02-02T19:10:33Z",

0 commit comments

Comments
 (0)