You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/06/26 15:05:33 UTC
jclouds git commit: [NOVA] change some access modifiers to simplify
the downstream provider impl
Repository: jclouds
Updated Branches:
refs/heads/master 647df25d9 -> aa64e0d3e
[NOVA] change some access modifiers to simplify the downstream provider impl
modify the BasicAuthenticator in Keystone
destroy node if creation timeouts
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/aa64e0d3
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/aa64e0d3
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/aa64e0d3
Branch: refs/heads/master
Commit: aa64e0d3e2eb3edede2cbfc2fb1c5dc93d8b3458
Parents: 647df25
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Jun 25 11:30:11 2015 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Jun 26 15:05:06 2015 +0200
----------------------------------------------------------------------
.../functions/internal/BaseAuthenticator.java | 6 ++---
.../v2_0/compute/NovaComputeServiceAdapter.java | 24 ++++++++++++++++----
.../functions/ImageToOperatingSystem.java | 2 +-
.../functions/ServerInRegionToNodeMetadata.java | 4 ++--
...desWithGroupEncodedIntoNameThenAddToSet.java | 6 ++---
5 files changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/aa64e0d3/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java
index 93ece91..3e4216a 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java
@@ -64,10 +64,10 @@ public abstract class BaseAuthenticator<C> implements Function<Credentials, Acce
String usernameOrAccessKey = input.identity;
if (!tenantName.isPresent() && input.identity.indexOf(':') != -1) {
- tenantName = Optional.of(input.identity.substring(0, input.identity.indexOf(':')));
- usernameOrAccessKey = input.identity.substring(input.identity.indexOf(':') + 1);
+ tenantName = Optional.of(input.identity.substring(0, input.identity.lastIndexOf(':')));
+ usernameOrAccessKey = input.identity.substring(input.identity.lastIndexOf(':') + 1);
}
-
+
String passwordOrSecretKey = input.credential;
C creds = createCredentials(usernameOrAccessKey, passwordOrSecretKey);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/aa64e0d3/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
index 4518e71..4714d53 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
@@ -21,7 +21,10 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Iterables.contains;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
+import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.compute.util.ComputeServiceUtils.metadataAndTagsAsCommaDelimitedValue;
+import static org.jclouds.util.Predicates2.retry;
import java.util.Set;
@@ -127,16 +130,27 @@ public class NovaComputeServiceAdapter implements
}
}
- String regionId = template.getLocation().getId();
+ final String regionId = template.getLocation().getId();
String imageId = template.getImage().getProviderId();
String flavorId = template.getHardware().getProviderId();
logger.debug(">> creating new server region(%s) name(%s) image(%s) flavor(%s) options(%s)", regionId, name, imageId, flavorId, options);
- ServerCreated lightweightServer = novaApi.getServerApi(regionId).create(name, imageId, flavorId, options);
- Server server = novaApi.getServerApi(regionId).get(lightweightServer.getId());
-
- logger.trace("<< server(%s)", server.getId());
+ final ServerCreated lightweightServer = novaApi.getServerApi(regionId).create(name, imageId, flavorId, options);
+ if (!retry(new Predicate<String>() {
+ @Override
+ public boolean apply(String serverId) {
+ Server server = novaApi.getServerApi(regionId).get(serverId);
+ return server != null && server.getAddresses() != null && !server.getAddresses().isEmpty();
+ }
+ }, 30 * 60, 1, SECONDS).apply(lightweightServer.getId())) {
+ final String message = format("Server %s was not created within %sms so it will be destroyed.", name, "30 * 60");
+ logger.warn(message);
+ destroyNode(lightweightServer.getId());
+ throw new IllegalStateException(message);
+ }
+ logger.trace("<< server(%s)", lightweightServer.getId());
+ Server server = novaApi.getServerApi(regionId).get(lightweightServer.getId());
ServerInRegion serverInRegion = new ServerInRegion(server, regionId);
if (!privateKey.isPresent() && lightweightServer.getAdminPass().isPresent())
credentialsBuilder.password(lightweightServer.getAdminPass().get());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/aa64e0d3/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
index 2781942..4805a57 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
@@ -57,7 +57,7 @@ public class ImageToOperatingSystem implements Function<Image, OperatingSystem>
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
- private final Map<OsFamily, Map<String, String>> osVersionMap;
+ protected final Map<OsFamily, Map<String, String>> osVersionMap;
@Inject
public ImageToOperatingSystem(Map<OsFamily, Map<String, String>> osVersionMap) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/aa64e0d3/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java
index 2134bb2..e48554f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInRegionToNodeMetadata.java
@@ -144,7 +144,7 @@ public class ServerInRegionToNodeMetadata implements Function<ServerInRegion, No
return builder.build();
}
- private static final Predicate<Address> isPrivateAddress = new Predicate<Address>() {
+ public static final Predicate<Address> isPrivateAddress = new Predicate<Address>() {
public boolean apply(Address in) {
return InetAddresses2.IsPrivateIPAddress.INSTANCE.apply(in.getAddr());
}
@@ -164,7 +164,7 @@ public class ServerInRegionToNodeMetadata implements Function<ServerInRegion, No
};
- private enum AddressToStringTransformationFunction implements Function<Address, String> {
+ public enum AddressToStringTransformationFunction implements Function<Address, String> {
INSTANCE;
@Override
public String apply(Address address) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/aa64e0d3/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
index 8085c6c..9a4a482 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
@@ -64,9 +64,9 @@ public class ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddT
CreateNodesWithGroupEncodedIntoNameThenAddToSet {
private final AllocateAndAddFloatingIpToNode createAndAddFloatingIpToNode;
- private final LoadingCache<RegionAndName, SecurityGroupInRegion> securityGroupCache;
- private final LoadingCache<RegionAndName, KeyPair> keyPairCache;
- private final NovaApi novaApi;
+ protected final LoadingCache<RegionAndName, SecurityGroupInRegion> securityGroupCache;
+ protected final LoadingCache<RegionAndName, KeyPair> keyPairCache;
+ protected final NovaApi novaApi;
@Inject
protected ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet(