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

adjusted test properties

This commit is contained in:
Adrian Cole 2011-10-15 17:41:05 -07:00
parent d0fd7849e5
commit bf584390e0
9 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/BaseCloudLoadBalancersClientLiveTest.java
View File

@ -95,10 +95,10 @@ public class BaseCloudLoadBalancersClientLiveTest {
client = context.getApi(); client = context.getApi();
injector = Guice.createInjector(new Log4JLoggingModule()); injector = Guice.createInjector(new Log4JLoggingModule());
loadBalancerActive = new RetryablePredicate<LoadBalancer>(new LoadBalancerActive(client), 60, 1, 1, loadBalancerActive = new RetryablePredicate<LoadBalancer>(new LoadBalancerActive(client), 300, 1, 1,
TimeUnit.SECONDS); TimeUnit.SECONDS);
injector.injectMembers(loadBalancerActive); injector.injectMembers(loadBalancerActive);
loadBalancerDeleted = new RetryablePredicate<LoadBalancer>(new LoadBalancerDeleted(client), 60, 1, 1, loadBalancerDeleted = new RetryablePredicate<LoadBalancer>(new LoadBalancerDeleted(client), 300, 1, 1,
TimeUnit.SECONDS); TimeUnit.SECONDS);
injector.injectMembers(loadBalancerDeleted); injector.injectMembers(loadBalancerDeleted);
} }
@ -109,4 +109,4 @@ public class BaseCloudLoadBalancersClientLiveTest {
context.close(); context.close();
} }
} }

38
providers/openhosting-east1/src/main/resources/openhosting-east1/preinstalled_images.json
View File

@ -1,11 +1,25 @@
[ [
{ {
"uuid": "1fc52c4b-f08d-4f9f-8821-7fdd073a32d6", "uuid": "1fc52c4b-f08d-4f9f-8821-7fdd073a32d6",
"description": "CentOS Linux 5.5", "description": "CentOS Linux 5.5 64",
"osFamily": "CENTOS", "osFamily": "CENTOS",
"osVersion": "5.5", "osVersion": "5.5",
"size": "3" "size": "3"
}, },
{
"uuid": "4d67096a-c2b5-4be7-9716-d4b2f9e2d4b5",
"description": "CentOS Linux 5.6 64",
"osFamily": "CENTOS",
"osVersion": "5.6",
"size": "3"
},
{
"uuid": "61e04f61-a39e-494f-bcf6-b17d3eba0df7",
"description": "CentOS Linux 5.7 64",
"osFamily": "CENTOS",
"osVersion": "5.7",
"size": "3"
},
{ {
"uuid": "9c1a506a-5d2b-496b-9ebc-26cfeae76f42", "uuid": "9c1a506a-5d2b-496b-9ebc-26cfeae76f42",
"description": "Debian Linux 5.0", "description": "Debian Linux 5.0",
@ -14,10 +28,24 @@
"size": "1" "size": "1"
}, },
{ {
"uuid": "8067ee3c-e9a5-48a7-a3a7-8c158ce039db", "uuid": "13658a54-4086-47a4-89cb-ae21da7afb0c",
"description": "Ubuntu Linux 10.10", "description": "Debian Linux 6 (Squeeze) 64",
"osFamily": "UBUNTU", "osFamily": "DEBIAN",
"osVersion": "10.10", "osVersion": "6.0",
"size": "1" "size": "1"
},
{
"uuid": "8023b089-7b0e-4fcb-8016-01e82f2a9716",
"description": "Ubuntu 10.04.3 LTS (lucid) Server 64",
"osFamily": "UBUNTU",
"osVersion": "10.04",
"size": "1"
},
{
"uuid": "d7826937-a160-4f70-ab5a-7ee9d78f7404",
"description": "Windows 2008 R2 Standard Edition",
"osFamily": "WINDOWS",
"osVersion": "2008 R2",
"size": "10"
} }
] ]

2
providers/openhosting-east1/src/test/java/org/jclouds/openhosting/OpenHostingEast1ClientLiveTest.java
View File

@ -29,6 +29,6 @@ import org.testng.annotations.Test;
public class OpenHostingEast1ClientLiveTest extends ElasticStackClientLiveTest { public class OpenHostingEast1ClientLiveTest extends ElasticStackClientLiveTest {
public OpenHostingEast1ClientLiveTest() { public OpenHostingEast1ClientLiveTest() {
provider = "openhosting-east1"; provider = "openhosting-east1";
bootDrive = "8067ee3c-e9a5-48a7-a3a7-8c158ce039db"; bootDrive = "8023b089-7b0e-4fcb-8016-01e82f2a9716";
} }
} }

10
providers/openhosting-east1/src/test/java/org/jclouds/openhosting/compute/OpenHostingEast1TemplateBuilderLiveTest.java
View File

@ -52,12 +52,14 @@ public class OpenHostingEast1TemplateBuilderLiveTest extends BaseTemplateBuilder
@Override @Override
public boolean apply(OsFamilyVersion64Bit input) { public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) { switch (input.family) {
case WINDOWS:
return (input.version.equals("") || input.version.equals("2008 R2")) && input.is64Bit;
case UBUNTU: case UBUNTU:
return (input.version.equals("") || input.version.equals("10.10")) && input.is64Bit; return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
case DEBIAN: case DEBIAN:
return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit; return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit;
case CENTOS: case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; return (input.version.equals("") || input.version.matches("5.[567]")) && input.is64Bit;
default: default:
return false; return false;
} }
@ -70,7 +72,7 @@ public class OpenHostingEast1TemplateBuilderLiveTest extends BaseTemplateBuilder
public void testDefaultTemplateBuilder() throws IOException { public void testDefaultTemplateBuilder() throws IOException {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build(); Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "openhosting-east1"); assertEquals(defaultTemplate.getLocation().getId(), "openhosting-east1");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);

18
providers/serverlove-z1-man/src/main/resources/serverlove-z1-man/preinstalled_images.json
View File

@ -1,23 +1,23 @@
[ [
{ {
"uuid": "679f5f44-0be7-4745-a658-cccd4334c1aa", "uuid": "88ed067f-d2b8-42ce-a25f-5297818a3b6f",
"description": "CentOS Linux 5.5", "description": "CentOS Linux 5.7",
"osFamily": "CENTOS", "osFamily": "CENTOS",
"osVersion": "5.5", "osVersion": "5.7",
"size": "3", "size": "3",
"loginUser": "root" "loginUser": "root"
}, },
{ {
"uuid": "5795b68f-ed26-4639-b41d-c93235062b6b", "uuid": "aca2fa0b-40bc-4e06-ad99-f1467690d5de",
"description": "Debian Linux 5.0", "description": "Debian Linux 6.0",
"osFamily": "DEBIAN", "osFamily": "DEBIAN",
"osVersion": "5.0", "osVersion": "6.0",
"size": "1", "size": "1",
"loginUser": "root" "loginUser": "root"
}, },
{ {
"uuid": "5f2e0e29-2937-42b9-b362-d2d07eddbdeb", "uuid": "574a3921-2926-4a61-bdd9-8d9282b32810",
"description": "Ubuntu Linux 10.04", "description": "Ubuntu 10.04 LTS",
"osFamily": "UBUNTU", "osFamily": "UBUNTU",
"osVersion": "10.04", "osVersion": "10.04",
"size": "1", "size": "1",
@ -39,4 +39,4 @@
"size": "13", "size": "13",
"loginUser": "Administrator" "loginUser": "Administrator"
} }
] ]

2
providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/ServerloveManchesterClientLiveTest.java
View File

@ -31,7 +31,7 @@ import org.testng.annotations.Test;
public class ServerloveManchesterClientLiveTest extends ElasticStackClientLiveTest { public class ServerloveManchesterClientLiveTest extends ElasticStackClientLiveTest {
public ServerloveManchesterClientLiveTest() { public ServerloveManchesterClientLiveTest() {
provider = "serverlove-z1-man"; provider = "serverlove-z1-man";
bootDrive = "5f2e0e29-2937-42b9-b362-d2d07eddbdeb"; bootDrive = "574a3921-2926-4a61-bdd9-8d9282b32810";
} }
protected Credentials getSshCredentials(Server server) { protected Credentials getSshCredentials(Server server) {

4
providers/serverlove-z1-man/src/test/java/org/jclouds/serverlove/compute/ServerloveManchesterTemplateBuilderLiveTest.java
View File

@ -54,9 +54,9 @@ public class ServerloveManchesterTemplateBuilderLiveTest extends BaseTemplateBui
case UBUNTU: case UBUNTU:
return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit; return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
case DEBIAN: case DEBIAN:
return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit; return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit;
case CENTOS: case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; return (input.version.equals("") || input.version.equals("5.7")) && input.is64Bit;
case WINDOWS: case WINDOWS:
return (input.version.equals("") || input.version.equals("2008 R2")) && input.is64Bit; return (input.version.equals("") || input.version.equals("2008 R2")) && input.is64Bit;
default: default:

2
providers/stratogen-vcloud-mycloud/pom.xml
View File

@ -34,7 +34,7 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<properties> <properties>
<test.stratogen-vcloud-mycloud.endpoint>https://mycloud.stratogen.net/api</test.stratogen-vcloud-mycloud.endpoint> <test.stratogen-vcloud-mycloud.endpoint>https://vcd.stratogen.net/api</test.stratogen-vcloud-mycloud.endpoint>
<test.stratogen-vcloud-mycloud.apiversion>1.0</test.stratogen-vcloud-mycloud.apiversion> <test.stratogen-vcloud-mycloud.apiversion>1.0</test.stratogen-vcloud-mycloud.apiversion>
<test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity> <test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
<test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential> <test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>

2
providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudPropertiesBuilder.java
View File

@ -36,7 +36,7 @@ public class StratoGenVCloudMyCloudPropertiesBuilder extends VCloudPropertiesBui
protected Properties defaultProperties() { protected Properties defaultProperties() {
Properties properties = super.defaultProperties(); Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_ISO3166_CODES, "GB"); properties.setProperty(PROPERTY_ISO3166_CODES, "GB");
properties.setProperty(PROPERTY_ENDPOINT, "https://mycloud.stratogen.net/api"); properties.setProperty(PROPERTY_ENDPOINT, "https://vcd.stratogen.net/api");
properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "Direct Internet"); properties.setProperty(PROPERTY_VCLOUD_DEFAULT_NETWORK, "Direct Internet");
return properties; return properties;
} }