You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/06/26 07:05:32 UTC
[1/2] jclouds git commit: Checks network availability before working
with recently created networks
Repository: jclouds
Updated Branches:
refs/heads/2.1.x 0ae9e5a09 -> ff95137fa
Checks network availability before working with recently created networks
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d8257ae4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d8257ae4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d8257ae4
Branch: refs/heads/2.1.x
Commit: d8257ae435018ea937eac3b06217d37c339b3ed4
Parents: 0ae9e5a
Author: Dani Estevez <co...@danielestevez.com>
Authored: Tue May 29 12:31:13 2018 -0400
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Jun 26 09:04:27 2018 +0200
----------------------------------------------------------------------
.../compute/config/AzurePredicatesModule.java | 108 ++++++++++++-------
.../CreateResourcesThenCreateNodes.java | 32 +++---
.../CreateResourcesThenCreateNodesTest.java | 17 +--
3 files changed, 99 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d8257ae4/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
index 9885075..d02909b 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
@@ -16,54 +16,53 @@
*/
package org.jclouds.azurecompute.arm.compute.config;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Iterables;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.name.Named;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.OPERATION_TIMEOUT;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.TIMEOUT_RESOURCE_DELETED;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_DELETE_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_OPERATION_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_RECOVERABLE_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_DELETE_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_KEY_DELETED_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_KEY_RECOVERABLE_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_SECRET_DELETE_STATUS;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_SECRET_RECOVERABLE_STATUS;
+import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_IMAGE_AVAILABLE;
+import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
+import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
+import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
+import static org.jclouds.util.Predicates2.retry;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.compute.reference.ComputeServiceConstants.PollPeriod;
+import java.net.URI;
+import java.util.List;
+import org.jclouds.azurecompute.arm.AzureComputeApi;
+import org.jclouds.azurecompute.arm.domain.Certificate.CertificateBundle;
+import org.jclouds.azurecompute.arm.domain.Certificate.CertificateOperation;
+import org.jclouds.azurecompute.arm.domain.Certificate.DeletedCertificateBundle;
import org.jclouds.azurecompute.arm.domain.Image;
+import org.jclouds.azurecompute.arm.domain.Key.DeletedKeyBundle;
+import org.jclouds.azurecompute.arm.domain.Key.KeyBundle;
import org.jclouds.azurecompute.arm.domain.NetworkSecurityGroup;
import org.jclouds.azurecompute.arm.domain.Provisionable;
import org.jclouds.azurecompute.arm.domain.PublicIPAddress;
import org.jclouds.azurecompute.arm.domain.ResourceDefinition;
+import org.jclouds.azurecompute.arm.domain.Secret.DeletedSecretBundle;
+import org.jclouds.azurecompute.arm.domain.Secret.SecretBundle;
import org.jclouds.azurecompute.arm.domain.Vault;
import org.jclouds.azurecompute.arm.domain.VirtualMachineInstance;
+import org.jclouds.azurecompute.arm.domain.VirtualNetwork;
import org.jclouds.azurecompute.arm.functions.ParseJobStatus;
-import org.jclouds.azurecompute.arm.AzureComputeApi;
-import org.jclouds.azurecompute.arm.domain.Key.DeletedKeyBundle;
-import org.jclouds.azurecompute.arm.domain.Key.KeyBundle;
-import org.jclouds.azurecompute.arm.domain.Secret.DeletedSecretBundle;
-import org.jclouds.azurecompute.arm.domain.Secret.SecretBundle;
-import org.jclouds.azurecompute.arm.domain.Certificate.DeletedCertificateBundle;
-import org.jclouds.azurecompute.arm.domain.Certificate.CertificateBundle;
-import org.jclouds.azurecompute.arm.domain.Certificate.CertificateOperation;
-
-import java.net.URI;
-import java.util.List;
-
-import static org.jclouds.util.Predicates2.retry;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_IMAGE_AVAILABLE;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.TIMEOUT_RESOURCE_DELETED;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.OPERATION_TIMEOUT;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_DELETE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_KEY_DELETED_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_KEY_RECOVERABLE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_SECRET_DELETE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_SECRET_RECOVERABLE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_DELETE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_RECOVERABLE_STATUS;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.VAULT_CERTIFICATE_OPERATION_STATUS;
+import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.compute.reference.ComputeServiceConstants.PollPeriod;
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Predicate;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Iterables;
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.name.Named;
public class AzurePredicatesModule extends AbstractModule {
protected void configure() {
@@ -135,6 +134,12 @@ public class AzurePredicatesModule extends AbstractModule {
pollPeriod.pollMaxPeriod);
}
+ @Provides
+ protected NetworkAvailablePredicateFactory provideNetworkAvailablePredicate(final AzureComputeApi api,
+ Predicate<Supplier<Provisionable>> resourceAvailable) {
+ return new NetworkAvailablePredicateFactory(api, resourceAvailable);
+ }
+
@VisibleForTesting
static class ActionDonePredicate implements Predicate<URI> {
@@ -274,6 +279,35 @@ public class AzurePredicatesModule extends AbstractModule {
}
}
+ public static class NetworkAvailablePredicateFactory {
+ private final AzureComputeApi api;
+ private final Predicate<Supplier<Provisionable>> resourceAvailable;
+
+ NetworkAvailablePredicateFactory(final AzureComputeApi api,
+ Predicate<Supplier<Provisionable>> resourceAvailable) {
+ this.api = checkNotNull(api, "api cannot be null");
+ this.resourceAvailable = resourceAvailable;
+ }
+
+ public Predicate<String> create(final String resourceGroup) {
+ checkNotNull(resourceGroup, "resourceGroup cannot be null");
+ return new Predicate<String>() {
+ @Override
+ public boolean apply(final String name) {
+ checkNotNull(name, "name cannot be null");
+ return resourceAvailable.apply(new Supplier<Provisionable>() {
+ @Override
+ public Provisionable get() {
+ VirtualNetwork vnet = api.getVirtualNetworkApi(resourceGroup).get(name);
+ return vnet == null ? null : vnet.properties();
+ }
+ });
+ }
+ };
+ }
+ }
+
+
public static class ImageAvailablePredicateFactory {
private final AzureComputeApi api;
private final Predicate<Supplier<Provisionable>> resourceAvailable;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d8257ae4/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java
index 511d531..436dff0 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodes.java
@@ -16,10 +16,18 @@
*/
package org.jclouds.azurecompute.arm.compute.strategy;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.DEFAULT_SUBNET_ADDRESS_PREFIX;
+import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.DEFAULT_VNET_ADDRESS_SPACE_PREFIX;
+import static org.jclouds.azurecompute.arm.domain.IdReference.extractName;
+import static org.jclouds.azurecompute.arm.domain.IdReference.extractResourceGroup;
+import static org.jclouds.azurecompute.arm.domain.Subnet.extractVirtualNetwork;
+
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
-
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
@@ -27,6 +35,7 @@ import javax.inject.Singleton;
import org.jclouds.Constants;
import org.jclouds.azurecompute.arm.AzureComputeApi;
+import org.jclouds.azurecompute.arm.compute.config.AzurePredicatesModule.NetworkAvailablePredicateFactory;
import org.jclouds.azurecompute.arm.compute.domain.ResourceGroupAndName;
import org.jclouds.azurecompute.arm.compute.domain.ResourceGroupAndNameAndIngressRules;
import org.jclouds.azurecompute.arm.compute.functions.TemplateToAvailabilitySet;
@@ -63,15 +72,6 @@ import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.DEFAULT_SUBNET_ADDRESS_PREFIX;
-import static org.jclouds.azurecompute.arm.config.AzureComputeProperties.DEFAULT_VNET_ADDRESS_SPACE_PREFIX;
-import static org.jclouds.azurecompute.arm.domain.IdReference.extractName;
-import static org.jclouds.azurecompute.arm.domain.IdReference.extractResourceGroup;
-import static org.jclouds.azurecompute.arm.domain.Subnet.extractVirtualNetwork;
-
@Singleton
public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedIntoNameThenAddToSet {
@@ -85,6 +85,7 @@ public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedI
private final String defaultSubnetAddressPrefix;
private final TemplateToAvailabilitySet templateToAvailabilitySet;
private final PasswordGenerator.Config passwordGenerator;
+ private final NetworkAvailablePredicateFactory networkAvailable;
@Inject
protected CreateResourcesThenCreateNodes(
@@ -96,8 +97,8 @@ public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedI
AzureComputeApi api, @Named(DEFAULT_VNET_ADDRESS_SPACE_PREFIX) String defaultVnetAddressPrefix,
@Named(DEFAULT_SUBNET_ADDRESS_PREFIX) String defaultSubnetAddressPrefix,
LoadingCache<ResourceGroupAndNameAndIngressRules, String> securityGroupMap,
- TemplateToAvailabilitySet templateToAvailabilitySet,
- PasswordGenerator.Config passwordGenerator) {
+ TemplateToAvailabilitySet templateToAvailabilitySet, PasswordGenerator.Config passwordGenerator,
+ NetworkAvailablePredicateFactory networkAvailable) {
super(addNodeWithGroupStrategy, listNodesStrategy, namingConvention, userExecutor,
customizeNodeAndAddToGoodMapOrPutExceptionIntoBadMapFactory);
this.api = api;
@@ -106,6 +107,7 @@ public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedI
this.defaultSubnetAddressPrefix = defaultSubnetAddressPrefix;
this.templateToAvailabilitySet = templateToAvailabilitySet;
this.passwordGenerator = passwordGenerator;
+ this.networkAvailable = networkAvailable;
}
@Override
@@ -163,8 +165,12 @@ public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedI
defaultVnetAddressPrefix, name, defaultSubnetAddressPrefix);
api.getVirtualNetworkApi(options.getResourceGroup()).createOrUpdate(name, location, null, properties);
+
+ checkState(networkAvailable.create(options.getResourceGroup()).apply(name),
+ "Network/Subnet was not created in the configured timeout");
+
Subnet createdSubnet = api.getSubnetApi(options.getResourceGroup(), name).get(name);
-
+
options.ipOptions(IpOptions.builder().subnet(createdSubnet.id()).allocateNewPublicIp(true).build());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d8257ae4/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodesTest.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodesTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodesTest.java
index 45c56a3..6693ec7 100644
--- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodesTest.java
+++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/strategy/CreateResourcesThenCreateNodesTest.java
@@ -16,6 +16,13 @@
*/
package org.jclouds.azurecompute.arm.compute.strategy;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.testng.Assert.assertEquals;
+
import org.jclouds.azurecompute.arm.AzureComputeApi;
import org.jclouds.azurecompute.arm.compute.options.AzureTemplateOptions;
import org.jclouds.azurecompute.arm.compute.options.IpOptions;
@@ -29,13 +36,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
@Test(groups = "unit", testName = "CreateResourcesThenCreateNodesTest")
public class CreateResourcesThenCreateNodesTest {
@@ -102,7 +102,8 @@ public class CreateResourcesThenCreateNodesTest {
}
private static CreateResourcesThenCreateNodes strategy(AzureComputeApi api) {
- return new CreateResourcesThenCreateNodes(null, null, null, null, null, api, null, null, null, null, new PasswordGenerator().lower());
+ return new CreateResourcesThenCreateNodes(null, null, null, null, null, api, null, null, null, null,
+ new PasswordGenerator().lower(), null);
}
private static String netResource(String resource) {
[2/2] jclouds git commit: Adds minor improvements to readability
Posted by na...@apache.org.
Adds minor improvements to readability
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ff95137f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ff95137f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ff95137f
Branch: refs/heads/2.1.x
Commit: ff95137faac35e8756afeb853f2184e1c1b13cf0
Parents: d8257ae
Author: Dani Estevez <co...@danielestevez.com>
Authored: Tue May 29 15:40:12 2018 -0400
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Jun 26 09:05:13 2018 +0200
----------------------------------------------------------------------
.../arm/compute/config/AzureNameValidator.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ff95137f/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java
index 4b2615a..1f3bc3e 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java
@@ -33,19 +33,20 @@ import com.google.inject.Singleton;
*/
@Singleton
public class AzureNameValidator extends Validator<String> {
- private final int min = 2;
- private final int max = 63;
+ private static final int minLength = 2;
+ private static final int maxLength = 63;
public void validate(String name) {
- if (name == null || name.length() < min || name.length() > max)
- throw exception(name, "Can't be null or empty. Length must be " + min + " to " + max + " symbols.");
- if (CharMatcher.JAVA_LETTER_OR_DIGIT.indexIn(name) != 0)
+ if (name == null || name.length() < minLength || name.length() > maxLength)
+ throw exception(name, "Can't be null or empty. Length must be " + minLength + " to " + maxLength + " symbols");
+ if (!CharMatcher.JAVA_LETTER_OR_DIGIT.matches(name.charAt(0)))
throw exception(name, "Should start with letter/number");
CharMatcher range = getAcceptableRange();
if (!range.matchesAllOf(name))
- throw exception(name, "Should have lowercase or uppercase ASCII letters, numbers, or dashes");
+ throw exception(name,
+ "Should have lowercase or uppercase ASCII letters, numbers, dashes, underscores and periods");
}
private CharMatcher getAcceptableRange() {
@@ -53,8 +54,7 @@ public class AzureNameValidator extends Validator<String> {
}
protected IllegalArgumentException exception(String name, String reason) {
- return new IllegalArgumentException(
- String.format("Object '%s' doesn't match Azure naming constraints. " + "Reason: %s.", name,
+ return new IllegalArgumentException(String.format("Object '%s' doesn't match Azure naming constraints: %s", name,
reason));
}