You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/08/21 18:13:56 UTC
[1/2] git commit: Changes non-functional image-name-matcher to imageId
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 8257a4fff -> b6c2306a5
Changes non-functional image-name-matcher to imageId
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ed03f38c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ed03f38c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ed03f38c
Branch: refs/heads/master
Commit: ed03f38ce55b878bba0ddfb16b5589a611497a1d
Parents: ed87ada
Author: Martin Harris <gi...@nakomis.com>
Authored: Wed Aug 13 16:51:51 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Wed Aug 13 16:51:51 2014 +0100
----------------------------------------------------------------------
.../entity/nosql/cassandra/CassandraNodeLiveTest.java | 14 +++++++-------
.../entity/nosql/couchdb/CouchDBNodeLiveTest.java | 14 +++++++-------
.../entity/nosql/solr/SolrServerLiveTest.java | 14 +++++++-------
3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed03f38c/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeLiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeLiveTest.java
index 47dff91..4bf087f 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeLiveTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeLiveTest.java
@@ -47,18 +47,18 @@ public class CassandraNodeLiveTest extends AbstractCassandraNodeTest {
@DataProvider(name = "virtualMachineData")
public Object[][] provideVirtualMachineData() {
- return new Object[][] { // ImageName, Provider, Region
- new Object[] { "ubuntu", "aws-ec2", "eu-west-1" },
- new Object[] { "Ubuntu 12.0", "rackspace-cloudservers-uk", "" },
- new Object[] { "CentOS 6.2", "rackspace-cloudservers-uk", "" },
+ return new Object[][] { // ImageId, Provider, Region, Description (for logging)
+ new Object[] { "eu-west-1/ami-0307d674", "aws-ec2", "eu-west-1", "Ubuntu Server 14.04 LTS (HVM), SSD Volume Type" },
+ new Object[] { "LON/f9b690bf-88eb-43c2-99cf-391f2558732e", "rackspace-cloudservers-uk", "", "Ubuntu 12.04 LTS (Precise Pangolin)" },
+ new Object[] { "LON/a84b1592-6817-42da-a57c-3c13f3cfc1da", "rackspace-cloudservers-uk", "", "CentOS 6.5 (PVHVM)" },
};
}
@Test(groups = "Live", dataProvider = "virtualMachineData")
- protected void testOperatingSystemProvider(String imageName, String provider, String region) throws Exception {
- log.info("Testing Cassandra on {}{} using {}", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", imageName });
+ protected void testOperatingSystemProvider(String imageId, String provider, String region, String description) throws Exception {
+ log.info("Testing Cassandra on {}{} using {} ({})", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", description, imageId });
- Map<String, String> properties = MutableMap.of("image-name-matches", imageName);
+ Map<String, String> properties = MutableMap.of("imageId", imageId);
testLocation = app.getManagementContext().getLocationRegistry()
.resolve(provider + (Strings.isNonEmpty(region) ? ":" + region : ""), properties);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed03f38c/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBNodeLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBNodeLiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBNodeLiveTest.java
index 1c69b14..3a3c4e2 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBNodeLiveTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/couchdb/CouchDBNodeLiveTest.java
@@ -47,18 +47,18 @@ public class CouchDBNodeLiveTest extends AbstractCouchDBNodeTest {
@DataProvider(name = "virtualMachineData")
public Object[][] provideVirtualMachineData() {
- return new Object[][] { // ImageName, Provider, Region
- new Object[] { "ubuntu", "aws-ec2", "eu-west-1" },
- new Object[] { "Ubuntu 12.0", "rackspace-cloudservers-uk", "" },
- new Object[] { "CentOS 6.2", "rackspace-cloudservers-uk", "" },
+ return new Object[][] { // ImageId, Provider, Region, Description (for logging)
+ new Object[] { "eu-west-1/ami-0307d674", "aws-ec2", "eu-west-1", "Ubuntu Server 14.04 LTS (HVM), SSD Volume Type" },
+ new Object[] { "LON/f9b690bf-88eb-43c2-99cf-391f2558732e", "rackspace-cloudservers-uk", "", "Ubuntu 12.04 LTS (Precise Pangolin)" },
+ new Object[] { "LON/a84b1592-6817-42da-a57c-3c13f3cfc1da", "rackspace-cloudservers-uk", "", "CentOS 6.5 (PVHVM)" },
};
}
@Test(groups = "Live", dataProvider = "virtualMachineData")
- protected void testOperatingSystemProvider(String imageName, String provider, String region) throws Exception {
- log.info("Testing CouchDB on {}{} using {}", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", imageName });
+ protected void testOperatingSystemProvider(String imageId, String provider, String region, String description) throws Exception {
+ log.info("Testing CouchDB on {}{} using {} ({})", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", description, imageId });
- Map<String, String> properties = MutableMap.of("image-name-matches", imageName);
+ Map<String, String> properties = MutableMap.of("imageId", imageId);
testLocation = app.getManagementContext().getLocationRegistry()
.resolve(provider + (Strings.isNonEmpty(region) ? ":" + region : ""), properties);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed03f38c/software/nosql/src/test/java/brooklyn/entity/nosql/solr/SolrServerLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/solr/SolrServerLiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/solr/SolrServerLiveTest.java
index 04bf0ff..82fb107 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/solr/SolrServerLiveTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/solr/SolrServerLiveTest.java
@@ -53,18 +53,18 @@ public class SolrServerLiveTest extends AbstractSolrServerTest {
@DataProvider(name = "virtualMachineData")
public Object[][] provideVirtualMachineData() {
- return new Object[][] { // ImageName, Provider, Region
- new Object[] { "ubuntu", "aws-ec2", "eu-west-1" },
- new Object[] { "Ubuntu 12.0", "rackspace-cloudservers-uk", "" },
- new Object[] { "CentOS 6.2", "rackspace-cloudservers-uk", "" },
+ return new Object[][] { // ImageId, Provider, Region, Description (for logging)
+ new Object[] { "eu-west-1/ami-0307d674", "aws-ec2", "eu-west-1", "Ubuntu Server 14.04 LTS (HVM), SSD Volume Type" },
+ new Object[] { "LON/f9b690bf-88eb-43c2-99cf-391f2558732e", "rackspace-cloudservers-uk", "", "Ubuntu 12.04 LTS (Precise Pangolin)" },
+ new Object[] { "LON/a84b1592-6817-42da-a57c-3c13f3cfc1da", "rackspace-cloudservers-uk", "", "CentOS 6.5 (PVHVM)" },
};
}
@Test(groups = "Live", dataProvider = "virtualMachineData")
- protected void testOperatingSystemProvider(String imageName, String provider, String region) throws Exception {
- log.info("Testing Solr on {}{} using {}", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", imageName });
+ protected void testOperatingSystemProvider(String imageId, String provider, String region, String description) throws Exception {
+ log.info("Testing Solr on {}{} using {} ({})", new Object[] { provider, Strings.isNonEmpty(region) ? ":" + region : "", description, imageId });
- Map<String, String> properties = MutableMap.of("image-name-matches", imageName);
+ Map<String, String> properties = MutableMap.of("imageId", imageId);
testLocation = app.getManagementContext().getLocationRegistry()
.resolve(provider + (Strings.isNonEmpty(region) ? ":" + region : ""), properties);
solr = app.createAndManageChild(EntitySpec.create(SolrServer.class)
[2/2] git commit: This closes #118
Posted by al...@apache.org.
This closes #118
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b6c2306a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b6c2306a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b6c2306a
Branch: refs/heads/master
Commit: b6c2306a55a2e68acfa4d8870c55eda3b0947ee6
Parents: 8257a4f ed03f38
Author: Aled Sage <al...@gmail.com>
Authored: Thu Aug 21 17:13:08 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Aug 21 17:13:08 2014 +0100
----------------------------------------------------------------------
.../entity/nosql/cassandra/CassandraNodeLiveTest.java | 14 +++++++-------
.../entity/nosql/couchdb/CouchDBNodeLiveTest.java | 14 +++++++-------
.../entity/nosql/solr/SolrServerLiveTest.java | 14 +++++++-------
3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------