Wei Zhou
fde158df60
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling
2013-06-13 13:48:53 +02: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
Bharat Kumar
31f0e34539
CLOUDSTACK-2963 Build failure due to validateIpRange test failure
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 18:48:46 +05:30
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
Wei Zhou
0f2c59ad0a
replace tab with space, remove debugging messages
2013-06-12 09:19:29 +02:00
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
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
Kelven Yang
923deba89b
Wire CreateSnapshotCmd with @Inject support in SnapshotSchedulerImpl
2013-06-10 17:52:14 -07:00
Wei Zhou
02e5cb3e93
checkout UserVmManagerImpl.java and VirtualMachineManagerImpl.java from master branch
2013-06-10 19:53:40 +02:00
Wei Zhou
869a6b0ce3
CLOUDSTACK-1301: VM Disk I/O Throttling on Bps/IOps
2013-06-10 19:25:49 +02:00
Wei Zhou
080bb76187
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling
2013-06-10 15:01:53 +02: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
Likitha Shetty
22a8508280
CLOUDSTACK-2894. Removing all vlan ranges should update the vnet column to NULL.
2013-06-10 10:39:55 +05:30
Prachi Damle
8c9f681f9e
CLOUDSTACK-2350: Anti-Affinity - As admin user, when tryinto update the affinity group for a Vm that is deployed by a regular user , he is presented with admin's affinity groups.
...
Changes:
- listAffinityGroups API takes in accountname and domainId parameter
- For admin, listall=true should return all affinity groups of all users
2013-06-07 15:28:28 -07:00
Saksham Srivastava
5dc7387d3b
CLOUDSTACK-1647: IP Reservation should not happen if the guest-vm cidr and network cidr is not same but their start ip and end ip are same.
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-07 16:54:40 +05:30
Wei Zhou
288c5b61c9
Merge branch 'master' into disk_io_throttling
2013-06-07 09:05:20 +02:00
Likitha Shetty
e7d5ccaada
Fix DB warnings - txn: Commit called when it is not a transaction: -NetworkServiceImpl.dedicateGuestVlanRange:3050
2013-06-07 12:12:18 +05:30
Sheng Yang
4a14ea8a4d
CLOUDSTACK-1771: Fix ipv6 address for router
...
Now it won't change(as ipv4 address) after router is destroyed.
2013-06-06 18:04:35 -07:00
Alena Prokharchyk
f4a1a2ff38
Allow account to have multiple networks with customer defined cidrs as we already let it happen when the cidr is taken from the physical network config
2013-06-06 11:52:15 -07:00
Kishan Kavala
62e125c081
check for null ACL before creating ACL commands
2013-06-06 19:02:44 +05:30
Kishan Kavala
aa2fb31112
check for null protocol while validating ACL item
2013-06-06 19:02:44 +05:30
Wei Zhou
0beffe84d8
Merge master into disk_io_throttling
2013-06-06 14:57:19 +02:00
Wei Zhou
d2e6bf5fa4
CLOUDSTACK-2865: fix error in prepareStop
2013-06-05 16:43:31 +02:00
Alena Prokharchyk
54481d0b7b
listLoadBalancingRules: when list by networkId, no need to pass the dataCenterId to the call
2013-06-05 10:25:25 -07:00
Wei Zhou
1696e8cb16
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-06-05 14:29:06 +02:00
Wei Zhou
15265479f6
CLOUDSTACK-2856: collectVmDiskStatistics before reboot/stop/migrate
2013-06-05 14:28:43 +02:00
Devdeep Singh
5af702dd90
CLOUDSTACK-2737: findHostsForMigration is resulting in an exception when there are no suitable tagged storage pools. Instead of a foreach made changes to use a iterator in the loop to avoid ConcurrentModificationException as the host list is being updated inside the loop.
2013-06-05 17:41:01 +05:30
Murali Reddy
91b15711b6
CLOUDSTACK-2343: listGlobalLoadBalancerRules shouldn't list the
...
globalGSLBRules of other accounts
imposing ACL checks
2013-06-05 15:02:03 +05:30
SrikanteswaraRao Talluri
4da995238b
CLOUDSTACK-2783: FIXED listHypervisorCapabilities API response to include the following fields: 1. maxdatavolumes 2. maxhostspercluster 3. storagemotionenabled
2013-06-05 13:50:41 +05:30
Prasanna Santhanam
956a5967dd
Pulling out Network operations into a separate manager
...
Network operations like VM, host and storage are pulled into a separate
managaer for simulator.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 12:23:07 +05:30
Alena Prokharchyk
95c9835f69
CLOUDSTACK-2817: set SearchBuilder with the "scheme" attribute
2013-06-04 13:45:54 -07:00
Kishan Kavala
b5148af0c6
CLOUDSTACK-2809: Assign acl_id to VPC tier only when NetworkACL service is supported
2013-06-04 20:08:26 +05:30
Murali Reddy
cb595cafc7
CLOUDSTACK-2390:[GSLB] After removeFromGSLBRule, still CloudStack things
...
that lb rule is active
removing the GSLB rule to Lb rule mapping once rules are applied on the
GSLB service provider
2013-06-04 18:53:17 +05:30
Abhinandan Prateek
c8f143e3a7
bug CLOUDSTACK-2445: removed vm id from exception message
2013-06-04 16:11:40 +05:30
Prasanna Santhanam
0401774a09
StoragePoolForMigrationResponse -> StoragePoolResponse
...
The additional response type is basically the same as
StoragePoolResponse. Only additional state reported is whether the
storage pool is suitable for migration. Since this is fetched from
hypervisor capabilities there is no need for a new response type.
Tested with the simulator and I can see the response format correctly.
mysql> select * from hypervisor_capabilities where id=18\G
*************************** 1. row ***************************
id: 18
uuid: 98b88e6e-ccf1-11e2-bd2a-af89de8bd27e
hypervisor_type: Simulator
hypervisor_version: NULL
max_guests_limit: 100
security_group_enabled: 1
max_data_volumes_limit: 100
max_hosts_per_cluster: 100
storage_motion_supported: 1
vm_snapshot_enabled: 1
1 row in set (0.00 sec)
CloudMonkey output as below:
> find storagepoolsformigration id=0a644f79-53dd-4eb6-a871-64679a47cfc6
count = 1
storagepool:
name = PS0
id = 7c07ec9b-a3c6-3466-ab5a-f5669ead0b22
clusterid = 71fb5c34-4852-46e6-bb8f-c9da4e8f827c
clustername = C0
created = 2013-06-04T14:06:55+0530
disksizeallocated = 0
disksizetotal = 1099511627776
disksizeused = 0
ipaddress = 10.147.28.6
jobstatus = 0
path = /export/home/sandbox/primary0
podid = 560d9600-35dd-4a50-addd-81d5618536e9
podname = POD0
scope = CLUSTER
state = Up
suitableformigration = True
type = NetworkFilesystem
zoneid = 3108f711-0db6-4dad-a0d0-2fd7d413e5ef
zonename = Sandbox-simulator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-04 14:26:40 +05:30
Bharat Kumar
d58c0c4d11
Cloudstack-2736 [Multiple_IP_Ranges] Failed to deploy vm with IP address from new CIDR
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-04 14:19:57 +05:30
Prasanna Santhanam
767ed065c5
CLOUDSTACK-2815: Include dedication in simulator context
...
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 21:51:18 +05:30
Bharat Kumar
48913679e8
CLOUDSTACK-2648 [Multiple_IP_Ranges] Reboot or start/stop router vm deletes the ip alises created on VR in case of multiple subnets
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:22:27 +05:30
Bharat Kumar
0a69b82899
CLOUDSTACK-2620 [Multiple_IP_Ranges] Guest vm's nameserver is not set to VRs guest IP address in case of multiple subnets
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:09:01 +05:30
Nitin Mehta
68b8da0df7
CLOUDSTACK-2765
...
Dashboard is showing invalid value for storage
Fixed it by using the right storage method for sending the stats command
2013-06-03 15:35:47 +05:30