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 21:03:00 GMT
Github user jburwell commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/801#discussion_r43052507
  
    --- Diff: plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java
---
    @@ -285,60 +529,334 @@ public boolean deleteNuageVspDevice(DeleteNuageVspDeviceCmd cmd)
{
             return responseList;
         }
     
    -    @Override
    -    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException
{
    -        try {
    -            initNuageScheduledTasks();
    -        } catch (Exception ce) {
    -            s_logger.warn("Failed to load NuageVsp configuration properties. Check if
the NuageVsp properties are configured correctly");
    +    private void registerNewNuageVspDevice(ConfigurationVO currentConfig, String registeredNuageVspDevice)
{
    +        if (currentConfig == null) {
    +            ConfigKey<String> configKey = new ConfigKey<String>("Advanced",
String.class, "nuagevsp.cms.id", registeredNuageVspDevice,
    +                    "<ACS Nuage VSP Device ID>:<Allocated VSD CMS ID> - Do
not edit", false);
    +            ConfigurationVO configuration = new ConfigurationVO("management-server",
configKey);
    +            _configDao.persist(configuration);
    +        } else {
    +            String newValue;
    +            String currentValue = currentConfig.getValue();
    +            if (!Strings.isNullOrEmpty(currentValue)) {
    +                newValue = currentValue + ";" + registeredNuageVspDevice;
    +            } else {
    +                newValue = registeredNuageVspDevice;
    +            }
    +            _configDao.update("nuagevsp.cms.id", newValue);
             }
    -        return true;
         }
     
    -    private void initNuageScheduledTasks() {
    -        Integer numOfSyncThreads = Integer.valueOf(_configDao.getValue(NuageVspManager.NuageVspSyncWorkers.key()));
    -        Integer syncUpIntervalInMinutes = Integer.valueOf(_configDao.getValue(NuageVspManager.NuageVspSyncInterval.key()));
    -
    -        if (numOfSyncThreads != null && syncUpIntervalInMinutes != null) {
    -            ThreadFactory threadFactory = new ThreadFactory() {
    -                public Thread newThread(Runnable runnable) {
    -                    Thread thread = new Thread(runnable, "Nuage Vsp sync task");
    -                    if (thread.isDaemon())
    -                        thread.setDaemon(false);
    -                    if (thread.getPriority() != Thread.NORM_PRIORITY)
    -                        thread.setPriority(Thread.NORM_PRIORITY);
    -                    return thread;
    +    private void auditHost(HostVO host) {
    +        _hostDao.loadDetails(host);
    +
    +        boolean validateDomains = true;
    +        List<NuageVspDeviceVO> nuageVspDevices = _nuageVspDao.listByHost(host.getId());
    +        if (!CollectionUtils.isEmpty(nuageVspDevices)) {
    +            for (NuageVspDeviceVO nuageVspDevice : nuageVspDevices) {
    +                ConfigurationVO cmsIdConfig = _configDao.findByName("nuagevsp.cms.id");
    +                String nuageVspCmsId = findNuageVspCmsIdForDevice(nuageVspDevice.getId(),
cmsIdConfig);
    +                SyncNuageVspCmsIdCommand syncCmd = new SyncNuageVspCmsIdCommand(SyncType.AUDIT,
nuageVspCmsId);
    +                SyncNuageVspCmsIdAnswer answer = (SyncNuageVspCmsIdAnswer) _agentMgr.easySend(nuageVspDevice.getHostId(),
syncCmd);
    +
    +                if (answer != null && !answer.getSuccess()) {
    +                    s_logger.error("Nuage VSP Device with ID " + nuageVspDevice.getId()
+ " is configured with an unknown CMS ID!");
    +                    validateDomains = false;
    +                } else if (answer != null && answer.getSyncType() == SyncType.REGISTER)
{
    +                    registerNewNuageVspDevice(cmsIdConfig, nuageVspDevice.getId() + ":"
+ answer.getNuageVspCmsId());
                     }
    -            };
    -            scheduler = Executors.newScheduledThreadPool(numOfSyncThreads, threadFactory);
    -            scheduler.scheduleWithFixedDelay(new NuageVspSyncTask("FLOATING_IP"), ONE_MINUTE_MULTIPLIER
* 15, ONE_MINUTE_MULTIPLIER * syncUpIntervalInMinutes,
    -                    TimeUnit.MILLISECONDS);
    -            scheduler.scheduleWithFixedDelay(new NuageVspSyncTask("ENTERPRISE_NTWK_MACRO"),
ONE_MINUTE_MULTIPLIER * 15, ONE_MINUTE_MULTIPLIER * syncUpIntervalInMinutes,
    -                    TimeUnit.MILLISECONDS);
    -            scheduler
    -                    .scheduleWithFixedDelay(new NuageVspSyncTask("ENTERPRISE"), ONE_MINUTE_MULTIPLIER
* 15, ONE_MINUTE_MULTIPLIER * syncUpIntervalInMinutes, TimeUnit.MILLISECONDS);
    -        } else {
    -            s_logger.warn("NuageVsp configuration for syncWorkers=" + numOfSyncThreads
+ " syncInterval=" + syncUpIntervalInMinutes
    -                    + " could not be read properly. So, check if the properties are configured
properly in global properties");
    +            }
    +        }
    +
    +        if (validateDomains) {
    +            auditDomainsOnVsp(host, true, false);
             }
         }
     
    -    public class NuageVspSyncTask implements Runnable {
    +    private boolean auditDomainsOnVsp(HostVO host, boolean add, boolean remove) {
    +        List<NuageVspDeviceVO> nuageVspDevices = _nuageVspDao.listByHost(host.getId());
    +        if (!CollectionUtils.isEmpty(nuageVspDevices)) {
    +            _hostDao.loadDetails(host);
    +            List<DomainVO> allDomains = _domainDao.listAll();
    +            for (DomainVO domain : allDomains) {
    +                SyncDomainCommand cmd = new SyncDomainCommand(domain.getUuid(), domain.getName(),
domain.getPath(), add, remove);
    +                SyncDomainAnswer answer = (SyncDomainAnswer) _agentMgr.easySend(host.getId(),
cmd);
    +                return answer.getSuccess();
    +            }
    +        }
    +        return true;
    +    }
     
    -        private String nuageVspEntity;
    +    private String findNuageVspCmsIdForDevice(long deviceId, ConfigurationVO cmsIdConfig)
{
    +        String configValue = cmsIdConfig.getValue();
    +        if (!Strings.isNullOrEmpty(configValue)) {
    +            String[] configuredNuageVspDevices = configValue.split(";");
    +            for (String configuredNuageVspDevice : configuredNuageVspDevices) {
    +                if (configuredNuageVspDevice.startsWith(deviceId + ":")) {
    +                    String[] split = configuredNuageVspDevice.split(":");
    +                    if (split.length != 2 || (split.length > 1 && Strings.isNullOrEmpty(split[1])))
{
    +                        throw new IllegalArgumentException("The configured CMS ID for
Nuage VSP device " + deviceId + " is in an incorrect format");
    +                    }
    +                    return split[1];
    +                }
    +            }
    +        }
    +        return null;
    +    }
     
    -        public NuageVspSyncTask(String nuageVspEntity) {
    -            this.nuageVspEntity = nuageVspEntity;
    +    public List<String> getDnsDetails(Network network) {
    +        List<String> dnsServers = null;
    +        Boolean configureDns = Boolean.valueOf(_configDao.getValue(NuageVspManager.NuageVspConfigDns.key()));
    +        if (configureDns) {
    +            Boolean configureExternalDns = Boolean.valueOf(_configDao.getValue(NuageVspManager.NuageVspDnsExternal.key()));
    +            DataCenterVO dc = _dataCenterDao.findById(network.getDataCenterId());
    +            dnsServers = new ArrayList<String>();
    +            if (configureExternalDns) {
    +                if (!Strings.isNullOrEmpty(dc.getDns1())) {
    +                    dnsServers.add(dc.getDns1());
    +                }
    +                if (!Strings.isNullOrEmpty(dc.getDns2())) {
    +                    dnsServers.add(dc.getDns2());
    +                }
    +            } else {
    +                if (!Strings.isNullOrEmpty(dc.getInternalDns1())) {
    +                    dnsServers.add(dc.getInternalDns1());
    +                }
    +                if (!Strings.isNullOrEmpty(dc.getInternalDns2())) {
    +                    dnsServers.add(dc.getInternalDns2());
    +                }
    +            }
             }
    +        return dnsServers;
    +    }
     
    -        public String getNuageVspEntity() {
    -            return nuageVspEntity;
    +    public List<String> getGatewaySystemIds() {
    +        List<String> gatewayIds = null;
    +        String gatewaySystemIds = String.valueOf(_configDao.getValue(NuageVspManager.NuageVspConfigGateway.key()));
    +        if (!Strings.isNullOrEmpty(gatewaySystemIds)) {
    +            StringTokenizer tokens = new StringTokenizer(gatewaySystemIds, ",");
    +            gatewayIds = new ArrayList<String>(tokens.countTokens());
    +            while (tokens.hasMoreTokens())
    +            {
    +                gatewayIds.add(tokens.nextToken());
    +            }
             }
    +        return gatewayIds;
    +    }
     
    -        @Override
    -        public void run() {
    -            nuageVspSync.syncWithNuageVsp(nuageVspEntity);
    +    @Override
    +    public boolean preStateTransitionEvent(Status oldState, Status.Event event, Status
newState, Host host, boolean status, Object opaque) {
    +        return true;
    +    }
    +
    +    @Override
    +    public boolean postStateTransitionEvent(StateMachine2.Transition<Status, Status.Event>
transition, Host vo, boolean status, Object opaque) {
    +        // Whenever a Nuage VSP Host comes up, check if all CS domains are present and
check if the CMS ID is valid
    +        if (transition.getToState() == Status.Up && vo instanceof HostVO) {
    +            auditHost((HostVO) vo);
             }
    +        return true;
    +    }
    +
    +    @Override
    +    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException
{
    +        initMessageBusListeners();
    +        initNuageVspResourceListeners();
    +        initNuageNetworkOffering();
    +        initNuageVspVpcOffering();
    +        Status.getStateMachine().registerListener(this);
    +        return true;
    +    }
    +
    +    @DB
    +    private void initMessageBusListeners() {
    +        // Create corresponding enterprise and profile in VSP when creating a CS Domain
    +        _messageBus.subscribe(DomainManager.MESSAGE_ADD_DOMAIN_EVENT, new MessageSubscriber()
{
    +            @Override
    +            public void onPublishMessage(String senderAddress, String subject, Object
args) {
    +                Long domainId = (Long) args;
    +                Domain domain = _domainDao.findById(domainId);
    +
    +                try {
    +                    _domainDao.acquireInLockTable(domain.getId());
    +
    +                    List<NuageVspDeviceVO> nuageVspDevices = _nuageVspDao.listAll();
    +                    for (NuageVspDeviceVO nuageVspDevice : nuageVspDevices) {
    +                        HostVO host = findNuageVspHost(nuageVspDevice.getHostId());
    +                        SyncDomainCommand cmd = new SyncDomainCommand(domain.getUuid(),
domain.getName(), domain.getPath(), true, false);
    +                        _agentMgr.easySend(host.getId(), cmd);
    +                    }
    +                } finally {
    +                    _domainDao.releaseFromLockTable(domain.getId());
    +                }
    +            }
    +        });
    +
    +        // Delete corresponding enterprise and profile in VSP when deleting a CS Domain
    +        _messageBus.subscribe(DomainManager.MESSAGE_REMOVE_DOMAIN_EVENT, new MessageSubscriber()
{
    +            @Override
    +            public void onPublishMessage(String senderAddress, String subject, Object
args) {
    +                DomainVO domain = (DomainVO) args;
    +                List<NuageVspDeviceVO> nuageVspDevices = _nuageVspDao.listAll();
    +                for (NuageVspDeviceVO nuageVspDevice : nuageVspDevices) {
    +                    HostVO host = findNuageVspHost(nuageVspDevice.getHostId());
    --- End diff --
    
    Can a join be implemented on the DAO to retrieve the hosts? A for loop of selects can
put unnecessary strain on the database.


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