brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [38/50] brooklyn-server git commit: Fixed template builder option names for imageDescriptionRegex and imageNameRegex
Date Mon, 01 Feb 2016 17:49:42 GMT
Fixed template builder option names for imageDescriptionRegex and imageNameRegex


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b0761cae
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b0761cae
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b0761cae

Branch: refs/heads/0.6.0
Commit: b0761cae8f75e2851e7efade11e63b9b91267546
Parents: ab22dec
Author: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Authored: Thu Nov 14 16:24:16 2013 +0000
Committer: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Committed: Thu Nov 14 16:24:16 2013 +0000

----------------------------------------------------------------------
 .../brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b0761cae/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
index be699ae..3ef7e8e 100644
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
@@ -105,7 +105,7 @@ public abstract class AbstractJcloudsLocationTest {
     @Test(groups = [ "Live" ], dataProvider="fromImageNamePattern")
     public void testProvisionVmUsingImageNamePattern(String regionName, String imageNamePattern,
String imageOwner) {
         loc = ctx.getLocationRegistry().resolve(provider + (regionName == null ? "" : ":"
+ regionName));
-        SshMachineLocation machine = obtainMachine([imageNamePattern:imageNamePattern, imageOwner:imageOwner])
+        SshMachineLocation machine = obtainMachine([imageNameRegex:imageNamePattern, imageOwner:imageOwner])
         
         LOG.info("Provisioned AWS vm $machine; checking if ssh'able")
         assertTrue machine.isSshable()
@@ -114,7 +114,7 @@ public abstract class AbstractJcloudsLocationTest {
     @Test(groups = "Live", dataProvider="fromImageDescriptionPattern")
     public void testProvisionVmUsingImageDescriptionPattern(String regionName, String imageDescriptionPattern,
String imageOwner) {
         loc = ctx.getLocationRegistry().resolve(provider + (regionName == null ? "" : ":"
+ regionName));
-        SshMachineLocation machine = obtainMachine([imageDescriptionPattern:imageDescriptionPattern,
imageOwner:imageOwner])
+        SshMachineLocation machine = obtainMachine([imageDescriptionRegex:imageDescriptionPattern,
imageOwner:imageOwner])
         
         LOG.info("Provisioned AWS vm $machine; checking if ssh'able")
         assertTrue machine.isSshable()


Mime
View raw message