Merge branch 'master' into component-tests-sanity

Author: borisstoyanov

.travis.yml

@@ -32,7 +32,8 @@ env:
   global:
      - PATH=$HOME/.local/bin:$PATH
   matrix:
-    - TESTS="smoke/test_affinity_groups
+    - TESTS="smoke/test_accounts
+             smoke/test_affinity_groups
              smoke/test_affinity_groups_projects
              smoke/test_certauthority_root
              smoke/test_deploy_vgpu_enabled_vm
@@ -47,6 +48,8 @@ env:
 
     - TESTS="smoke/test_hostha_kvm
              smoke/test_hostha_simulator
+             smoke/test_host_annotations
+             smoke/test_host_maintenance
              smoke/test_hosts
              smoke/test_internal_lb
              smoke/test_iso
@@ -66,12 +69,14 @@ env:
              smoke/test_over_provisioning
              smoke/test_password_server
              smoke/test_portable_publicip
-             smoke/test_primary_storage
+             smoke/test_portforwardingrules"
+
+    - TESTS="smoke/test_primary_storage
              smoke/test_privategw_acl
+             smoke/test_projects
              smoke/test_public_ip_range
-             smoke/test_pvlan"
-
-    - TESTS="smoke/test_regions
+             smoke/test_pvlan
+             smoke/test_regions
              smoke/test_reset_vm_on_reboot
              smoke/test_resource_detail
              smoke/test_router_dhcphosts
@@ -86,6 +91,7 @@ env:
              smoke/test_ssvm
              smoke/test_staticroles
              smoke/test_templates
+             smoke/test_usage
              smoke/test_usage_events
              smoke/test_vm_life_cycle
              smoke/test_vm_snapshots
@@ -99,7 +105,6 @@ env:
              smoke/misc/test_vm_sync"
 
     - TESTS="component/find_hosts_for_migration
-             component/test_accounts
              component/test_acl_isolatednetwork_delete
              component/test_acl_listsnapshot
              component/test_acl_listvm
@@ -108,6 +113,11 @@ env:
              component/test_affinity_groups_projects
              component/test_allocation_states
              component/test_cpu_limits"
+             component/test_affinity_groups_projects"
+
+    - TESTS="component/test_acl_sharednetwork_deployVM-impersonation
+             component/test_cpu_domain_limits
+             component/test_volumes"
 
     - TESTS="component/test_acl_sharednetwork_deployVM-impersonation
              component/test_affinity_groups_projects
@@ -116,6 +126,7 @@ env:
     - TESTS="component/test_cpu_domain_limits"
 
     - TESTS="component/test_cpu_max_limits
+             component/test_acl_isolatednetwork
              component/test_cpu_project_limits
              component/test_deploy_vm_userdata_multi_nic
              component/test_egress_fw_rules
@@ -132,10 +143,10 @@ env:
              component/test_non_contiguous_vlan
              component/test_persistent_networks"
 
-    - TESTS="component/test_projects
+    - TESTS="component/test_project_limits
              component/test_project_configs
              component/test_project_usage
-             component/test_regions
+             component/test_project_resources
              component/test_regions_accounts
              component/test_routers
              component/test_snapshots"
@@ -144,14 +155,15 @@ env:
 
     - TESTS="component/test_project_limits
              component/test_resource_limits"
+             component/test_stopped_vm"
+
 
-    - TESTS="component/test_stopped_vm
+    - TESTS="component/test_resource_limits
              component/test_tags
              component/test_templates
-             component/test_update_vm
-             component/test_usage"
+             component/test_update_vm"
 
-    - TESTS="component/test_volumes
+    - TESTS="component/test_vpc
              component/test_vpc_network
              component/test_vpc_offerings
              component/test_vpn_users"

agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java

@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.ejb.Local;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 
@@ -37,7 +35,6 @@
  * @config {@table || Param Name | Description | Values | Default || || path |
  *         path to the properties _file | String | db/db.properties || * }
  **/
-@Local(value = {StorageComponent.class})
 public class PropertiesStorage implements StorageComponent {
     private static final Logger s_logger = Logger.getLogger(PropertiesStorage.class);
     Properties _properties = new Properties();

agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java

@@ -24,15 +24,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.net.NetUtils;
 
-@Local(value = {DhcpSnooper.class})
 public class FakeDhcpSnooper implements DhcpSnooper {
     private static final Logger s_logger = Logger.getLogger(FakeDhcpSnooper.class);
     private Queue<String> _ipAddresses = new ConcurrentLinkedQueue<String>();

agent/src/com/cloud/agent/resource/DummyResource.java

@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import javax.ejb.Local;
-
 import com.cloud.agent.IAgentControl;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckNetworkAnswer;
@@ -43,7 +41,6 @@
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.StringUtils;
 
-@Local(value = {ServerResource.class})
 public class DummyResource implements ServerResource {
     String _name;
     Host.Type _type;

api/src/com/cloud/configuration/ConfigurationService.java

@@ -19,7 +19,9 @@
 import java.util.List;
 
 import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
+import org.apache.cloudstack.api.command.admin.network.CreateManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
@@ -160,6 +162,19 @@ public interface ConfigurationService {
      */
     Pod createPod(long zoneId, String name, String startIp, String endIp, String gateway, String netmask, String allocationState);
 
+    /**
+     * Creates a mutual exclusive IP range in the pod with same gateway, netmask.
+     * @param cmd - The command specifying pod ID, start IP, end IP, gateway, netmask.
+     * @return The new range if successful, null otherwise.
+     */
+    Pod createPodIpRange(CreateManagementNetworkIpRangeCmd cmd);
+
+    /**
+     * Deletes a mutually exclusive IP range in the pod.
+     * @param cmd - The command specifying pod ID, start IP, end IP.
+     */
+    void deletePodIpRange(DeleteManagementNetworkIpRangeCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException;
+
     /**
      * Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system.
      *

api/src/com/cloud/dc/StorageNetworkIpRange.java

@@ -21,20 +21,19 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 public interface StorageNetworkIpRange extends InfrastructureEntity, InternalIdentity, Identity {
-
     Integer getVlan();
 
-    String getPodUuid();
+    String getGateway();
+
+    String getNetmask();
 
     String getStartIp();
 
     String getEndIp();
 
-    String getNetworkUuid();
-
     String getZoneUuid();
 
-    String getNetmask();
+    String getPodUuid();
 
-    String getGateway();
+    String getNetworkUuid();
 }

api/src/com/cloud/event/EventTypes.java

@@ -296,6 +296,9 @@ public class EventTypes {
     public static final String EVENT_VLAN_IP_RANGE_DEDICATE = "VLAN.IP.RANGE.DEDICATE";
     public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE";
 
+    public static final String EVENT_MANAGEMENT_IP_RANGE_CREATE = "MANAGEMENT.IP.RANGE.CREATE";
+    public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
+
     public static final String EVENT_STORAGE_IP_RANGE_CREATE = "STORAGE.IP.RANGE.CREATE";
     public static final String EVENT_STORAGE_IP_RANGE_DELETE = "STORAGE.IP.RANGE.DELETE";
     public static final String EVENT_STORAGE_IP_RANGE_UPDATE = "STORAGE.IP.RANGE.UPDATE";
@@ -761,6 +764,9 @@ public class EventTypes {
         entityEventDetails.put(EVENT_VLAN_IP_RANGE_DEDICATE, Vlan.class);
         entityEventDetails.put(EVENT_VLAN_IP_RANGE_RELEASE, Vlan.class);
 
+        entityEventDetails.put(EVENT_MANAGEMENT_IP_RANGE_CREATE, Pod.class);
+        entityEventDetails.put(EVENT_MANAGEMENT_IP_RANGE_DELETE, Pod.class);
+
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_CREATE, StorageNetworkIpRange.class);
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_DELETE, StorageNetworkIpRange.class);
         entityEventDetails.put(EVENT_STORAGE_IP_RANGE_UPDATE, StorageNetworkIpRange.class);

api/src/com/cloud/network/Network.java

@@ -47,7 +47,7 @@ public static class Service {
         private static List<Service> supportedServices = new ArrayList<Service>();
 
         public static final Service Vpn = new Service("Vpn", Capability.SupportedVpnProtocols, Capability.VpnTypes);
-        public static final Service Dhcp = new Service("Dhcp");
+        public static final Service Dhcp = new Service("Dhcp", Capability.ExtraDhcpOptions);
         public static final Service Dns = new Service("Dns", Capability.AllowDnsSuffixModification);
         public static final Service Gateway = new Service("Gateway");
         public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols, Capability.MultipleIps, Capability.TrafficStatistics,
@@ -218,6 +218,7 @@ public static class Capability {
         public static final Capability RegionLevelVpc = new Capability("RegionLevelVpc");
         public static final Capability NoVlan = new Capability("NoVlan");
         public static final Capability PublicAccess = new Capability("PublicAccess");
+        public static final Capability ExtraDhcpOptions = new Capability("ExtraDhcpOptions");
 
         private final String name;
 

api/src/com/cloud/network/element/DhcpServiceProvider.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.network.element;
 
+import java.util.Map;
+
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -33,4 +35,6 @@ boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachi
         throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException;
 
     boolean removeDhcpSupportForSubnet(Network network) throws ResourceUnavailableException;
+
+    boolean setExtraDhcpOptions(Network network, long nicId, Map<Integer, String> dhcpOptions);
 }

api/src/com/cloud/network/vpc/VpcOffering.java

@@ -52,7 +52,7 @@ public enum State {
     boolean isDefault();
 
     /**
-     * @return service offering id used by VPC virutal router
+     * @return service offering id used by VPC virtual router
      */
     Long getServiceOfferingId();