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/03/04 17:15:59 UTC
[14/18] brooklyn-server git commit: code review on better server
output for the ui - minor changes
code review on better server output for the ui - minor changes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a338bc80
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a338bc80
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a338bc80
Branch: refs/heads/master
Commit: a338bc805f0d8ee62321687644f83bbb6fb0540a
Parents: 6531c68
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 4 15:43:52 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 4 15:43:52 2016 +0000
----------------------------------------------------------------------
.../brooklyn/location/jclouds/JcloudsLocation.java | 13 ++++++++-----
.../location/jclouds/JcloudsLocationConfig.java | 5 ++---
.../entity/software/base/lifecycle/ScriptHelper.java | 2 +-
.../apache/brooklyn/util/exceptions/Exceptions.java | 3 ++-
4 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a338bc80/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index df253bd..aebd778 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1347,6 +1347,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
}})
.put(AUTO_CREATE_FLOATING_IPS, new CustomizeTemplateOptions() {
public void apply(TemplateOptions t, ConfigBag props, Object v) {
+ LOG.warn("Using deprecated "+AUTO_CREATE_FLOATING_IPS+"; use "+AUTO_ASSIGN_FLOATING_IP+" instead");
if (t instanceof NovaTemplateOptions) {
((NovaTemplateOptions)t).autoAssignFloatingIp((Boolean)v);
} else {
@@ -1553,7 +1554,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
}
protected String toStringNice() {
- Entities.dumpInfo(this);
String s = config().get(ORIGINAL_SPEC);
if (Strings.isBlank(s)) s = config().get(NAMED_SPEC_NAME);
if (Strings.isBlank(s)) s = config().get(FINAL_SPEC);
@@ -1561,13 +1561,13 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
String s2 = "";
String provider = getProvider();
- if (Strings.isNonBlank(s) && Strings.isNonBlank(provider) && !s.toLowerCase().contains(provider.toLowerCase()))
+ if (Strings.isBlank(s) || (Strings.isNonBlank(provider) && !s.toLowerCase().contains(provider.toLowerCase())))
s2 += " "+provider;
String region = getRegion();
- if (Strings.isNonBlank(s) && Strings.isNonBlank(region) && !s.toLowerCase().contains(region.toLowerCase()))
+ if (Strings.isBlank(s) || (Strings.isNonBlank(region) && !s.toLowerCase().contains(region.toLowerCase())))
s2 += " "+region;
String endpoint = getEndpoint();
- if (Strings.isNonBlank(s) && Strings.isNonBlank(endpoint) && !s.toLowerCase().contains(endpoint.toLowerCase()))
+ if (Strings.isBlank(s) || (Strings.isNonBlank(endpoint) && !s.toLowerCase().contains(endpoint.toLowerCase())))
s2 += " "+endpoint;
s2 = s2.trim();
if (Strings.isNonBlank(s)) {
@@ -2714,7 +2714,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
waitForReachable(checker, connectionDetails, credentialsToTry, setup, timeout);
} finally {
for (WinRmMachineLocation machine : machinesToTry.keySet()) {
- getManagementContext().getLocationManager().unmanage(machine);
+ if (getManagementContext().getLocationManager().isManaged(machine)) {
+ // get benign but unpleasant warnings if we unmanage something already unmanaged
+ getManagementContext().getLocationManager().unmanage(machine);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a338bc80/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java
index d90f30e..1403a9f 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java
@@ -72,9 +72,8 @@ public interface JcloudsLocationConfig extends CloudLocationConfig {
public static final ConfigKey<Boolean> AUTO_GENERATE_KEYPAIRS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-generate-keypairs",
"Whether to generate keypairs automatically (OpenStack Nova)");
- /**
- * @deprecated since 0.7.0 Use {@link #AUTO_ASSIGN_FLOATING_IP} instead
- */
+ /** @deprecated since 0.9.0 Use {@link #AUTO_ASSIGN_FLOATING_IP} instead (deprecated in 0.7.0 but warning not given until 0.9.0) */
+ @Deprecated
public static final ConfigKey<Boolean> AUTO_CREATE_FLOATING_IPS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-create-floating-ips",
"Whether to generate floating ips for Nova");
public static final ConfigKey<Boolean> AUTO_ASSIGN_FLOATING_IP = ConfigKeys.newBooleanConfigKey("autoAssignFloatingIp",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a338bc80/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
index a3e3d2b..cbd2556 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
@@ -425,7 +425,7 @@ public class ScriptHelper {
}
public String getResultStdout() {
- if (stdout==null) throw new IllegalStateException("stdour not available on "+this+"; ensure task has completed and gatherOutput(true) is set");
+ if (stdout==null) throw new IllegalStateException("stdout not available on "+this+"; ensure task has completed and gatherOutput(true) is set");
return stdout.toString();
}
public String getResultStderr() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a338bc80/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java b/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
index 44d66ca..13dcafb 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
@@ -95,7 +95,8 @@ public class Exceptions {
return false;
}
- // not used, but kept in case we might want it
+ /** @deprecated never used, but kept as it might be useful */
+ @Deprecated
static String stripBoringPrefixes(String s) {
ArrayList<String> prefixes = Lists.newArrayListWithCapacity(2 + BORING_PREFIX_THROWABLE_EXACT_TYPES.size() * 3);
for (Class<? extends Throwable> type : BORING_PREFIX_THROWABLE_EXACT_TYPES) {