Github user andreaturli commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/723#discussion_r120920498
--- Diff:
locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractComputeServiceRegistry.java
---
@@ -0,0 +1,283 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.location.jclouds;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;
+import static
org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_AMI_QUERY;
+import static
org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.brooklyn.core.config.Sanitizer;
+import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
+import
org.apache.brooklyn.core.mgmt.persist.DeserializingJcloudsRenamesProvider;
+import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.config.ConfigBag;
+import org.apache.brooklyn.util.text.Strings;
+import org.apache.brooklyn.util.time.Duration;
+import org.jclouds.Constants;
+import org.jclouds.ContextBuilder;
+import org.jclouds.azurecompute.arm.config.AzureComputeRateLimitModule;
+import org.jclouds.compute.ComputeService;
+import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.domain.Credentials;
+import org.jclouds.ec2.reference.EC2Constants;
+import org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule;
+import org.jclouds.location.reference.LocationConstants;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
+import org.jclouds.sshj.config.SshjSshClientModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Predicates;
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.inject.Module;
+
+public abstract class AbstractComputeServiceRegistry implements
ComputeServiceRegistry, JcloudsLocationConfig {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(AbstractComputeServiceRegistry.class);
+
+ private final Map<Map<?, ?>, ComputeService> cachedComputeServices =
new ConcurrentHashMap<>();
+
+ @Override
+ public ComputeService findComputeService(ConfigBag conf, boolean
allowReuse) {
+ PropertiesBuilder propertiesBuilder = new PropertiesBuilder(conf)
+ .setCommonProperties();
+
+ Iterable<Module> modules = getCommonModules();
+
+ // Enable aws-ec2 lazy image fetching, if given a specific
imageId; otherwise customize for specific owners; or all as a last resort
+ // See https://issues.apache.org/jira/browse/WHIRR-416
+ String provider = getProviderFromConfig(conf);
+ if ("aws-ec2".equals(provider)) {
+ propertiesBuilder.setAWSEC2Properties();
+ } else if ("azurecompute-arm".equals(provider)) {
+ propertiesBuilder.setAzureComputeArmProperties();
+ // jclouds 2.0.0 does not include the rate limit module for
Azure ARM. This quick fix enables this which will
+ // avoid provisioning to fail due to rate limit exceeded
+ // See https://issues.apache.org/jira/browse/JCLOUDS-1229
+ modules = ImmutableSet.<Module>builder()
+ .addAll(modules)
+ .add(new AzureComputeRateLimitModule())
+ .build();
+ }
+
+ Properties properties = propertiesBuilder
+ .setJCloudsProperties()
+ .setEndpointProperty()
+ .build();
+
+ Supplier<ComputeService> computeServiceSupplier = new
ComputeServiceSupplier(conf, modules, properties);
+ if (allowReuse) {
+ return
cachedComputeServices.computeIfAbsent(makeCacheKey(conf, properties), key ->
computeServiceSupplier.get());
+ }
+ return computeServiceSupplier.get();
+ }
+
+ private Map<?, ?> makeCacheKey(ConfigBag conf, Properties properties) {
+ String provider = getProviderFromConfig(conf);
+ String identity =
checkNotNull(conf.get(CloudLocationConfig.ACCESS_IDENTITY), "identity must not
be null");
+ String credential =
checkNotNull(conf.get(CloudLocationConfig.ACCESS_CREDENTIAL), "credential must
not be null");
+ String endpoint =
properties.getProperty(Constants.PROPERTY_ENDPOINT);
+ return MutableMap.builder()
+ .putAll(properties)
+ .put("provider", provider)
+ .put("identity", identity)
+ .put("credential", credential)
+ .putIfNotNull("endpoint", endpoint)
+ .build()
+ .asUnmodifiable();
+ }
+
+ public class PropertiesBuilder {
+ private ConfigBag conf;
+ private Properties properties = new Properties();
+
+ public PropertiesBuilder(ConfigBag conf) {
+ this.conf = conf;
+ }
+
+ public PropertiesBuilder setCommonProperties() {
--- End diff --
maybe `setCommonJcloudsProperties`?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
