Performance improvement: caching of NuageVsp ID

Author: Sigert Goeminne

plugins/network-elements/nuage-vsp/pom.xml

@@ -35,7 +35,7 @@
     </repository>
   </repositories>
   <properties>
-      <nuage.vsp.client.version>1.0.1</nuage.vsp.client.version>
+      <nuage.vsp.client.version>1.0.3</nuage.vsp.client.version>
   </properties>
   <dependencies>
     <dependency>

plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/manager/ImplementNetworkVspAnswer.java

@@ -0,0 +1,45 @@
+//
+// 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 com.cloud.agent.api.manager;
+
+import net.nuage.vsp.acs.client.api.model.NetworkRelatedVsdIds;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.guru.ImplementNetworkVspCommand;
+
+/**
+ * Created by sgoeminn on 3/24/17.
+ */
+public class ImplementNetworkVspAnswer extends Answer {
+    private NetworkRelatedVsdIds networkRelatedVsdIds;
+
+    public ImplementNetworkVspAnswer(ImplementNetworkVspCommand command, NetworkRelatedVsdIds networkRelatedVsdIds) {
+        super(command);
+        this.networkRelatedVsdIds = networkRelatedVsdIds;
+    }
+
+    public ImplementNetworkVspAnswer(ImplementNetworkVspCommand command, Exception e) {
+        super(command, e);
+    }
+
+    public NetworkRelatedVsdIds getNetworkRelatedVsdIds() {
+        return networkRelatedVsdIds;
+    }
+}

plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java

@@ -25,6 +25,7 @@
 
 import javax.inject.Inject;
 
+import net.nuage.vsp.acs.client.api.model.NetworkRelatedVsdIds;
 import org.apache.cloudstack.resourcedetail.VpcDetailVO;
 import org.apache.cloudstack.resourcedetail.dao.VpcDetailsDao;
 import org.apache.log4j.Logger;
@@ -36,6 +37,7 @@
 import com.cloud.agent.api.guru.ReserveVmInterfaceVspCommand;
 import com.cloud.agent.api.guru.TrashNetworkVspCommand;
 import com.cloud.agent.api.guru.UpdateDhcpOptionVspCommand;
+import com.cloud.agent.api.manager.ImplementNetworkVspAnswer;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenter.NetworkType;
@@ -206,7 +208,7 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin
             implemented.setBroadcastUri(Networks.BroadcastDomainType.Vsp.toUri(broadcastUriStr));
             implemented.setBroadcastDomainType(Networks.BroadcastDomainType.Vsp);
 
-            if (!implement(physicalNetworkId, vspNetwork, _nuageVspEntityBuilder.buildNetworkDhcpOption(network, offering))) {
+            if (!implement(network.getVpcId(), physicalNetworkId, vspNetwork, _nuageVspEntityBuilder.buildNetworkDhcpOption(network, offering))) {
                 return null;
             }
 
@@ -227,20 +229,65 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin
         return implemented;
     }
 
-    private boolean implement(long physicalNetworkId, VspNetwork vspNetwork, VspDhcpDomainOption vspDhcpDomainOption) {
+    private boolean implement(Long vpcId, long physicalNetworkId, VspNetwork vspNetwork, VspDhcpDomainOption vspDhcpDomainOption) {
         HostVO nuageVspHost = _nuageVspManager.getNuageVspHost(physicalNetworkId);
         ImplementNetworkVspCommand cmd = new ImplementNetworkVspCommand(vspNetwork, vspDhcpDomainOption);
-        Answer answer = _agentMgr.easySend(nuageVspHost.getId(), cmd);
+        ImplementNetworkVspAnswer answer = (ImplementNetworkVspAnswer) _agentMgr.easySend(nuageVspHost.getId(), cmd);
         if (answer == null || !answer.getResult()) {
             s_logger.error("ImplementNetworkVspCommand for network " + vspNetwork.getUuid() + " failed on Nuage VSD " + nuageVspHost.getDetail("hostname"));
             if ((null != answer) && (null != answer.getDetails())) {
                 s_logger.error(answer.getDetails());
             }
             return false;
         }
+        saveNetworkAndVpcDetails(vspNetwork, answer.getNetworkRelatedVsdIds(), vpcId);
         return true;
     }
 
+    private void saveNetworkAndVpcDetails(VspNetwork vspNetwork, NetworkRelatedVsdIds networkRelatedVsdIds, Long vpcId) {
+
+
+        if (!vspNetwork.isShared() && !vspNetwork.getNetworkRelatedVsdIds().equals(networkRelatedVsdIds)) {
+            Map<String, String> networkDetails = constructNetworkDetails(networkRelatedVsdIds, vspNetwork.isVpc());
+
+            for (Map.Entry<String, String> networkDetail : networkDetails.entrySet()) {
+                NetworkDetailVO networkDetailVO = new NetworkDetailVO(vspNetwork.getId(), networkDetail.getKey(), networkDetail.getValue(), false);
+                _networkDetailsDao.persist(networkDetailVO);
+            }
+
+            if(vspNetwork.isVpc()) {
+                Map<String, String> vpcDetails = constructVpcDetails(networkRelatedVsdIds);
+
+                for (Map.Entry<String, String> vpcDetail : vpcDetails.entrySet()) {
+                    VpcDetailVO vpcDetailVO = new VpcDetailVO(vpcId, vpcDetail.getKey(), vpcDetail.getValue(), false);
+                    _vpcDetailsDao.persist(vpcDetailVO);
+                }
+            }
+        }
+    }
+
+    private static Map<String, String> constructNetworkDetails(NetworkRelatedVsdIds networkRelatedVsdIds, boolean isVpc) {
+        Map<String, String> networkDetails = Maps.newHashMap();
+
+        if(!isVpc) {
+            networkRelatedVsdIds.getVsdDomainId().ifPresent(v -> networkDetails.put(NuageVspManager.NETWORK_METADATA_VSD_DOMAIN_ID, v));
+            networkRelatedVsdIds.getVsdZoneId().ifPresent(v -> networkDetails.put(NuageVspManager.NETWORK_METADATA_VSD_ZONE_ID, v));
+        }
+        networkRelatedVsdIds.getVsdSubnetId().ifPresent(v ->  networkDetails.put(NuageVspManager.NETWORK_METADATA_VSD_SUBNET_ID, v));
+
+        return networkDetails;
+    }
+
+    private static Map<String, String> constructVpcDetails(NetworkRelatedVsdIds networkRelatedVsdIds) {
+        Map<String, String> vpcDetails = Maps.newHashMap();
+
+        networkRelatedVsdIds.getVsdDomainId().ifPresent(v ->  vpcDetails.put(NuageVspManager.NETWORK_METADATA_VSD_DOMAIN_ID, v));
+        networkRelatedVsdIds.getVsdZoneId().ifPresent(v ->  vpcDetails.put(NuageVspManager.NETWORK_METADATA_VSD_ZONE_ID, v));
+
+        return vpcDetails;
+    }
+
+
     @Override
     public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
         if (vm.getType() != VirtualMachine.Type.DomainRouter && _nuageVspEntityBuilder.usesVirtualRouter(network.getNetworkOfferingId())) {
@@ -303,7 +350,7 @@ public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, D
 
                 // Make sure the shared network is present
                 NetworkOffering offering = _ntwkOfferingDao.findById(network.getNetworkOfferingId());
-                if (!implement(network.getPhysicalNetworkId(), vspNetwork, _nuageVspEntityBuilder.buildNetworkDhcpOption(network, offering))) {
+                if (!implement(network.getVpcId(), network.getPhysicalNetworkId(), vspNetwork, _nuageVspEntityBuilder.buildNetworkDhcpOption(network, offering))) {
                     s_logger.error("Failed to implement shared network " + network.getUuid() + " under domain " + context.getDomain().getUuid());
                     throw new InsufficientVirtualNetworkCapacityException("Failed to implement shared network " + network.getUuid() + " under domain " +
                             context.getDomain().getUuid(), Network.class, network.getId());

plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManager.java

@@ -36,21 +36,21 @@
 
 public interface NuageVspManager extends PluggableService {
 
-    static final String nuageVspSharedNetworkOfferingWithSGServiceName = "DefaultNuageVspSharedNetworkOfferingWithSGService";
+    String nuageVspSharedNetworkOfferingWithSGServiceName = "DefaultNuageVspSharedNetworkOfferingWithSGService";
 
-    static final String nuageVPCOfferingName = "Nuage VSP VPC Offering";
+    String nuageVPCOfferingName = "Nuage VSP VPC Offering";
 
-    static final String nuageVPCOfferingDisplayText = "Nuage VSP VPC Offering";
+    String nuageVPCOfferingDisplayText = "Nuage VSP VPC Offering";
 
-    static final String nuageDomainTemplateDetailName = "domainTemplateName";
+    String nuageDomainTemplateDetailName = "domainTemplateName";
 
-    static final String nuageUnderlayVlanIpRangeDetailKey = "nuage.underlay";
+    String nuageUnderlayVlanIpRangeDetailKey = "nuage.underlay";
 
-    static final ConfigKey<Boolean> NuageVspConfigDns = new ConfigKey<Boolean>(Boolean.class, "nuagevsp.configure.dns", "Advanced", "true",
+    ConfigKey<Boolean> NuageVspConfigDns = new ConfigKey<Boolean>(Boolean.class, "nuagevsp.configure.dns", "Advanced", "true",
             "Defines if NuageVsp plugin needs to configure DNS setting for a VM or not. True will configure the DNS and false will not configure the DNS settings", true,
             Scope.Global, null);
 
-    static final ConfigKey<Boolean> NuageVspDnsExternal = new ConfigKey<Boolean>(
+    ConfigKey<Boolean> NuageVspDnsExternal = new ConfigKey<Boolean>(
             Boolean.class,
             "nuagevsp.dns.external",
             "Advanced",
@@ -61,18 +61,24 @@ public interface NuageVspManager extends PluggableService {
                     + "If nuagevsp.configure.dns is false, DNS server will not be configured in the VM. Default value for this flag is true",
             true, Scope.Global, null);
 
-    static final ConfigKey<String> NuageVspConfigGateway = new ConfigKey<String>(String.class, "nuagevsp.configure.gateway.systemid", "Advanced", "",
+    ConfigKey<String> NuageVspConfigGateway = new ConfigKey<String>(String.class, "nuagevsp.configure.gateway.systemid", "Advanced", "",
             "Defines the systemID of the gateway configured in VSP", true, Scope.Global, null);
 
-    static final ConfigKey<String> NuageVspSharedNetworkDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.sharedntwk.domaintemplate.name",
+    ConfigKey<String> NuageVspSharedNetworkDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.sharedntwk.domaintemplate.name",
             "Advanced", "", "Defines if NuageVsp plugin needs to use pre created Domain Template configured in VSP for shared networks", true, Scope.Global, null);
 
-    static final ConfigKey<String> NuageVspVpcDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.vpc.domaintemplate.name",
+    ConfigKey<String> NuageVspVpcDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.vpc.domaintemplate.name",
             "Advanced", "", "Defines if NuageVsp plugin needs to use pre created Domain Template configured in VSP for VPCs", true, Scope.Global, null);
 
-    static final ConfigKey<String> NuageVspIsolatedNetworkDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.isolatedntwk.domaintemplate.name",
+    ConfigKey<String> NuageVspIsolatedNetworkDomainTemplateName = new ConfigKey<String>(String.class, "nuagevsp.isolatedntwk.domaintemplate.name",
             "Advanced", "", "Defines if NuageVsp plugin needs to use pre created Domain Template configured in VSP for isolated networks", true, Scope.Global, null);
 
+    String NETWORK_METADATA_VSD_DOMAIN_ID = "vsdDomainId";
+
+    String NETWORK_METADATA_VSD_ZONE_ID = "vsdZoneId";
+
+    String NETWORK_METADATA_VSD_SUBNET_ID = "vsdSubnetId";
+
     NuageVspDeviceVO addNuageVspDevice(AddNuageVspDeviceCmd cmd);
 
     NuageVspDeviceVO updateNuageVspDevice(UpdateNuageVspDeviceCmd cmd);

plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java

@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -41,6 +40,7 @@
 import net.nuage.vsp.acs.client.common.NuageVspApiVersion;
 import net.nuage.vsp.acs.client.common.NuageVspConstants;
 
+import net.nuage.vsp.acs.client.exception.NuageVspException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -365,7 +365,7 @@ public NuageVspDeviceVO addNuageVspDevice(AddNuageVspDeviceCmd cmd) {
         } catch (ConfigurationException e) {
             s_logger.error("Failed to configure Nuage VSD resource " + cmd.getHostName(), e);
             throw new CloudRuntimeException("Failed to configure Nuage VSD resource " + cmd.getHostName(), e);
-        } catch (ExecutionException ee) {
+        } catch (NuageVspException ee) {
             s_logger.error("Failed to add Nuage VSP device " + cmd.getHostName(), ee);
             throw new CloudRuntimeException("Failed to add Nuage VSP device " + cmd.getHostName(), ee);
         }

plugins/network-elements/nuage-vsp/src/com/cloud/network/resource/NuageVspResource.java

@@ -20,7 +20,8 @@
 package com.cloud.network.resource;
 
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 import javax.naming.ConfigurationException;
 
@@ -31,6 +32,8 @@
 import net.nuage.vsp.acs.client.api.NuageVspManagerClient;
 import net.nuage.vsp.acs.client.api.NuageVspPluginClientLoader;
 import net.nuage.vsp.acs.client.api.model.VspHost;
+import net.nuage.vsp.acs.client.common.RequestType;
+import net.nuage.vsp.acs.client.common.model.NuageVspEntity;
 import net.nuage.vsp.acs.client.exception.NuageVspException;
 
 import org.apache.log4j.Logger;
@@ -48,8 +51,9 @@
 import com.cloud.resource.ServerResource;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.mgmt.JmxUtil;
 
-public class NuageVspResource extends ManagerBase implements ServerResource {
+public class NuageVspResource extends ManagerBase implements ServerResource, VspStatisticsMBean {
     private static final Logger s_logger = Logger.getLogger(NuageVspResource.class);
 
     private String _guid;
@@ -87,14 +91,72 @@ public VspHost validate(NuageVspResourceConfiguration configuration) throws Conf
 
             _vspHost = newVspHost;
             _clientLoader = clientLoader;
-        } catch (ExecutionException e) {
+        } catch (NuageVspException e) {
             s_logger.error(e.getMessage(), e);
             throw new CloudRuntimeException(e.getMessage(), e);
         }
 
         return _vspHost;
     }
 
+    @Override
+    public long getVSDStatistics() {
+        return _clientLoader.getNuageVspStatistics().getVsdCount();
+    }
+
+
+    @Override
+    public long getVsdStatisticsByEntityType(String entity) {
+        try {
+            NuageVspEntity nuageVspEntity = NuageVspEntity.valueOf(entity);
+            return _clientLoader.getNuageVspStatistics().getVsdCount(nuageVspEntity);
+        } catch (IllegalArgumentException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public long getVsdStatisticsByRequestType(String requestType) {
+        try {
+            RequestType requestTypeValue = RequestType.valueOf(requestType);
+            return _clientLoader.getNuageVspStatistics().getVsdCount(requestTypeValue);
+        } catch (IllegalArgumentException e) {
+            return -1;
+        }
+
+    }
+
+    @Override
+    public long getVsdStatisticsByEntityAndRequestType(String entity, String requestType) {
+        try {
+            RequestType requestTypeValue = RequestType.valueOf(requestType);
+            NuageVspEntity nuageVspEntity = NuageVspEntity.valueOf(entity);
+            return _clientLoader.getNuageVspStatistics().getVsdCount(nuageVspEntity, requestTypeValue);
+        } catch (IllegalArgumentException e) {
+            return -1;
+        }
+    }
+
+    private static Map<String, AtomicLong> convertHashMap(Map<RequestType, AtomicLong> map) {
+        return map.entrySet()
+                .stream()
+                .collect(Collectors.toMap(
+                        e -> e.getKey().toString(),
+                        Map.Entry::getValue)
+                );
+    }
+
+    @Override
+    public Map<String, Map<String, AtomicLong>> getVsdStatisticsReport() {
+       return _clientLoader.getNuageVspStatistics()
+                .getVsdCountReport()
+                .entrySet().stream()
+                .collect(Collectors.toMap(
+                        e -> e.getKey().toString(),
+                        e -> convertHashMap(e.getValue())
+                ));
+    }
+
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         if(super.configure(name, params)) {
@@ -113,11 +175,25 @@ protected NuageVspPluginClientLoader getClientLoader(VspHost vspHost) {
 
     @Override
     public boolean start() {
+        try {
+            JmxUtil.registerMBean("NuageVspResource", _name, new VspStatisticsMBeanImpl(this));
+        } catch (Exception e) {
+            s_logger.warn("Unable to initialize statistics Mbean", e);
+        }
+
         return true;
+
     }
 
     @Override
     public boolean stop() {
+
+        try {
+            JmxUtil.unregisterMBean("NuageVspResource", _name);
+        } catch (Exception e) {
+            s_logger.warn("Unable to initialize inaccurate clock", e);
+        }
+
         return true;
     }
 
@@ -155,7 +231,7 @@ public PingCommand getCurrentStatus(long id) {
 
         try {
             login();
-        } catch (ExecutionException | ConfigurationException e) {
+        } catch (NuageVspException | ConfigurationException e) {
             s_logger.error("Failed to ping to Nuage VSD on " + _name + " as user " +_vspHost.getCmsUserLogin(), e);
             _shouldAudit = true;
             return null;