brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahgittin <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request: SoftLayer VLAN customizer
Date Thu, 24 Mar 2016 11:09:05 GMT
Github user ahgittin commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/53#discussion_r57302479
  
    --- Diff: locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/softlayer/SoftLayerSameVlanLocationCustomizer.java
---
    @@ -0,0 +1,398 @@
    +/*
    + * 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.softlayer;
    +
    +import java.util.Map;
    +import java.util.concurrent.CountDownLatch;
    +import java.util.concurrent.TimeUnit;
    +
    +import javax.annotation.concurrent.ThreadSafe;
    +
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +
    +import com.google.common.collect.ImmutableMap;
    +import com.google.common.reflect.TypeToken;
    +import com.google.common.util.concurrent.Uninterruptibles;
    +
    +import org.jclouds.compute.ComputeService;
    +import org.jclouds.compute.options.TemplateOptions;
    +import org.jclouds.softlayer.SoftLayerApi;
    +import org.jclouds.softlayer.compute.options.SoftLayerTemplateOptions;
    +import org.jclouds.softlayer.domain.VirtualGuest;
    +import org.jclouds.softlayer.features.VirtualGuestApi;
    +import org.jclouds.softlayer.reference.SoftLayerConstants;
    +
    +import org.apache.brooklyn.api.entity.Entity;
    +import org.apache.brooklyn.api.sensor.AttributeSensor;
    +import org.apache.brooklyn.config.ConfigKey;
    +import org.apache.brooklyn.core.config.ConfigKeys;
    +import org.apache.brooklyn.core.location.LocationConfigKeys;
    +import org.apache.brooklyn.core.sensor.Sensors;
    +import org.apache.brooklyn.location.jclouds.BasicJcloudsLocationCustomizer;
    +import org.apache.brooklyn.location.jclouds.JcloudsLocation;
    +import org.apache.brooklyn.location.jclouds.JcloudsLocationCustomizer;
    +import org.apache.brooklyn.location.jclouds.JcloudsMachineLocation;
    +import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation;
    +import org.apache.brooklyn.util.collections.MutableMap;
    +import org.apache.brooklyn.util.core.flags.SetFromFlag;
    +import org.apache.brooklyn.util.core.task.Tasks;
    +import org.apache.brooklyn.util.text.Strings;
    +import org.apache.brooklyn.util.time.Duration;
    +
    +/**
    + * Customizes {@link JcloudsSshMachineLocation machines} in SoftLayer to use
    + * the same VLANs across an application, or other named scope
    + * <p>
    + * Define the scope by setting the {@link #SCOPE_UID scopeUid} ({@code softlayer.vlan.scopeUid})
    + * option. If unset or blank, will default to the {@link Entity#getApplicationId() application
ID}
    + * of the entity being deployed on the machine. Set {@link #SCOPE_TIMEOUT scopeTimeout}
    + * ({@code softlayer.vlan.timeout}) to change the length of time the customizer
    + * will wait for VLAN information; normally ten minutes.
    + * <p>
    + * The VLAN IDs and latches are stored as {@link ConfigKey configuration} on
    + * the {@link JcloudsLocation location} provisioning the VMs, in a map keyed
    + * on the scope.
    + */
    +@ThreadSafe
    +public class SoftLayerSameVlanLocationCustomizer extends BasicJcloudsLocationCustomizer
{
    +
    +    private static final Logger LOG = LoggerFactory.getLogger(SoftLayerSameVlanLocationCustomizer.class);
    +
    +    @SetFromFlag("scopeUid")
    +    public static final ConfigKey<String> SCOPE_UID = ConfigKeys.newStringConfigKey(
    +            "softlayer.vlan.scopeUid",
    +            "The unique identifier for a Softlayer location scope that will have VMs
created in the same VLAN");
    +
    +    @SetFromFlag("scopeTimeout")
    +    public static final ConfigKey<Duration> SCOPE_TIMEOUT = ConfigKeys.newDurationConfigKey(
    +            "softlayer.vlan.timeout",
    +            "The length of time to wait for a Softlayer VLAN ID",
    +            Duration.minutes(15));
    +
    +    public static final ConfigKey<Map<String, CountDownLatch>> COUNTDOWN_LATCH_MAP
= ConfigKeys.newConfigKey(
    +            new TypeToken<Map<String, CountDownLatch>>() { },
    +            "softLayerSameVlanLocationCustomizer.map.latches",
    +            "A mapping from scope identifiers to CountDownLatches; used to synchronize
threads",
    +            MutableMap.<String, CountDownLatch>of());
    +    public static final ConfigKey<Map<String, Integer>> PUBLIC_VLAN_ID_MAP
= ConfigKeys.newConfigKey(
    +            new TypeToken<Map<String, Integer>>() { },
    +            "softLayerSameVlanLocationCustomizer.map.publicVlanIds",
    +            "A mapping from scope identifiers to public VLAN numbers",
    +            MutableMap.<String, Integer>of());
    +    public static final ConfigKey<Map<String, Integer>> PRIVATE_VLAN_ID_MAP
= ConfigKeys.newConfigKey(
    +            new TypeToken<Map<String, Integer>>() { },
    +            "softLayerSameVlanLocationCustomizer.map.privateVlanIds",
    +            "A mapping from scope identifiers to private VLAN numbers",
    +            MutableMap.<String, Integer>of());
    +
    +    public static final AttributeSensor<Integer> PUBLIC_VLAN_ID = Sensors.newIntegerSensor(
    +            "softLayer.vlan.publicId", "The public VLAN ID for this entity");
    +    public static final AttributeSensor<Integer> PRIVATE_VLAN_ID = Sensors.newIntegerSensor(
    +            "softLayer.vlan.privateId", "The private VLAN ID for this entity");
    +
    +    /* Flags passed in on object creation. */
    +    private final Map<String, ?> flags;
    +
    +    /* Lock object for synchronization. */
    +    private static final Object lock = new Object[0];
    +
    +    /** Convenience creation method. */
    +    public static SoftLayerSameVlanLocationCustomizer forScope(String scopeUid) {
    +        SoftLayerSameVlanLocationCustomizer customizer = new SoftLayerSameVlanLocationCustomizer(ImmutableMap.of(SCOPE_UID.getName(),
scopeUid));
    +        return customizer;
    +    }
    +
    +    public SoftLayerSameVlanLocationCustomizer() {
    +        this(ImmutableMap.<String, Object>of());
    +    }
    +
    +    public SoftLayerSameVlanLocationCustomizer(Map<String, ?> flags) {
    +        this.flags = ImmutableMap.copyOf(flags);
    +    }
    +
    +    /**
    +     * Used to obtain the VLANs being used by the first created {@link JcloudsMachineLocation}.
    +     *
    +     * @see {@link JcloudsLocationCustomizer#customize(JcloudsLocation, ComputeService,
JcloudsMachineLocation)}
    +     */
    +    @Override
    +    public void customize(JcloudsLocation location, ComputeService computeService, JcloudsMachineLocation
machine) {
    +        // Check we are customising a SoftLayer location
    +        String provider = location.getProvider();
    +        if (!(provider.equals(SoftLayerConstants.SOFTLAYER_PROVIDER_NAME))) {
    +            String message = String.format("Invalid location provider: %s", provider);
    +            LOG.warn(message);
    +            throw new IllegalArgumentException(message);
    +        }
    +
    +        // Lookup the latch for this scope
    +        String scopeUid = getScopeUid(location);
    +        CountDownLatch latch = null;
    +        synchronized (lock) {
    +            latch = lookupCountDownLatch(location, scopeUid);
    +            if (latch == null) {
    +                throw new IllegalStateException("No latch available for scope: " + scopeUid);
    +            }
    +        }
    +
    +        try {
    +            // Check if VLAN IDs have been set for this scope
    +            LOG.debug("Looking up saved VLAN details {}", scopeUid);
    +            Integer publicVlanId = lookupPublicVlanId(location, scopeUid);
    +            Integer privateVlanId = lookupPrivateVlanId(location, scopeUid);
    +            if (privateVlanId != null || publicVlanId != null) {
    +                LOG.debug("SoftLayer VLANs private {} and public {} already configured
for scope: {}",
    --- End diff --
    
    should we warn here if the looked up ID is different to those on the machine?


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message