You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/05/15 09:42:32 UTC

[49/50] [abbrv] merge to master

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java
index c2e9a00,9872c3a..d7ce1cf
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@@ -16,27 -16,27 +16,39 @@@
  // under the License.
  package com.cloud.api.query;
  
 -import java.util.*;
 +import java.sql.PreparedStatement;
 +import java.sql.ResultSet;
 +import java.sql.SQLException;
 +import java.util.ArrayList;
 +import java.util.Date;
 +import java.util.HashSet;
 +import java.util.LinkedHashSet;
++import java.util.LinkedList;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
  
  import javax.ejb.Local;
  import javax.inject.Inject;
  
 +import org.apache.cloudstack.api.BaseCmd;
+ import com.cloud.api.ApiDBUtils;
+ import com.cloud.server.ResourceMetaDataService;
+ import com.cloud.server.ResourceTag;
+ import com.cloud.server.TaggedResourceService;
+ import com.cloud.vm.NicDetailVO;
+ import com.cloud.vm.dao.NicDetailDao;
  import org.apache.cloudstack.affinity.AffinityGroupResponse;
  import org.apache.cloudstack.affinity.AffinityGroupVMMapVO;
  import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
+ import com.cloud.storage.VolumeDetailVO;
+ import com.cloud.storage.dao.VolumeDetailsDao;
+ 
+ import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
  import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
  import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
 +import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
  import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
  import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
  import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
@@@ -50,32 -49,12 +62,13 @@@ import org.apache.cloudstack.api.comman
  import org.apache.cloudstack.api.command.user.project.ListProjectsCmd;
  import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
  import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 +import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
  import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
  import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
+ import org.apache.cloudstack.api.command.user.volume.ListResourceDetailsCmd;
  import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
  import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
- import org.apache.cloudstack.api.response.AccountResponse;
- import org.apache.cloudstack.api.response.AsyncJobResponse;
- import org.apache.cloudstack.api.response.DiskOfferingResponse;
- import org.apache.cloudstack.api.response.DomainRouterResponse;
- import org.apache.cloudstack.api.response.EventResponse;
- import org.apache.cloudstack.api.response.HostResponse;
- import org.apache.cloudstack.api.response.ImageStoreResponse;
- import org.apache.cloudstack.api.response.InstanceGroupResponse;
- import org.apache.cloudstack.api.response.ListResponse;
- import org.apache.cloudstack.api.response.ProjectAccountResponse;
- import org.apache.cloudstack.api.response.ProjectInvitationResponse;
- import org.apache.cloudstack.api.response.ProjectResponse;
- import org.apache.cloudstack.api.response.ResourceTagResponse;
- import org.apache.cloudstack.api.response.SecurityGroupResponse;
- import org.apache.cloudstack.api.response.ServiceOfferingResponse;
- import org.apache.cloudstack.api.response.StoragePoolResponse;
- import org.apache.cloudstack.api.response.TemplateResponse;
- import org.apache.cloudstack.api.response.UserResponse;
- import org.apache.cloudstack.api.response.UserVmResponse;
- import org.apache.cloudstack.api.response.VolumeResponse;
- import org.apache.cloudstack.api.response.ZoneResponse;
+ import org.apache.cloudstack.api.response.*;
  import org.apache.cloudstack.query.QueryService;
  import org.apache.log4j.Logger;
  import org.springframework.stereotype.Component;
@@@ -278,13 -244,12 +277,18 @@@ public class QueryManagerImpl extends M
      private HighAvailabilityManager _haMgr;
  
      @Inject
 -    private ResourceMetaDataService _resourceMetaDataMgr;
 +    private VMTemplateDao _templateDao;
 +
 +    @Inject
 +    private TemplateJoinDao _templateJoinDao;
 +
++    @Inject ResourceManager _resourceMgr;
++    @Inject private ResourceMetaDataService _resourceMetaDataMgr;
+ 
+     @Inject
+     private TaggedResourceService _taggedResourceMgr;
+ 
      @Inject
-     ResourceManager _resourceMgr;
      AffinityGroupVMMapDao _affinityGroupVMMapDao;
  
      @Inject
@@@ -1109,13 -1081,14 +1120,13 @@@
              sc.setParameters("dataCenterId", zoneId);
          }
  
-         if (zoneType != null) {
-             sc.setParameters("dataCenterType", zoneType);
+         if (podId != null) {
+             sc.setParameters("podId", podId);
          }
  
-         if (pod != null) {
-             sc.setParameters("podId", pod);
+         if (zoneType != null) {
+             sc.setParameters("dataCenterType", zoneType);
          }
 -        
  
          if (hostId != null) {
              sc.setParameters("hostId", hostId);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index bc15d8e,55e7b7e..045c333
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@@ -115,7 -121,9 +122,8 @@@ import com.cloud.exception.MissingParam
  import com.cloud.exception.PermissionDeniedException;
  import com.cloud.exception.ResourceAllocationException;
  import com.cloud.exception.ResourceUnavailableException;
 -import com.cloud.host.HostVO;
  import com.cloud.hypervisor.Hypervisor.HypervisorType;
+ import com.cloud.network.IpAddress;
  import com.cloud.network.Network;
  import com.cloud.network.Network.Capability;
  import com.cloud.network.Network.GuestType;
@@@ -2477,12 -2601,12 +2600,12 @@@ public class ConfigurationManagerImpl e
      @Override
      @DB
      public Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId,
-             String startIP, String endIP, String vlanGateway, String vlanNetmask,
-             String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) {
+                                            String startIP, String endIP, String vlanGateway, String vlanNetmask,
+                                            String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) {
          Network network = _networkModel.getNetwork(networkId);
 -        
 +
          boolean ipv4 = false, ipv6 = false;
 -        
 +
          if (startIP != null) {
          	ipv4 = true;
          }
@@@ -2693,22 -2817,8 +2816,8 @@@
              throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for the guest network in zone " + zone.getName());
          }
  
-         // For untagged vlan check if vlan per pod already exists. If yes,
-         // verify that new vlan range has the same netmask and gateway
-         if (zone.getNetworkType() == NetworkType.Basic && vlanId.equalsIgnoreCase(Vlan.UNTAGGED) && podId != null) {
-             List<VlanVO> podVlans = _vlanDao.listVlansForPodByType(podId, VlanType.DirectAttached);
-             if (podVlans != null && !podVlans.isEmpty()) {
-                 VlanVO podVlan = podVlans.get(0);
-                 if (!podVlan.getVlanNetmask().equals(vlanNetmask)) {
-                     throw new InvalidParameterValueException("Vlan netmask is different from the netmask of Untagged vlan id=" + podVlan.getId() + " existing in the pod " + podId);
-                 } else if (!podVlan.getVlanGateway().equals(vlanGateway)) {
-                     throw new InvalidParameterValueException("Vlan gateway is different from the gateway of Untagged vlan id=" + podVlan.getId() + " existing in the pod " + podId);
-                 }
-             }
-         }
- 
          String ipRange = null;
 -        
 +
          if (ipv4) {
          	ipRange = startIP;
          	if (endIP != null) {
@@@ -2756,14 -2866,14 +2865,14 @@@
  
      @Override
      @DB
-     public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller) {
-         VlanVO vlan = _vlanDao.findById(vlanDbId);
-         if (vlan == null) {
+     public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller)  {
+         VlanVO vlanRange = _vlanDao.findById(vlanDbId);
+         if (vlanRange == null) {
              throw new InvalidParameterValueException("Please specify a valid IP range id.");
          }
 -        
 +
          boolean isAccountSpecific = false;
-         List<AccountVlanMapVO> acctVln = _accountVlanMapDao.listAccountVlanMapsByVlan(vlan.getId());
+         List<AccountVlanMapVO> acctVln = _accountVlanMapDao.listAccountVlanMapsByVlan(vlanRange.getId());
          // Check for account wide pool. It will have an entry for account_vlan_map.
          if (acctVln != null && !acctVln.isEmpty()) {
              isAccountSpecific = true;
@@@ -2774,10 -2884,10 +2883,10 @@@
          List<IPAddressVO> ips = _publicIpAddressDao.listByVlanId(vlanDbId);
          boolean success = true;
          if (allocIpCount > 0) {
 -            if (isAccountSpecific) { 
 +            if (isAccountSpecific) {
                  try {
-                     vlan = _vlanDao.acquireInLockTable(vlanDbId, 30);
-                     if (vlan == null) {
+                     vlanRange = _vlanDao.acquireInLockTable(vlanDbId, 30);
+                     if (vlanRange == null) {
                          throw new CloudRuntimeException("Unable to acquire vlan configuration: " + vlanDbId);
                      }
  
@@@ -3693,9 -3924,11 +3922,11 @@@
          boolean elasticIp = false;
          boolean associatePublicIp = false;
          boolean inline = false;
+         boolean publicLb = false;
+         boolean internalLb = false;
          if (serviceCapabilityMap != null && !serviceCapabilityMap.isEmpty()) {
              Map<Capability, String> lbServiceCapabilityMap = serviceCapabilityMap.get(Service.Lb);
 -            
 +
              if ((lbServiceCapabilityMap != null) && (!lbServiceCapabilityMap.isEmpty())) {
                  String isolationCapability = lbServiceCapabilityMap.get(Capability.SupportedLBIsolation);
                  if (isolationCapability != null) {
@@@ -3749,9 -3999,9 +3997,9 @@@
              }
          }
  
 -        NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, 
 +        NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan,
                  networkRate, multicastRate, isDefault, availability, tags, type, conserveMode, dedicatedLb,
-                 sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp);
+                 sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp, publicLb, internalLb);
  
          if (serviceOfferingId != null) {
              offering.setServiceOfferingId(serviceOfferingId);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/server/ManagementServerImpl.java
index 6eda6f5,425ecf0..c3913a5
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@@ -44,52 -43,379 +43,374 @@@ import javax.crypto.spec.SecretKeySpec
  import javax.inject.Inject;
  import javax.naming.ConfigurationException;
  
- import com.cloud.configuration.*;
- import com.cloud.storage.dao.*;
+ import org.apache.cloudstack.acl.ControlledEntity;
  import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+ import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+ import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
  import org.apache.cloudstack.api.ApiConstants;
- 
- import com.cloud.event.ActionEventUtils;
  import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
- import org.apache.cloudstack.api.command.admin.account.*;
- import org.apache.cloudstack.api.command.admin.domain.*;
- import org.apache.cloudstack.api.command.admin.host.*;
- import org.apache.cloudstack.api.command.admin.network.*;
- import org.apache.cloudstack.api.command.admin.offering.*;
- import org.apache.cloudstack.api.command.admin.resource.*;
- import org.apache.cloudstack.api.command.admin.router.*;
- import org.apache.cloudstack.api.command.admin.storage.*;
- import org.apache.cloudstack.api.command.admin.systemvm.*;
- import org.apache.cloudstack.api.command.admin.usage.*;
- import org.apache.cloudstack.api.command.admin.user.*;
- import org.apache.cloudstack.api.command.admin.vlan.*;
- import org.apache.cloudstack.api.command.admin.vpc.*;
- import org.apache.cloudstack.api.command.user.autoscale.*;
- import org.apache.cloudstack.api.command.user.firewall.*;
- import org.apache.cloudstack.api.command.user.iso.*;
- import org.apache.cloudstack.api.command.user.loadbalancer.*;
- import org.apache.cloudstack.api.command.user.nat.*;
+ import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
+ import org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd;
+ import org.apache.cloudstack.api.command.admin.account.DisableAccountCmd;
+ import org.apache.cloudstack.api.command.admin.account.EnableAccountCmd;
+ import org.apache.cloudstack.api.command.admin.account.LockAccountCmd;
+ import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
+ import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
+ import org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd;
+ import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
+ import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
+ import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
+ import org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;
+ import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
+ import org.apache.cloudstack.api.command.admin.config.ListHypervisorCapabilitiesCmd;
+ import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
+ import org.apache.cloudstack.api.command.admin.config.UpdateHypervisorCapabilitiesCmd;
+ import org.apache.cloudstack.api.command.admin.domain.CreateDomainCmd;
+ import org.apache.cloudstack.api.command.admin.domain.DeleteDomainCmd;
+ import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd;
+ import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd;
+ import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;
+ import org.apache.cloudstack.api.command.admin.host.AddHostCmd;
+ import org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd;
+ import org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd;
+ import org.apache.cloudstack.api.command.admin.host.DeleteHostCmd;
+ import org.apache.cloudstack.api.command.admin.host.FindHostsForMigrationCmd;
+ import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
+ import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;
+ import org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd;
+ import org.apache.cloudstack.api.command.admin.host.UpdateHostCmd;
+ import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.ConfigureInternalLoadBalancerElementCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.CreateInternalLoadBalancerElementCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.ListInternalLoadBalancerElementsCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.StartInternalLBVMCmd;
+ import org.apache.cloudstack.api.command.admin.internallb.StopInternalLBVMCmd;
+ import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
+ import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
+ import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;
+ import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
+ import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.network.CreatePhysicalNetworkCmd;
+ import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
+ import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;
+ import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.network.DeleteNetworkServiceProviderCmd;
+ import org.apache.cloudstack.api.command.admin.network.DeletePhysicalNetworkCmd;
+ import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListNetworkIsolationMethodsCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListNetworkServiceProvidersCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListPhysicalNetworksCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.network.ListSupportedNetworkServicesCmd;
+ import org.apache.cloudstack.api.command.admin.network.ReleaseDedicatedGuestVlanRangeCmd;
+ import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.network.UpdateNetworkServiceProviderCmd;
+ import org.apache.cloudstack.api.command.admin.network.UpdatePhysicalNetworkCmd;
+ import org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.pod.CreatePodCmd;
+ import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
+ import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;
+ import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;
+ import org.apache.cloudstack.api.command.admin.region.AddRegionCmd;
+ import org.apache.cloudstack.api.command.admin.region.RemoveRegionCmd;
+ import org.apache.cloudstack.api.command.admin.region.UpdateRegionCmd;
+ import org.apache.cloudstack.api.command.admin.resource.ArchiveAlertsCmd;
+ import org.apache.cloudstack.api.command.admin.resource.DeleteAlertsCmd;
+ import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;
+ import org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd;
+ import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;
+ import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
+ import org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;
+ import org.apache.cloudstack.api.command.admin.router.DestroyRouterCmd;
+ import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
+ import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
+ import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;
+ import org.apache.cloudstack.api.command.admin.router.StartRouterCmd;
+ import org.apache.cloudstack.api.command.admin.router.StopRouterCmd;
+ import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
++import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
+ import org.apache.cloudstack.api.command.admin.storage.AddS3Cmd;
+ import org.apache.cloudstack.api.command.admin.storage.CancelPrimaryStorageMaintenanceCmd;
++import org.apache.cloudstack.api.command.admin.storage.CreateCacheStoreCmd;
+ import org.apache.cloudstack.api.command.admin.storage.CreateStoragePoolCmd;
++import org.apache.cloudstack.api.command.admin.storage.DeleteImageStoreCmd;
+ import org.apache.cloudstack.api.command.admin.storage.DeletePoolCmd;
+ import org.apache.cloudstack.api.command.admin.storage.FindStoragePoolsForMigrationCmd;
++import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
+ import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd;
+ import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
+ import org.apache.cloudstack.api.command.admin.storage.ListStorageProvidersCmd;
+ import org.apache.cloudstack.api.command.admin.storage.PreparePrimaryStorageForMaintenanceCmd;
+ import org.apache.cloudstack.api.command.admin.storage.UpdateStoragePoolCmd;
+ import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;
+ import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.DestroySystemVmCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.MigrateSystemVMCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.StartSystemVMCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;
+ import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;
+ import org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd;
+ import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd;
+ import org.apache.cloudstack.api.command.admin.usage.AddTrafficTypeCmd;
+ import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd;
+ import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficTypeCmd;
+ import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd;
+ import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd;
+ import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd;
+ import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
+ import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypesCmd;
+ import org.apache.cloudstack.api.command.admin.usage.ListUsageTypesCmd;
+ import org.apache.cloudstack.api.command.admin.usage.UpdateTrafficTypeCmd;
+ import org.apache.cloudstack.api.command.admin.user.CreateUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.DisableUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.EnableUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.GetUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
+ import org.apache.cloudstack.api.command.admin.user.LockUserCmd;
+ import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+ import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
+ import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;
+ import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
+ import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
+ import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
+ import org.apache.cloudstack.api.command.admin.vm.MigrateVirtualMachineWithVolumeCmd;
+ import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
+ import org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd;
+ import org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.vpc.DeletePrivateGatewayCmd;
+ import org.apache.cloudstack.api.command.admin.vpc.DeleteVPCOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
+ import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
+ import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
+ import org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;
+ import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
+ import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
+ import org.apache.cloudstack.api.command.user.account.DeleteAccountFromProjectCmd;
+ import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
+ import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;
+ import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
+ import org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd;
+ import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
+ import org.apache.cloudstack.api.command.user.affinitygroup.CreateAffinityGroupCmd;
+ import org.apache.cloudstack.api.command.user.affinitygroup.DeleteAffinityGroupCmd;
+ import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupTypesCmd;
+ import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupsCmd;
+ import org.apache.cloudstack.api.command.user.affinitygroup.UpdateVMAffinityGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScalePolicyCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmProfileCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.DeleteConditionCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.DisableAutoScaleVmGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.EnableAutoScaleVmGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
+ import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
+ import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;
+ import org.apache.cloudstack.api.command.user.event.ArchiveEventsCmd;
+ import org.apache.cloudstack.api.command.user.event.DeleteEventsCmd;
+ import org.apache.cloudstack.api.command.user.event.ListEventTypesCmd;
+ import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
+ import org.apache.cloudstack.api.command.user.firewall.CreateEgressFirewallRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.CreateFirewallRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.CreatePortForwardingRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.DeleteEgressFirewallRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.DeleteFirewallRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd;
+ import org.apache.cloudstack.api.command.user.firewall.ListEgressFirewallRulesCmd;
+ import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
+ import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
+ import org.apache.cloudstack.api.command.user.firewall.UpdatePortForwardingRuleCmd;
+ import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
+ import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;
+ import org.apache.cloudstack.api.command.user.iso.AttachIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.CopyIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.DetachIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.ListIsoPermissionsCmd;
+ import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
+ import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
+ import org.apache.cloudstack.api.command.user.iso.UpdateIsoPermissionsCmd;
+ import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd;
+ import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.AssignToLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.CreateApplicationLoadBalancerCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.DeleteApplicationLoadBalancerCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.DeleteLBHealthCheckPolicyCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.DeleteLBStickinessPolicyCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.DeleteLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.ListApplicationLoadBalancersCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.ListLBHealthCheckPoliciesCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.ListLBStickinessPoliciesCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleInstancesCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRulesCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.RemoveFromLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.nat.CreateIpForwardingRuleCmd;
+ import org.apache.cloudstack.api.command.user.nat.DeleteIpForwardingRuleCmd;
+ import org.apache.cloudstack.api.command.user.nat.DisableStaticNatCmd;
+ import org.apache.cloudstack.api.command.user.nat.EnableStaticNatCmd;
+ import org.apache.cloudstack.api.command.user.nat.ListIpForwardingRulesCmd;
  import org.apache.cloudstack.api.command.user.network.*;
- import org.apache.cloudstack.api.command.user.project.*;
- import org.apache.cloudstack.api.command.user.resource.*;
- import org.apache.cloudstack.api.command.user.securitygroup.*;
- import org.apache.cloudstack.api.command.user.snapshot.*;
- import org.apache.cloudstack.api.command.user.template.*;
- import org.apache.cloudstack.api.command.user.vm.*;
+ 
+ import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;
+ import org.apache.cloudstack.api.command.user.network.CreateNetworkACLListCmd;
+ import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
+ import org.apache.cloudstack.api.command.user.network.DeleteNetworkACLCmd;
+ import org.apache.cloudstack.api.command.user.network.DeleteNetworkACLListCmd;
+ import org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd;
+ import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd;
+ import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
+ import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
+ import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
+ import org.apache.cloudstack.api.command.user.network.ReplaceNetworkACLListCmd;
+ import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
+ import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd;
+ import org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;
+ import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
+ import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
+ import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;
+ import org.apache.cloudstack.api.command.user.project.CreateProjectCmd;
+ import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;
+ import org.apache.cloudstack.api.command.user.project.DeleteProjectInvitationCmd;
+ import org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;
+ import org.apache.cloudstack.api.command.user.project.ListProjectsCmd;
+ import org.apache.cloudstack.api.command.user.project.SuspendProjectCmd;
+ import org.apache.cloudstack.api.command.user.project.UpdateProjectCmd;
+ import org.apache.cloudstack.api.command.user.project.UpdateProjectInvitationCmd;
+ import org.apache.cloudstack.api.command.user.region.ListRegionsCmd;
+ import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.region.ha.gslb.ListGlobalLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.region.ha.gslb.RemoveFromGlobalLoadBalancerRuleCmd;
+ import org.apache.cloudstack.api.command.user.resource.GetCloudIdentifierCmd;
+ import org.apache.cloudstack.api.command.user.resource.ListHypervisorsCmd;
+ import org.apache.cloudstack.api.command.user.resource.ListResourceLimitsCmd;
+ import org.apache.cloudstack.api.command.user.resource.UpdateResourceCountCmd;
+ import org.apache.cloudstack.api.command.user.resource.UpdateResourceLimitCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
+ import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
+ import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
+ import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
+ import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
+ import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
+ import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
+ import org.apache.cloudstack.api.command.user.tag.CreateTagsCmd;
+ import org.apache.cloudstack.api.command.user.tag.DeleteTagsCmd;
+ import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
+ import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd;
+ import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
+ import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
+ import org.apache.cloudstack.api.command.user.template.UpdateTemplatePermissionsCmd;
+ import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd;
+ import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;
+ import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
+ import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
+ import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.RemoveIpFromVmNicCmd;
+ import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
+ import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd;
+ import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
+ import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
+ import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
+ import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
+ import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
+ import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;
+ import org.apache.cloudstack.api.command.user.vmsnapshot.CreateVMSnapshotCmd;
+ import org.apache.cloudstack.api.command.user.vmsnapshot.DeleteVMSnapshotCmd;
+ import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd;
+ import org.apache.cloudstack.api.command.user.vmsnapshot.RevertToVMSnapshotCmd;
  import org.apache.cloudstack.api.command.user.volume.*;
- import org.apache.cloudstack.api.command.user.vpc.*;
- import org.apache.cloudstack.api.command.user.vpn.*;
 -import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.DeleteVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
 -import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
 -import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
+ import org.apache.cloudstack.api.command.user.vpc.CreateStaticRouteCmd;
+ import org.apache.cloudstack.api.command.user.vpc.CreateVPCCmd;
+ import org.apache.cloudstack.api.command.user.vpc.DeleteStaticRouteCmd;
+ import org.apache.cloudstack.api.command.user.vpc.DeleteVPCCmd;
+ import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
+ import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;
+ import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
+ import org.apache.cloudstack.api.command.user.vpc.ListVPCsCmd;
+ import org.apache.cloudstack.api.command.user.vpc.RestartVPCCmd;
+ import org.apache.cloudstack.api.command.user.vpc.UpdateVPCCmd;
+ import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
+ import org.apache.cloudstack.api.command.user.vpn.CreateRemoteAccessVpnCmd;
+ import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd;
+ import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd;
+ import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd;
+ import org.apache.cloudstack.api.command.user.vpn.DeleteRemoteAccessVpnCmd;
+ import org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd;
+ import org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd;
+ import org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ListVpnCustomerGatewaysCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ListVpnUsersCmd;
+ import org.apache.cloudstack.api.command.user.vpn.RemoveVpnUserCmd;
+ import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd;
+ import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd;
+ import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
  import org.apache.cloudstack.api.response.ExtractResponse;
+ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+ import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
+ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
  import org.apache.commons.codec.binary.Base64;
  import org.apache.log4j.Logger;
- import org.apache.cloudstack.affinity.AffinityGroupProcessor;
- import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
  
- import org.apache.cloudstack.api.command.user.affinitygroup.CreateAffinityGroupCmd;
- import org.apache.cloudstack.api.command.user.affinitygroup.DeleteAffinityGroupCmd;
- import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupTypesCmd;
- import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupsCmd;
- import org.apache.cloudstack.api.command.user.affinitygroup.UpdateVMAffinityGroupCmd;
  import com.cloud.agent.AgentManager;
  import com.cloud.agent.api.GetVncPortAnswer;
  import com.cloud.agent.api.GetVncPortCommand;
@@@ -183,87 -569,27 +564,102 @@@ import com.cloud.utils.exception.CloudR
  import com.cloud.utils.net.MacAddress;
  import com.cloud.utils.net.NetUtils;
  import com.cloud.utils.ssh.SSHKeysHelper;
- import com.cloud.vm.*;
+ import com.cloud.vm.ConsoleProxyVO;
+ import com.cloud.vm.DiskProfile;
+ import com.cloud.vm.InstanceGroupVO;
+ import com.cloud.vm.SecondaryStorageVmVO;
+ import com.cloud.vm.UserVmVO;
+ import com.cloud.vm.VMInstanceVO;
+ import com.cloud.vm.VirtualMachine;
  import com.cloud.vm.VirtualMachine.State;
- import com.cloud.vm.dao.*;
+ import com.cloud.vm.VirtualMachineManager;
+ import com.cloud.vm.VirtualMachineProfile;
+ import com.cloud.vm.VirtualMachineProfileImpl;
+ import com.cloud.vm.dao.ConsoleProxyDao;
+ import com.cloud.vm.dao.DomainRouterDao;
+ import com.cloud.vm.dao.InstanceGroupDao;
+ import com.cloud.vm.dao.SecondaryStorageVmDao;
+ import com.cloud.vm.dao.UserVmDao;
+ import com.cloud.vm.dao.VMInstanceDao;
+ 
  import edu.emory.mathcs.backport.java.util.Arrays;
  import edu.emory.mathcs.backport.java.util.Collections;
 -
 +import org.apache.cloudstack.acl.ControlledEntity;
 +import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
 +import org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd;
 +import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 +import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
 +import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
 +import org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;
 +import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
 +import org.apache.cloudstack.api.command.admin.config.ListHypervisorCapabilitiesCmd;
 +import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
 +import org.apache.cloudstack.api.command.admin.config.UpdateHypervisorCapabilitiesCmd;
 +import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
 +import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
 +import org.apache.cloudstack.api.command.admin.pod.CreatePodCmd;
 +import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
 +import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;
 +import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;
 +import org.apache.cloudstack.api.command.admin.region.AddRegionCmd;
 +import org.apache.cloudstack.api.command.admin.region.RemoveRegionCmd;
 +import org.apache.cloudstack.api.command.admin.region.UpdateRegionCmd;
 +import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;
 +import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;
 +import org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd;
 +import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
 +import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
 +import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;
 +import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
 +import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
 +import org.apache.cloudstack.api.command.admin.vm.MigrateVirtualMachineWithVolumeCmd;
 +import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
 +import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
 +import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
 +import org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;
 +import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
 +import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
 +import org.apache.cloudstack.api.command.user.account.DeleteAccountFromProjectCmd;
 +import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
 +import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;
 +import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
 +import org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd;
 +import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
 +import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;
 +import org.apache.cloudstack.api.command.user.event.ArchiveEventsCmd;
 +import org.apache.cloudstack.api.command.user.event.DeleteEventsCmd;
 +import org.apache.cloudstack.api.command.user.event.ListEventTypesCmd;
 +import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
 +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;
 +import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd;
 +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
 +import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
 +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 +import org.apache.cloudstack.api.command.user.region.ListRegionsCmd;
 +import org.apache.cloudstack.api.command.user.region.ha.gslb.*;
 +import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
 +import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
 +import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
 +import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
 +import org.apache.cloudstack.api.command.user.tag.CreateTagsCmd;
 +import org.apache.cloudstack.api.command.user.tag.DeleteTagsCmd;
 +import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 +import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
 +import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
 +import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
 +import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;
 +import org.apache.cloudstack.api.command.user.vmsnapshot.CreateVMSnapshotCmd;
 +import org.apache.cloudstack.api.command.user.vmsnapshot.DeleteVMSnapshotCmd;
 +import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd;
 +import org.apache.cloudstack.api.command.user.vmsnapshot.RevertToVMSnapshotCmd;
 +import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
 +import org.apache.cloudstack.api.response.ExtractResponse;
 +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 +import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
  
  public class ManagementServerImpl extends ManagerBase implements ManagementServer {
      public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName());
@@@ -2392,16 -2872,31 +2790,36 @@@
          cmdList.add(AssignToGlobalLoadBalancerRuleCmd.class);
          cmdList.add(RemoveFromGlobalLoadBalancerRuleCmd.class);
          cmdList.add(ListStorageProvidersCmd.class);
 +        cmdList.add(AddImageStoreCmd.class);
 +        cmdList.add(ListImageStoresCmd.class);
 +        cmdList.add(DeleteImageStoreCmd.class);
 +        cmdList.add(CreateCacheStoreCmd.class);
+         cmdList.add(CreateApplicationLoadBalancerCmd.class);
+         cmdList.add(ListApplicationLoadBalancersCmd.class);
+         cmdList.add(DeleteApplicationLoadBalancerCmd.class);
+         cmdList.add(ConfigureInternalLoadBalancerElementCmd.class);
+         cmdList.add(CreateInternalLoadBalancerElementCmd.class);
+         cmdList.add(ListInternalLoadBalancerElementsCmd.class);
          cmdList.add(CreateAffinityGroupCmd.class);
          cmdList.add(DeleteAffinityGroupCmd.class);
          cmdList.add(ListAffinityGroupsCmd.class);
          cmdList.add(UpdateVMAffinityGroupCmd.class);
          cmdList.add(ListAffinityGroupTypesCmd.class);
 +        cmdList.add(ListNetworkIsolationMethodsCmd.class);
+ 
+         cmdList.add(AddResourceDetailCmd.class);
+         cmdList.add(RemoveResourceDetailCmd.class);
+         cmdList.add(ListResourceDetailsCmd.class);
+         cmdList.add(StopInternalLBVMCmd.class);
+         cmdList.add(StartInternalLBVMCmd.class);
+         cmdList.add(ListInternalLBVMsCmd.class);
+         cmdList.add(ListNetworkIsolationMethodsCmd.class);
+         cmdList.add(ListNetworkIsolationMethodsCmd.class);
+         cmdList.add(CreateNetworkACLListCmd.class);
+         cmdList.add(DeleteNetworkACLListCmd.class);
+         cmdList.add(ListNetworkACLListsCmd.class);
+         cmdList.add(ReplaceNetworkACLListCmd.class);
+         cmdList.add(UpdateNetworkACLItemCmd.class);
          return cmdList;
      }
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/storage/VolumeManagerImpl.java
index 9799d85,2f4b2c8..2aa4192
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@@ -36,16 -36,10 +36,18 @@@ import java.util.concurrent.ExecutionEx
  import javax.inject.Inject;
  import javax.naming.ConfigurationException;
  
 -import com.cloud.storage.dao.*;
 +import org.apache.log4j.Logger;
 +import org.springframework.stereotype.Component;
 +
  import org.apache.cloudstack.api.BaseCmd;
 -import org.apache.cloudstack.engine.subsystem.api.storage.CommandResult;
 +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
 +import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
 +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
 +import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
 +import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
 +import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
++import com.cloud.storage.dao.*;
+ import org.apache.cloudstack.api.command.user.volume.*;
  import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
  import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
  import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index b0ac31f,9e1a871..3b259d8
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -1372,6 -1539,67 +1768,70 @@@ CREATE TABLE `cloud`.`account_vnet_map
  
  ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD COLUMN account_vnet_map_id bigint unsigned;
  ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT `fk_op_dc_vnet_alloc__account_vnet_map_id` FOREIGN KEY `fk_op_dc_vnet_alloc__account_vnet_map_id` (`account_vnet_map_id`) REFERENCES `account_vnet_map` (`id`);
 +            
 + update  `cloud`.`vm_template` set state='Allocated' where state is NULL;
 + update  `cloud`.`vm_template` set update_count=0 where update_count is NULL;
+ 
+ CREATE TABLE `cloud`.`network_acl` (
+   `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+   `name` varchar(255) NOT NULL COMMENT 'name of the network acl',
+   `uuid` varchar(40),
+   `vpc_id` bigint unsigned COMMENT 'vpc this network acl belongs to',
+   `description` varchar(1024),
+   PRIMARY KEY  (`id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE `cloud`.`network_acl_item` (
+   `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+   `uuid` varchar(40),
+   `acl_id` bigint unsigned NOT NULL COMMENT 'network acl id',
+   `start_port` int(10) COMMENT 'starting port of a port range',
+   `end_port` int(10) COMMENT 'end port of a port range',
+   `state` char(32) NOT NULL COMMENT 'current state of this rule',
+   `protocol` char(16) NOT NULL default 'TCP' COMMENT 'protocol to open these ports for',
+   `created` datetime COMMENT 'Date created',
+   `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all codes for the given ICMP type.',
+   `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all types.',
+   `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
+   `cidr` varchar(255) COMMENT 'comma seperated cidr list',
+   `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
+   `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
+   PRIMARY KEY  (`id`),
+   UNIQUE KEY (`acl_id`, `number`),
+   CONSTRAINT `fk_network_acl_item__acl_id` FOREIGN KEY(`acl_id`) REFERENCES `network_acl`(`id`) ON DELETE CASCADE,
+   CONSTRAINT `uc_network_acl_item__uuid` UNIQUE (`uuid`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ 
+ ALTER TABLE `cloud`.`networks` add column `network_acl_id` bigint unsigned COMMENT 'network acl id';
+ 
+ -- Add Default ACL deny_all
+ INSERT INTO `cloud`.`network_acl` (id, uuid, vpc_id, description, name) values (1, UUID(), 0, "Default Network ACL Deny All", "default_deny");
+ INSERT INTO `cloud`.`network_acl_item` (id, uuid, acl_id, state, protocol, created, traffic_type, cidr, number, action) values (1, UUID(), 1, "Active", "all", now(), "Ingress", "0.0.0.0/0", 1, "Deny");
+ INSERT INTO `cloud`.`network_acl_item` (id, uuid, acl_id, state, protocol, created, traffic_type, cidr, number, action) values (2, UUID(), 1, "Active", "all", now(), "Egress", "0.0.0.0/0", 2, "Deny");
+ 
+ -- Add Default ACL allow_all
+ INSERT INTO `cloud`.`network_acl` (id, uuid, vpc_id, description, name) values (2, UUID(), 0, "Default Network ACL Allow All", "default_allow");
+ INSERT INTO `cloud`.`network_acl_item` (id, uuid, acl_id, state, protocol, created, traffic_type, cidr, number, action) values (3, UUID(), 2, "Active", "all", now(), "Ingress", "0.0.0.0/0", 1, "Allow");
+ INSERT INTO `cloud`.`network_acl_item` (id, uuid, acl_id, state, protocol, created, traffic_type, cidr, number, action) values (4, UUID(), 2, "Active", "all", now(), "Egress", "0.0.0.0/0", 2, "Allow");
+ 
+ CREATE  TABLE `cloud`.`nic_ip_alias` (
+   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT ,
+   `uuid`  VARCHAR(40) NOT NULL ,
+   `nic_id` BIGINT(20) UNSIGNED NULL ,
+   `ip4_address` CHAR(40) NULL ,
+   `ip6_address` CHAR(40) NULL ,
+   `netmask` CHAR(40) NULL ,
+   `gateway` CHAR(40) NULL ,
+   `start_ip_of_subnet` CHAR(40),
+   `network_id` BIGINT(20) UNSIGNED NULL ,
+   `vmId` BIGINT(20) UNSIGNED NULL   ,
+   `alias_count` BIGINT(20) UNSIGNED NULL ,
+   `created` DATETIME NOT NULL ,
+   `account_id` BIGINT(20) UNSIGNED NOT NULL ,
+   `domain_id` BIGINT(20) UNSIGNED NOT NULL ,
+   `state`  char(32)  NOT NULL,
+   PRIMARY KEY (`id`) ,
+   UNIQUE INDEX `id_UNIQUE` (`id` ASC) );
+ 
+ alter table `cloud`.`vpc_gateways` add column network_acl_id bigint unsigned default 1 NOT NULL;
+ update `cloud`.`vpc_gateways` set network_acl_id = 2;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --cc tools/apidoc/gen_toc.py
index f60c18e,8b6460e..4768556
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@@ -140,10 -141,7 +141,11 @@@ known_categories = 
      'removeIpFromNic': 'Nic',
      'listNics':'Nic',
  	'AffinityGroup': 'Affinity Group',
 +    'addImageStore': 'Image Store',
 +    'listImageStore': 'Image Store',
 +    'deleteImageStore': 'Image Store',
 +    'createCacheStore': 'Image Store',
+     'InternalLoadBalancer': 'Internal LB',
      }
  
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/ui/scripts/system.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0c3d280/ui/scripts/zoneWizard.js
----------------------------------------------------------------------