Commit Graph

20555 Commits

Author SHA1 Message Date
Kelven Yang 36d8a5631d CLOUDSTACK-3869: change default snapshot directory to VM folder 2013-09-04 14:49:45 -07:00
Kelven Yang 40869a5a2b CLOUDSTACK-3869: Move VMware datastore folder structure policy management to central place 2013-09-04 14:49:45 -07:00
Kelven Yang 458de9321d More fixes found in test cases when JVM assertion check is turned on 2013-09-04 14:49:45 -07:00
Kelven Yang f383656b21 Fix problems found in local test when JVM assertion is turned on 2013-09-04 14:49:44 -07:00
Kelven Yang 249e2e8f59 Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection 2013-09-04 14:49:44 -07:00
Vijayendra Bhamidipati 57dc52bb6f CLOUDSTACK-4539: [VMWARE] vmware.create.full.clone is set to true in upgraded setup;default nature of vms are full clone
Description:

    Set the criterion for overriding/preserving the vmware.create.full.clone
    flag so that if past version deployments have any deployments (data centers),
    this flag will be set to false. Else, it will be set to true.
    The earlier criterion to set this flag was based on the CS version numbers,
    but that is not a good business logic to serve as a basis to set the flag.
2013-09-04 05:58:25 -07:00
Prachi Damle f31c318158 Changes required to merge to master:
- Replace UserContext by CallContext
2013-09-03 20:03:11 -07:00
Prachi Damle 0115db0819 CLOUDSTACK-4369 [UPGRADE]Upgrade failed from 307 to 4.2
Changes:
- Do not consider removed zones
- Create affinity group per domain
2013-09-03 20:03:08 -07:00
Prachi Damle a0b48a45c0 CLOUDSTACK-4222: [VMWare] NPE: VM Failed to start after Volume Migration
- ExplicitDedicationProcessor should process only if group of this type is used!
2013-09-03 20:03:05 -07:00
Prachi Damle 6a8043e040 CLOUDSTACK-4561: DeployVm failed after upgrading from earlier version having a private zone to 4.2
Changes:
- In the upgrade path, for a private zone, entry needs to be added in the affinity_group_domain_map to provide access to the private zone for the domains it belongs too.
2013-09-03 20:03:01 -07:00
Prachi Damle 6a0bda0280 CLOUDSTACK-4337 Dedicated Resources: Zone dedicated to an account should only be visible and accessible to that account
Changes:
- When listing a zone, add clause in the search to check the account_id for a dedicated zone
- When listsing a zone with a domainid, add a similar clause.
- DomainCheck:: checkAccess() for a zone should consider that zone can now be dediacted to a specific account and check access accordingly.

Conflicts:

	server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
	setup/db/db/schema-410to420.sql
2013-09-03 20:02:59 -07:00
Prachi Damle 012afceed2 CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table

updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table

listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.

DedicateZone API:
- set domainid in the data_center table

ReleaseDedicatedZone API:
- remove zoneid from the data_center table
2013-09-03 20:02:56 -07:00
Prachi Damle 96ca70e2da CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API
Changes:
- Block API from creating this type of group
2013-09-03 20:02:53 -07:00
Prachi Damle 25cc9eb869 CLOUDSTACK-4234:Dedicated Resources: When multiple dedication groups are chosen for VM deployment, dedicated resources belonging to both groups should be considered
Changes:
- Do not add the dedicated resource to avoid list if it is present in the list of resources to consider for the deployment.
2013-09-03 20:02:50 -07:00
Prachi Damle 2ce2552132 CLOUDSTACK-4234 Dedicated Resources: When multiple dedication groups are chosen for VM deployment, dedicated resources belonging to both groups should be considered
- Override the equals method
2013-09-03 20:02:47 -07:00
Prachi Damle 5628153c59 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Adding mocks in unit tests for new injected components

Conflicts:

	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
2013-09-03 20:02:44 -07:00
Prachi Damle c1c3c96588 CLOUDSTACK-4168: Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- Include the new AffinityGroupAccessChecker in all *ComponentContext.xml.in
2013-09-03 20:02:41 -07:00
Prachi Damle ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
Prachi Damle a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Sheng Yang 495259132c CLOUDSTACK-4601: Add PATH for cron job of check_heartbeat.sh
Also fix a typo in the script template.
2013-09-03 16:55:27 -07:00
Min Chen e92d46bfd4 CLOUDSTACK-4600:Registered Cross-zone template does not populate
template_zone_ref for later added zones.
2013-09-03 16:39:23 -07:00
Chip Childers bf967eb622 Updating datetime format of events to include the timezone 2013-09-03 12:45:01 -04:00
Chip Childers ee13e19a03 Passing description string through to the EventBus for ActionEvents 2013-09-03 12:34:36 -04:00
Chip Childers c86f3bc969 Adding body and subject to the AlertGenerator's Event description hash 2013-09-03 12:28:26 -04:00
Chip Childers 14ee684ce3 Adding eventDateTime to all event generation locations 2013-09-03 11:34:56 -04:00
radhikap e48e75625d review comments on Portable IP 2013-09-03 15:53:08 +05:30
Wei Zhou 65c1c986da CLOUDSTACK-1192: fix collectVmDiskStatistics issue when stopping a vm 2013-09-03 11:45:34 +02:00
Jayapal 7aea599eb4 CLOUDSTACK-4586 Added CIDR validation for SG Egress rules 2013-09-03 14:18:18 +05:30
Wei Zhou f555e26c87 CLOUDSTACK-1192: fix silly mistake 2013-09-03 08:52:35 +02:00
Wido den Hollander a7f861f8d9 docs: Add more information about RBD cloning to the Release Notes 2013-09-02 22:03:25 +02:00
Wei Zhou a16fd4781c CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation
There are three issues in resource_count table
(1) expunge a vm, the public_ip decreases and becomes -1 in basic zone.
(2) recover a vm, the volume increase.
(3) restore a vm, the volume decrease.
2013-09-02 16:56:34 +02:00
Wei Zhou 62b09c9253 CLOUDSTACK-2319: fix incorrect account_id in event table for Revoke SecurityGroupRule commands
(cherry picked from commit d9ba234d6c)
2013-09-02 16:53:55 +02:00
Wei Zhou 87d73e227f CLOUDSTACK-1192: GetVmDiskStatsCommand return null as disk I/O statistics does not support xen/vmware
(cherry picked from commit 3121133c03)
2013-09-02 16:04:59 +02:00
Hugo Trippaers b220403e35 Fix EndpointSelectorTest, LockMasterListener is in the server package
for now.
2013-09-02 14:32:28 +02:00
Hugo Trippaers 0d499f0af0 the cloud-engine-storage-integration-test sub-project should not depend
on the nonoss build. It can be enabled with its own profile
"integration-test". 

Removing the nonoss activation tag from the profile.
2013-09-02 14:32:25 +02:00
radhikap e12c0c4e43 CLOUDSTACK-4565 sheng's comments 2013-09-02 14:27:30 +05:30
radhikap e61db3371f CLOUDSTACK-4565 sheng's comments 2013-09-02 14:20:07 +05:30
radhikap 6787b64dd5 review comments on API dev guide is incorporated 2013-09-02 13:58:52 +05:30
Daan Hoogland 2fb6ae814f copyright 2013-09-01 23:59:53 +02:00
Daan Hoogland f1a4e9fdf5 copyrights 2013-09-01 23:49:05 +02:00
Daan Hoogland d9c06e538b CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods 2013-09-01 22:53:23 +02:00
Ian Duffy f80ecfe4b0 Cloudstack-2014 [GSoC] Add support for ldap user provisioning 2013-08-31 22:01:04 +01:00
Ian Duffy 7ded3c803d Prep for merge with master 2013-08-31 21:55:27 +01:00
Prasanna Santhanam fb7eb06198 get host credentials from marvin configuration for ssvm test
(cherry picked from commit 6371d3b98c56784e4a3588c2546be18aa79cb595)
2013-08-31 12:50:58 +05:30
Ian Duffy bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Jessica Wang e826956290 CLOUDSTACK-4089: UI > zone wizard > VMware hypervisor > physical network > edit traffic type > set default value for vSwitchName field upon selected vSwitchType. 2013-08-30 15:20:29 -07:00
Jessica Wang 94cd470a0a CLOUDSTACK-4089: UI > zone wizard > VMware hypervisor > physical network > edit Public/Guest traffic type > vSwitchType dropdown > set default option upon configuration 'vmware.use.dvswtich' and 'vmware.use.nexus.vswitch'. 2013-08-30 14:56:29 -07:00
Jessica Wang d4d42bb22d UI > Infrastructure > clusters > Add cluster dialog > change variable name for Nexus DVS fields to be more intuitive. 2013-08-30 14:56:01 -07:00
Jessica Wang 3b14b66b20 CLOUDSTACK-4089: UI > zone wizard > hypervisor VMware > multiple physical networks > edit Public/Guest traffic type > fix a bug that vSwitch Type dropdown selection didn't remain after Public/Guest traffic type is dragged to another physical network. 2013-08-30 11:12:39 -07:00
David Nalley 4b157fcce1 updating the version number 2013-08-30 12:12:10 -04:00