cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburwell <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8832 : Update Nuage VSP plugin...
Date Mon, 26 Oct 2015 20:18:53 GMT
Github user jburwell commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/801#discussion_r43046732
  
    --- Diff: plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
---
    @@ -67,25 +74,76 @@
     import com.cloud.network.dao.PhysicalNetworkVO;
     import com.cloud.network.resource.NuageVspResource;
     import com.cloud.network.sync.NuageVspSync;
    +import com.cloud.network.vpc.VpcManager;
    +import com.cloud.network.vpc.VpcOffering;
    +import com.cloud.network.vpc.VpcOfferingServiceMapVO;
    +import com.cloud.network.vpc.VpcOfferingVO;
     import com.cloud.network.vpc.dao.VpcDao;
     import com.cloud.network.vpc.dao.VpcOfferingDao;
     import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
    +import com.cloud.network.vpc.dao.VpcServiceMapDao;
    +import com.cloud.offering.NetworkOffering;
    +import com.cloud.offerings.NetworkOfferingServiceMapVO;
    +import com.cloud.offerings.NetworkOfferingVO;
    +import com.cloud.offerings.dao.NetworkOfferingDao;
    +import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
     import com.cloud.resource.ResourceManager;
     import com.cloud.resource.ResourceState;
     import com.cloud.resource.ServerResource;
    +import com.cloud.user.AccountManager;
    +import com.cloud.user.DomainManager;
     import com.cloud.utils.component.ManagerBase;
    +import com.cloud.utils.db.DB;
     import com.cloud.utils.db.Transaction;
     import com.cloud.utils.db.TransactionCallback;
    +import com.cloud.utils.db.TransactionCallbackNoReturn;
     import com.cloud.utils.db.TransactionStatus;
     import com.cloud.utils.exception.CloudRuntimeException;
    +import com.cloud.utils.fsm.StateListener;
    +import com.cloud.utils.fsm.StateMachine2;
    +import com.google.common.base.MoreObjects;
    +import com.google.common.base.Strings;
    +import com.google.common.collect.Maps;
    +import com.google.common.collect.Sets;
    +import net.nuage.vsp.acs.NuageVspPluginClientLoader;
    +import org.apache.cloudstack.framework.config.ConfigKey;
    +import org.apache.cloudstack.framework.config.Configurable;
    +import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
    +import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
    +import org.apache.cloudstack.framework.messagebus.MessageBus;
    +import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
    +import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
    +import org.apache.commons.codec.binary.Base64;
    +import org.apache.commons.collections.CollectionUtils;
    +import org.apache.log4j.Logger;
    +
    +import javax.ejb.Local;
    +import javax.inject.Inject;
    +import javax.naming.ConfigurationException;
    +import java.util.ArrayList;
    +import java.util.Collections;
    +import java.util.HashMap;
    +import java.util.List;
    +import java.util.Map;
    +import java.util.Set;
    +import java.util.StringTokenizer;
    +import java.util.UUID;
    +import java.util.concurrent.ScheduledExecutorService;
    +
    +import static com.cloud.agent.api.sync.SyncNuageVspCmsIdCommand.SyncType;
     
     @Local(value = {NuageVspManager.class})
    -public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager, Configurable
{
    +public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager, Configurable,
StateListener<Status, Status.Event, Host> {
     
         private static final Logger s_logger = Logger.getLogger(NuageVspManagerImpl.class);
     
         private static final int ONE_MINUTE_MULTIPLIER = 60 * 1000;
     
    +    private static final Set<Network.Provider> NUAGE_VSP_PROVIDERS;
    +    private static final Map<Network.Service, Set<Network.Provider>> NUAGE_VSP_VPC_SERVICE_MAP;
    +    private static final ConfigKey[] NUAGE_VSP_CONFIG_KEYS = new ConfigKey<?>[]
{ NuageVspConfigDns, NuageVspDnsExternal, NuageVspConfigGateway,
    --- End diff --
    
    @nlivens ahh .. missed the return type.  Please ensure you return a copy of this array
to any callers to avoid side effects if a subsequent user modifies the array.


---
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