You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:43 UTC
[39/50] brooklyn-server git commit: Updated Rackspace UK image ID and
converted test to Java
Updated Rackspace UK image ID and converted test to Java
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c4a55600
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c4a55600
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c4a55600
Branch: refs/heads/0.6.0
Commit: c4a55600d3bf57e1b9cc0ef8aa1dfefac2062d2b
Parents: b0761ca
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Thu Nov 14 16:41:33 2013 +0000
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Thu Nov 14 17:40:54 2013 +0000
----------------------------------------------------------------------
.../jclouds/RackspaceLocationLiveTest.groovy | 41 -------------------
.../jclouds/RackspaceLocationLiveTest.java | 43 ++++++++++++++++++++
2 files changed, 43 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c4a55600/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.groovy b/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.groovy
deleted file mode 100644
index eec702e..0000000
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.groovy
+++ /dev/null
@@ -1,41 +0,0 @@
-package brooklyn.location.jclouds
-
-import static org.testng.Assert.*
-
-import org.testng.annotations.DataProvider
-import org.testng.annotations.Test
-
-public class RackspaceLocationLiveTest extends AbstractJcloudsLocationTest {
-
- private static final String PROVIDER = "rackspace-cloudservers-uk"
- private static final String REGION_NAME = null;
- private static final String IMAGE_ID = "115"
- private static final String IMAGE_NAME_PATTERN = "Ubuntu 11.04"
- private static final String IMAGE_OWNER = null
-
- public RackspaceLocationLiveTest() {
- super(PROVIDER)
- }
-
- @Override
- @DataProvider(name = "fromImageId")
- public Object[][] cloudAndImageIds() {
- return [ [ REGION_NAME, IMAGE_ID, IMAGE_OWNER ] ]
- }
-
- @Override
- @DataProvider(name = "fromImageNamePattern")
- public Object[][] cloudAndImageNamePatterns() {
- return [ [ REGION_NAME, IMAGE_NAME_PATTERN, IMAGE_OWNER ] ]
- }
-
- @Override
- @DataProvider(name = "fromImageDescriptionPattern")
- public Object[][] cloudAndImageDescriptionPatterns() {
- return []
- }
-
- @Test(enabled = false)
- public void noop() { /* just exists to let testNG IDE run the test */ }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c4a55600/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.java
new file mode 100644
index 0000000..2472ba4
--- /dev/null
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/RackspaceLocationLiveTest.java
@@ -0,0 +1,43 @@
+package brooklyn.location.jclouds;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class RackspaceLocationLiveTest extends AbstractJcloudsLocationTest {
+
+ private static final String PROVIDER = "rackspace-cloudservers-uk";
+ private static final String REGION_NAME = null;
+ private static final String IMAGE_ID = "LON/f70ed7c7-b42e-4d77-83d8-40fa29825b85"; // CentOS 6.4
+ private static final String IMAGE_NAME_PATTERN = "Ubuntu 13.04";
+ private static final String IMAGE_OWNER = null;
+
+ public RackspaceLocationLiveTest() {
+ super(PROVIDER);
+ }
+
+ @Override
+ @DataProvider(name = "fromImageId")
+ public Object[][] cloudAndImageIds() {
+ return new Object[][] {
+ new Object[] { REGION_NAME, IMAGE_ID, IMAGE_OWNER }
+ };
+ }
+
+ @Override
+ @DataProvider(name = "fromImageNamePattern")
+ public Object[][] cloudAndImageNamePatterns() {
+ return new Object[][] {
+ new Object[] { REGION_NAME, IMAGE_NAME_PATTERN, IMAGE_OWNER }
+ };
+ }
+
+ @Override
+ @DataProvider(name = "fromImageDescriptionPattern")
+ public Object[][] cloudAndImageDescriptionPatterns() {
+ return new Object[0][0];
+ }
+
+ @Test(enabled = false)
+ public void noop() { /* just exists to let testNG IDE run the test */ }
+
+}