Commit Graph

6851 Commits

Author SHA1 Message Date
Mice Xia 94254e3c2b fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user 2013-06-26 15:55:32 +08:00
Likitha Shetty 8a1fefc7aa CLOUDSTACK-3192. When a dedicated public ip range is released, don't generate usage event EVENT_NET_IP_RELEASE
for ips in the range that are in use becauase these ips are not disassociated from the account.
2013-06-26 10:51:39 +05:30
Alena Prokharchyk 1eacd7872e Update resource count for networks only when the network is non system and Isolated. Before we used to update the count only when offering had specifyVlan=false. And in 4.2 even isolated networks can have this attribute set to true, and we have to count them 2013-06-25 13:46:35 -07:00
Hiroaki KAWAI ed5697f3e1 filter out the network providers that does not handle IP address
The elements that deploy IP address are subclass of IpDeployingRequester
CloudRuntimeException will be raised for elements that is not implemeing
the interface at NetworkManagerImpl#applyIpAssociations.
2013-06-25 13:18:06 +09:00
Harikrishna Patnala f7b1d3d8d5 CLOUDSTACK-2916: admin is not able to login through UI after setting GP "cluster.cpu.allocated.capacity.notificationthreshold" to some string
CLOUDSTACK-2457:  No check for input values,special character,-ive values can be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"

Added validation for float values and checking limit for weight based parameters by creating a set of parameters.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-24 20:00:09 +05:30
Kishan Kavala da0006618f CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion 2013-06-24 17:58:29 +05:30
Sateesh Chodapuneedi e9df9c29bd CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is still associated with that zone.
Check if there exists any VMware DC already associated with this zone. Deny zone deletion if true.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-24 12:11:31 +05:30
Kishan Kavala bd5ad442d0 CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule 2013-06-24 17:20:29 +05:30
Kishan Kavala 7c46cc9580 CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL 2013-06-24 16:22:02 +05:30
Jayapal bb50c0d2d6 CLOUDSTACK-3148 failed to create private gw with default acl id 2013-06-24 13:37:01 +05:30
Jayapal c22e7d0052 CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering on SRX firewall 2013-06-24 13:37:01 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Harikrishna Patnala 1eb744fa16 CLOUDSTACK-2181: Scale down is allowed when one resource(say cpu) is being scale up and other resource (say ram) is
being scale down ;but not allowed when both resources are being scaledown
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-06-24 12:09:55 +05:30
Sheng Yang fe32dc7665 Baremetal: Add BaremetalDhcp Server and BaremetalPxe server to avoid list of stats collector 2013-06-21 17:36:21 -07:00
Sheng Yang db97bb8e89 Fix NPE when using baremetal template
Template size is NULL for baremetal, which caused NPE when unboxing
2013-06-21 17:16:33 -07:00
Min Chen 64c5266ec5 CLOUDSTACK-3120: ListTemplates didn't return Baremetal templates after
storage refactor.
2013-06-21 16:10:39 -07:00
Alena Prokharchyk 22232f2baf CLOUDSTACK-2698: always generate new id when create VirtualRouter. Don't try to re-use the id of the VR that failed to deploy and was expunged as a result of this failure 2013-06-21 15:29:00 -07:00
Sheng Yang 041303cc67 Baremetal: Fix typo of BaremetaUserdataProvider
Should be "Baremetal" rather than "Baremeta"
2013-06-21 09:48:25 -07:00
Sheng Yang 2edfa9a7f2 Baremetal: DB upgrade
Conflicts:
	setup/db/db/schema-410to420.sql
2013-06-21 09:47:45 -07:00
Sheng Yang f37b089fce Revert "Removing baremetal related references"
This reverts commit 99ea4011b1.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
2013-06-21 09:46:56 -07:00
Min Chen 2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Edison Su 6b9ea1761a CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage 2013-06-20 17:51:11 -07:00
Min Chen 2fe732b354 CLOUDSTACK-3080: listVirtualMachines tag search refinement no longer
working.
2013-06-20 15:44:01 -07:00
Alena Prokharchyk 2072026340 CLOUDSTACK-3088: fixed listRouters/listInternalLbVms by name 2013-06-20 10:37:59 -07:00
Alena Prokharchyk bf331064a2 CLOUDSTACK-3091: expect UUID instead of actual DB id, when read internallbvm.service.offering global config 2013-06-20 10:37:59 -07:00
Kishan Kavala b422d8ddd9 CLOUDSTACK-2819: Revoke existing ACL items if the new ACL is empty 2013-06-20 17:06:06 +05:30
Jayapal 2e0abccd3b CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id 2013-06-20 16:11:20 +05:30
Kishan Kavala 03d1346dc3 CLOUDSTACK-2915: Create network ACL when adding ACL item to a tier without ACL for backward compatibility 2013-06-20 15:36:58 +05:30
Likitha Shetty 9df45065d0 CLOUDSTACK-3078 2013-06-20 14:34:33 +05:30
Edison Su 733ed3622d fix compile 2013-06-20 00:57:06 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Likitha Shetty 4a260672e0 CLOUDSTACK-3078. Since no default value is set for the isolation type during the physical network creation,
modify guest vlan range dedication to check if the isolation type is VLAN only when an isolation type has been set
2013-06-20 12:09:32 +05:30
Bharat Kumar f9e7094282 Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get the public key from VR incase of multiple subnets per vlan Also removed some unused code and fixed the an error in the dnsmasq config function
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:15:15 +05:30
Edison Su 5f28dcc6bb merge to master 2013-06-19 22:41:13 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Saksham Srivastava e420c3be8c CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order 2013-06-20 10:58:50 +05:30
Abhinandan Prateek febe7d9cff Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a subnet 2013-06-20 10:44:48 +05:30
Bharat Kumar 4d5c6c8381 Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new subnet
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 10:40:23 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Sheng Yang b3fb4851ee Fix regression of return Userdata provider when caller asked for DHCP
It's introduced by:

commit 052c24c4d1
Author: Bharat Kumar <bharat.kumar@citrix.com>
Date:   Mon May 13 17:02:27 2013 +0530

    CLOUDSTACK-702: Multiple ip ranges in different subnets.

This commit get userdata provider when caller asked for dhcp provider, thus
result in trouble e.g.

ERROR [cloud.async.AsyncJobManagerImpl] (Job-Executor-11:job-10) Unexpected
exception while executing
org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd
java.lang.ClassCastException:
com.cloud.baremetal.networkservice.BaremetalUserdataElement_EnhancerByCloudStack_5dee69d2
cannot be cast to com.cloud.network.element.DhcpServiceProvider
        at
com.cloud.network.NetworkManagerImpl.getDhcpServiceProvider(NetworkManagerImpl.java:3309)
...
2013-06-19 17:06:06 -07:00
Alena Prokharchyk 0a4e65126f CLOUDSTACK-3079: Use global var "ping.timeout" as a multiplier to ping.interval before announcing an agent has timed out. The multiplier used to be hardcoded to 3 2013-06-19 15:11:53 -07:00
Edison Su 11b9d5ff64 CLOUDSTACK-1405: add scope type in liststoragepoolcmd 2013-06-19 14:09:49 -07:00
Alena Prokharchyk 928d94265b Added more logging to the place where VR investigates whether the user vm is alive, by executing PingCommand 2013-06-19 10:53:56 -07:00
Jessica Wang d5d0142ed4 CLOUDSTACK-3016: listZones API - take in networktype instead of zonetype parameter to be consistent with networktype property in ZoneResponse. 2013-06-19 10:22:14 -07:00
Alena Prokharchyk d66e9c7b51 CLOUDSTACK-2843: Provideded an ability to turn off the synchronization being done on the CS agent side,
for number of commands participating in Vm deployment process, as parallel deployment is supported on the hypervisor side.
The behavior is controlled by global config varirables:

"execute.in.sequence.hypervisor.commands" (false by default) sets/resets the synchronization for commands:
=========================
StartCommand
StopCommand
CreateCommand
CopyVolumeCommand

"execute.in.sequence.network.element.commands" (false by default) sets/resets the synchronization for commands:
==========================
DhcpEntryCommand
SavePasswordCommand
UserDataCommand
VmDataCommand

As a part of the fix, increased the global lock timeout to 30 mins in several VR scripts:
===========================
edithosts.sh
savepassword.sh
userdata.sh

to support situations when multiple concurrent calls to the script are being made.
2013-06-19 10:12:13 -07:00
Likitha Shetty 1af928570c CLOUDSTACK-3062. Dedication of a guest vlan range that extends 2 ranges dedicated to different accounts removes an old dedication 2013-06-19 16:59:14 +05:30
Jessica Wang 2f2bb6b316 CLOUDSTACK-3016: remove zonetype property from API response (userVM) 2013-06-18 14:55:56 -07:00
Jessica Wang 759eeca651 CLOUDSTACK-3016: remove zonetype property from API response (snapshot, ISO, template, network, volume) 2013-06-18 14:42:38 -07:00
Jessica Wang 0a8343e750 CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM) 2013-06-18 13:54:37 -07:00
Jessica Wang b5abc0862b CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API. 2013-06-18 10:41:37 -07:00
Wei Zhou 0dd45513e3 CLOUDSTACK-2885: show cpuNumber and cpuSpeed on VM Statistics page 2013-06-18 17:00:44 +02:00
Wei Zhou 9d7c7c14c7 CLOUDSTACK-1866: create iptables rules for network usage in finalizeSshAndVersionAndNetworkUsageOnStart only for non-Vpc network 2013-06-18 12:56:19 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Prachi Damle fb31a39efe CLOUDSTACK-2900: Ubuntu 13.04 - Migrate Virtual Router fail - Unable to find the VM by id=
Changes:
- Have to search the vm_instance table to find the instance
2013-06-17 16:59:32 -07:00
Jessica Wang 3e852cc29b CLOUDSTACK-3016: remove zonetype parameter from listNetworks API. 2013-06-17 16:26:09 -07:00
Alena Prokharchyk 5d0a1cee13 CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already) 2013-06-17 16:13:19 -07:00
Jessica Wang 880029844b CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API. 2013-06-17 16:08:38 -07:00
Jessica Wang cb35ec6f4d CLOUDSTACK-3016: remove zonetype parameter from listSystemVMs API. 2013-06-17 15:58:33 -07:00
Min Chen 4c26dd6ae5 CLOUDSTACK-2956:createStoragePools API should ignore passed clusterId
and podId parameters in creating zone scoped primary storage
2013-06-17 15:57:52 -07:00
Jessica Wang 56d390d54e CLOUDSTACK-3016: remove zonetype parameter from listPods API. 2013-06-17 15:51:07 -07:00
Jessica Wang 9d0d02222b CLOUDSTACK-3016: remove zonetype parameter from listClusters API. 2013-06-17 15:28:39 -07:00
Jessica Wang 9e7356c686 CLOUDSTACK-3016: remove zonetype parameter from listSnapshots API. 2013-06-17 15:00:44 -07:00
Min Chen 1df4cf839e CLOUDSTACK-3028: Object_Store_Refactor - S3 reduced redundancy storage
should be an option.
2013-06-17 11:49:33 -07:00
Laszlo Hornyak 202cd15290 NPE fix
- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:19:43 +01:00
Laszlo Hornyak c88d8fb3a2 use commons-lang StringUtils
commons-lang is already a transitive dependency of the utils project, which allows removing some duplicated functionality.
This patch replaces StringUtils.join(String, Object...) with it's commons-lang counterpart.
It also replaces calls to String join(Iterable<? extends Object>, String) in cases where an array is already exist and it is only wrapped into a List.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:17:22 +01:00
Alena Prokharchyk 952fa2464d LOUDSTACK-2914: handle situation when serviceProvider map is empty 2013-06-17 10:55:33 -07:00
Alena Prokharchyk fc16e29f99 CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is not specified explicitly 2013-06-17 10:10:43 -07:00
Hugo Trippaers b0ea02e65a Allow DSA public keys.
DSA can't be used for encryption with the bouncycastle library, so make
sure this situation is properly handled.
2013-06-17 10:04:59 -07:00
Likitha Shetty 770cf02ccf Global config to disable an account from acquiring public ips and guest vlans from the system if the account
has dedicated resources and the dedicated resources have all been consumed - use.system.public.ips and use.system.guest.vlans
Both configs are configurable at the account level too.
2013-06-17 17:54:36 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Edison Su c2da4eac89 fix NPE for cache ref cnt 2013-06-14 17:24:31 -07:00
Jessica Wang 8925d39b78 CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. 2013-06-14 16:51:20 -07:00
Jessica Wang b4a692d80f CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. 2013-06-14 16:39:04 -07:00
Jessica Wang ea0de9eaf4 CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. 2013-06-14 16:33:27 -07:00
Jessica Wang cb37d4cb63 CLOUDSTACK-3016: remove zonetype parameter from listHosts API. 2013-06-14 16:14:45 -07:00
Edison Su a715eb8121 clean up storage related code, and add lru replacement algorithm for cache storage 2013-06-14 15:55:59 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Mice Xia 7663684981 fix CLOUDSTACK-2989 normal user are allowed to create isolated network offerings with vlan assignments
1) only root admin can list network offering with specifyVlan=true
2) only root admin can create network with specifyVlan=true
2013-06-14 14:58:24 +08:00
Mice Xia 5e56e43e31 fix CLOUDSTACK-2930, exception while applying ACL rule with protocol as ALL.
1) change UI, disable startport and endport when protocol=All
2) validate parameters for API createNetworkACL
2013-06-14 13:19:07 +08:00
Sheng Yang 5a8a2a259e CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM
Otherwise when MASTER failed, the user VM would get password reset again after
reboot.

But this fix still have issues if MASTER is failure before VM boot up, but in
that case, password of user VM won't change and user would request password
change again, then it would be fine.
2013-06-13 16:05:15 -07:00
Sheng Yang fbe6b273e3 CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic 2013-06-13 16:05:15 -07:00
Harikrishna Patnala b83b8eb838 CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
During Scale up of VM, memory/cpu calculations should consider the memory/cpu overprovisioning factors which are set per cluster.

CLOUDSTACK-2939:  CPU limit is not getting set for vm after scaleup to a service offering which have cpu cap enabled

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 16:30:56 +05:30
Jayapal b72c79b370 CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 14:37:34 +05:30
Vijayendra Bhamidipati ff0a524bd6 CLOUDSTACK-2969: Exception when creating vlan ip range
Description:

	Putting in null pointer check when creating ip range.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-13 11:07:12 +05:30
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Nitin Mehta 2aafc39f3d CLOUDSTACK-2957
deployVm API size attribute should be capped by the storage.max.volume.size as it is in createVolume.
2013-06-12 17:01:41 +05:30
Bharat Kumar ca13586331 Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask for gateway and netmask
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 16:27:56 +05:30
Wei Zhou 51a3a5a9b5 CLOUDSTACK-2945: ignore collect disk statistics if vm is not running on KVM or XenServer 2013-06-12 11:57:17 +02:00
Nitin Mehta 83fcba9ee6 CLOUDSTACK-2946
CS-15158: Correcting the allocated size for local storage in listStoragePools
2013-06-12 14:58:54 +05:30
Harikrishna Patnala 215b638e8e CLOUDSTACK-2347: Zone filter for listSnapshots API
Added new optional parameter zone id in listSnapshots API which allows to list snapshots with additional criteria.
   Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-06-12 13:35:58 +05:30
Nitin Mehta e73aafc09a CLOUDSTACK-2940
Allowing Replacement of realhostip.com with a customized domain for SSVM. Though the config variable was there we were always hardcoding to realhostip.com
Reviewed-by: Abhi
2013-06-12 11:51:45 +05:30
Nitin Mehta d21e064724 CLOUDSTACK-2937
Scheduled snapshot events should be shown to users
2013-06-12 11:42:10 +05:30
Jayapal 358f3edc57 CLOUDSTACK-2609 Fixed accoundId, domainId for the secondary ip address for shared networks
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 10:32:04 +05:30
Min Chen ec55c2e909 CS-17842: java.lang.NullPointerException seen when using
"updateTemplatePermission" with projectids parameter.
2013-06-11 17:07:26 -07:00
Likitha Shetty 7b63894a0a CLOUDSTACK-2891. While adding a new vlan range if the new range extends an existing range then CS extends the existing range to include the new range.
This is done by checking if the last vlan in the new range is same as the start vlan of any existing range.
Since for a single vlan the start and the end vlan are the same the check goes to an infinite loop resulting in a java.lang.OutOfMemoryError: Java heap space error.
Remove the check for a single vlan because if an existing range starts with the single vlan then it implies that the range already exists
2013-06-11 12:08:05 +05:30
Min Chen cc0de88088 Remove old DeleteTemplateCommand, DeleteVolumeCommand,
DeleteSnapshotBackupCommand, replaced by DeleteCommand.
2013-06-10 17:55:30 -07:00
Kelven Yang 923deba89b Wire CreateSnapshotCmd with @Inject support in SnapshotSchedulerImpl 2013-06-10 17:52:14 -07:00
Wei Zhou 76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Nitin Mehta d8a235ee31 CLOUDSTACK-2923: Delete Secondary storage of a Zone was giving NPE bcz we were still refering to the object. Instead log that the cpvm and ssvm cant be created bcz sec storage is not available 2013-06-10 16:48:50 +05:30
Jayapal c1ad3b7974 CLOUDSTACK-2604 Fixed deleting secondary ip when no PF rules set
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-10 12:13:08 +05:30