Commit Graph

20355 Commits

Author SHA1 Message Date
Abhinandan Prateek a9bfee1e22 CLOUDSTACK-2434: fixed var name 2013-06-03 16:11:09 +05:30
Abhinandan Prateek 7d51ebba9e CLOUDSTACK-2434: bad syntax 2013-06-03 16:05:19 +05:30
Pranav Saxena cefd099c9d Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-06-03 15:44:00 +05:30
Pranav Saxena 35f2dc6e52 changing vpc_id to vpcid 2013-06-03 15:42:55 +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
Abhinandan Prateek 7b0da06238 CLOUDSTACK-2434: bad syntax 2013-06-03 15:35:17 +05:30
Kishan Kavala 6cc9162e76 CLOUDSTACK-2781: Fixed incorrect vpcId set in search criteria while listing network acls 2013-06-03 14:58:05 +05:30
Prasanna Santhanam 22bda5c3c9 ConfigurationServerImplTest: remove long running test
The getBase64KeystoreZillionTimes is not required for the current
implementation that closes the file descriptor cleanly.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 14:48:29 +05:30
Prasanna Santhanam 55db2fe6d1 mvn clean does not do a complete clean
Retains the systevm.iso from the previous run causing systemvm.iso to
never update itself. Do a complete clean install for all profiles
specified in mvn.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 14:29:48 +05:30
Hugo Trippaers 5c9828db7d CLOUDSTACK-2804 getEthByIp function in vpc_func.sh can return the wrong
network interface
2013-06-03 10:52:41 +02:00
Prasanna Santhanam 54127f838e CLOUDSTACK-2758: Fix permissions of catalina.out
Because of CVE 2013-1976, catalina.out gets owned by root. Since
cloudstack-management is run under a privileged user env. of cloud have
cloud ($TOMCAT_USER) own the catalina.out.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 13:54:52 +05:30
Abhinandan Prateek 723a455731 CLOUDSTACK-2434: Enabling irqbalance only on router having mutiple virtual processors 2013-06-03 13:46:43 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8adf8f.
2013-06-03 07:48:03 +02:00
Sateesh Chodapuneedi b4969c4af5 CLOUDSTACK-2796
Hypervisor type validation would be applicable only for zone wide primary storage pool.
2013-06-03 10:10:03 +05:30
Sateesh Chodapuneedi 984b59d1ee CLOUDSTACK-2701
Moved bean VmwareStorageMotionStrategy to nonossComponentContext.xml.in
2013-06-03 10:03:36 +05:30
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Jessica Wang 8deeb90a6d CLOUDSTACK-2746: UI - InternalLB - VPC section - tiers - add tier dialog - network offering dropdown - exclude PublicLb network offerings only when PublicLb networks exists (i.e. LB network whose provider is VpcVirtualRouter or Netscaler exists). 2013-05-31 15:35:24 -07:00
Brian Federle 66f5d4a537 Fix dialog overlay 'buildup' when changing some selects 2013-05-31 14:58:12 -07:00
Sateesh Chodapuneedi 7998413f48 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
Added hypervisor type to CreateStoragePoolCmd & Storage pool responses.
DatastoreLifeCycle would consider hypervisor type while attaching datastore to zone.
ZoneWideStoragePoolAllocator would filter zone wide primary storage pools by hypervisor type along with tags in disk profile.
hypervisor type is mandatory parameter if scope is specified as ZONE while creating primary storage pool.
As of now KVM, VMware are allowed to use ZoneWideStoragePoolAllocator.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi e7d468e221 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
DB changes to support hypervisor specific zone wide storage pool.
Added method findZoneWideStoragePoolsByHypervisor to PrimaryStorageDaoImpl to find suitable zone wide storage pool of specific hypervisor type.
Added column 'hypervisor' to table storage_pool. This column can be NULL. Used/populated only for zone wide primary storage pools.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi 2705f01651 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
Added new column 'hypervisor' to table storage_pool to associate a identify a pool at zone level by hypervisor type.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Sateesh Chodapuneedi 51996094ff CLOUDSTACK-2701 - Enable storage migration for VMware resources
Whitespace cleanup

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Removing injections which are not required in Vmware Manager
2013-06-01 00:01:03 +05:30
Sateesh Chodapuneedi f24e81fe0d CLOUDSTACK-659 Support for storage migration in Cloudstack deployment over VMware Added VmwareStorageMotionStrategy to deal with storage motion tasks. Added target host parameter to MigrateWithStorageCommand.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Added vm type to prepareNetworkFromNicInfo in MigrateWithStorageCommand implementation.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Fixing attach volume and delete volume cases for volumes that are moved off original path in datastore when created.
If volume is not found in root directory or datastore, do search in sub folders.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Sending command MigrateWithStorageCommand to source host instead of target host for the case of migration of VM within cluster.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Searching for virtual disk during device tear down.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Added vm type to prepareNetworkFromNicInfo in MigrateWithStorageCommand implementation.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-659

Fixing migrate volume.

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1

Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware
Added VmwareStorageMotionStrategy to deal with storage motion tasks.
Added target host parameter to MigrateWithStorageCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware Added
Resource changes to perform VM live migration along with virtual disks across the clusters in a zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

CLOUDSTACK-659
Support for storage migration in Cloudstack deployment over VMware

Added VmwareStorageMotionStrategy to application context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

Support for volume live migration across datastores

CLOUDSTACK-659

Fixing migrate volume.

Unit tests for vmware storage motion. These test the VmwareStorageMotionStrategy.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Sending command MigrateWithStorageCommand to source host instead of target host for the case of migration of VM within cluster.

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Moved 2 methods that are not specific to VMware but Volume are moved to VolumeManager from VmwareManager.
Moved datastore volume path constructing code to separate method.
Added check for source and target host, if they are from different DCs/vCenter instances.

Updated error message & removed stale comment

CLOUDSTACK-2701 - Enable storage migration for VMware resources

Injecting component VolumeManager into VmwareResource.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 21:19:28 +05:30
Sateesh Chodapuneedi 5c523eb892 Add hypervisor capability storage_motion_supported for VMware 5.0 and 5.1
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 21:19:27 +05:30
Sateesh Chodapuneedi f5f00ee0ea Adding dependency of 'cloud-engine-storage' to vmware hypervisor plugin.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 21:19:27 +05:30
Prasanna Santhanam 78326f79b8 Removing API listings that don't map to any classes
add*Detail is superseded by addResourceDetail. Similarly update, list
related APIs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 19:35:14 +05:30
Prasanna Santhanam 16a76e92ab CLOUDSTACK-2789: updateVPC takes in id and name as required
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 19:35:14 +05:30
Prasanna Santhanam 49b5e61869 CLOUDSTACK-2788: restartVpc should have id as required
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 19:35:14 +05:30
Murali Reddy 9c0f9aceb8 CLOUDSTACK-2332:[GSLB] deleteAccount is not cleaning the gslb rules
created by the account

revoking GSLB rules of account on delete
2013-05-31 19:08:40 +05:30
Murali Reddy 470995b1c4 CLOUDSTACK-2192: [EIP/Optonal PublicIP] listNetworkOfferings is not
returning info about the capability "AssociatePublicIP"

added eip and associateEip capability details to the StaticNat service
response
2013-05-31 19:08:39 +05:30
Murali Reddy f84a27324d CLOUDSTACK-2285:[GSLB] addNetscalerLoadBalancer with GSLB functionality
shouldn't be exposed in basic zone

reverting the original fix for this bug. When you add network service
provider instance into a physical network in a basic zone, its not
necessary that a network has been provisioned into zone. So its no
straight-forward to know if the basic zone network has EIP/ELB services enabled.
2013-05-31 19:08:38 +05:30
Sateesh Chodapuneedi 2a58a7698f Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-05-31 17:57:46 +05:30
Sateesh Chodapuneedi 08afeb49d7 Temporarily disabling some of the tests that are failing. 2013-05-31 17:56:33 +05:30
Prasanna Santhanam aefcee5753 CLOUDSTACK-2787: updateVpcOffering should have id as a required
without the id you cannot update a VPC offering. The docs for API will
go wrong and Marvin tests using update VPC will fail.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 17:49:19 +05:30
Sateesh Chodapuneedi 55b3e69733 Added check for legacy zones. Improved log statements.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Sateesh Chodapuneedi 4b67b1d36a CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Unit tests to test functionality of the feature.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Sateesh Chodapuneedi 2b0ca781d8 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Upgrade handling.
Detect legacy zones during db upgrade and perform data migration.
If legacy zone is detected the table 'cloud'.'legacy_zones' is populated.
If an existing zone which has resources that belong to single VMware datacenter then such zone would not be marked as legacy zone. Such zone would be automatically associated with the specific Vmware datacenter of the clusters inside the zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Sateesh Chodapuneedi cf2b8694b5 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Adding all new beans introduced during the feature implementation to nonoss component context.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Sateesh Chodapuneedi 3696605ad6 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
DB schema changes to support this feature.
Added 3 new tables.
'vmware_data_center' to persist information about each Vmware datacenter known to cloudstack.
'vmware_data_center_zone_map' to persist mapping information of a Vmware datacenter & cloudstack zone.
'legacy_zones' to persist the known legacy zones in the deployment.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:46 +05:30
Sateesh Chodapuneedi 1f790e615a CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Introduced 2 new API command classes AddVmwareDcCmd & RemoveVmwareDcCmd.
The new APIs are addVmwareDc & removeVmwareDc, these APIs will associate a Vmware datacenter to a cloudstack zone & dis-associate a Vmware datacenter from a cloudstack zone.
Constraint checks are added for infrastructure change operations in zone that encompass resources like clusters.
Constraint checks are added in discoverer and manager classes.
Added a service 'VmwareDatacenterService' to expose methods that will have API implementation for 2 APIs addVmwareDc & removeVmwareDc

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:45 +05:30
Sateesh Chodapuneedi 6cd87d2e21 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Support for DB changes for Vmware datacenter objects
Support for DB changes to store mapping with CloudStack zones.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:45 +05:30
Sateesh Chodapuneedi 99e9f5d308 CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter
Support for custom field "cloud.zone" for datacenter object in vCenter.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-31 13:33:45 +05:30
Rajesh Battala af4177b86c Fixed CLOUDSTACK-2662 Preferred implicit dedication fails with insufficient capacity even if shared hosts are available.
Issues:
In Implicit planner resource usage is fixed to "Dedicated". It should be Dedicated/Shared depending upon the Implict Planner strict/preferred modes and hosts availability.

Fixed:
Issue is fixed by determining the resource usage to be "Dedicated/Shared" depending upon the Implicit strict/preferred mode and the hosts availability for the planner.
2013-05-31 00:28:56 -07:00
Pranav Saxena 8c9cd6e0ca nTIER - detail view to show the acl name with which it is associated 2013-05-31 11:55:17 +05:30
Laszlo Hornyak bc98d8ab46 just an organize import
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 11:32:02 +05:30
Laszlo Hornyak 4894187991 test and cleanup for getBase64Keystore
ConfigurationServerImpl.getBase64Keystore did not close the file input stream correctly. This patch adds test and replaces the file read with commons-io FileUtils call.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-31 11:26:33 +05:30
Pranav Saxena 2f29185943 Merge branch 'UI-explicitDedication' 2013-05-31 10:04:05 +05:30
Min Chen 2473ceb111 Have different callback for create template and create volume since they
will update different tables.
2013-05-30 17:39:44 -07:00
Jessica Wang 7934b16317 CLOUDSTACK-2745: UI - Internal LB Rules - (1) detailView: remove Rules tab and add source port, instance port in Details tab. (2) Create Internal LB Rule dialog: corret label of source port and instance port. 2013-05-30 17:06:22 -07:00