etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,834 Commits 322 Branches 325 Tags 948 MiB
Commit Graph

7256 Commits

Author SHA1 Message Date
Alena Prokharchyk 96a17cc036 CLOUDSTACK-4428: "kvm.snapshot.enabled" flag shouldn't affect detached volumes, or volumes attached to the vm in Stopped/Destroyed state 2013-08-21 16:27:16 -07:00
Alena Prokharchyk d5379b8704 CLOUDSTACK-4392: API volumeresponse - return primary storage information to ROOT and resource domain admin only. 2013-08-21 15:43:06 -07:00
Koushik Das 502c1db103 CLOUDSTACK-3441: [Load Test] High delays between VM being allocated to Pod and network implementation causing delays in VM deployment 
The locking code in implement/shutdown network code was not efficient. Even in order to check the current state of the network lock was getting acquired which is not required. This resulted in delays in deploy VM as can be seen from attached logs where the code waited on the lock just to check if network is implemented.
As part of the fix moved out code that is checking if the network is already implemented or shutdowned outside the lock.
 2013-08-21 15:25:45 +05:30
Koushik Das 534e0977c3 CLOUDSTACK-2131: [Performance][Enhancement] Avoid checking for providers that are not enabled while creating network. 
For some scenarios like prepare nic, all network service providers are checked which is not efficient and also introduces unnecessary dependencies.
The check to use only the required providers is already there for implement, shutdown operation on network. Put the same check for all missing cases.
 2013-08-21 12:48:51 +05:30
Min Chen 3bd2bbf59d CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in 
case of region-wide secondary is enabled.
 2013-08-20 14:13:49 -07:00
Alena Prokharchyk d7216a776e CLOUDSTACK-4410: Parallel vm execution - turn on and off based on the global configuration variable. Before the fix, was hard coded to on 2013-08-20 11:04:50 -07:00
Alex Huang 494ea5052f Made IpAddressManager a manager 2013-08-19 14:13:31 -07:00
Alex Huang f23f1530e7 Removed missing class from application context 2013-08-19 14:13:31 -07:00
Alex Huang 45d239882b Added missing files 2013-08-19 14:13:30 -07:00
Alex Huang 092e20204a Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl 2013-08-19 14:13:29 -07:00
Alex Huang 564502abd7 Moved the virtualmachine implementation into engine/orchestration 2013-08-19 14:13:28 -07:00
Alex Huang 4ba359c3fe Moved VirtualMachineManager into engine 2013-08-19 14:13:28 -07:00
Marcus Sorensen 1b52a298e8 CLOUDSTACK-4379: Reset VM states when host is removed from cluster 
If you shut down the agent while VMs are running, the management
server assumes that the VMs are continuing to run. You can then
delete the host while it is in 'disconnected' state, and those VMs
will be unusable, forever in running state. They can't change state
because the host no longer exists. This patch checks for any VMs
that may have been tied to the removed host and resets their state
so that cloudstack can continue to manage them.
 2013-08-17 00:25:14 -06:00
Min Chen 97ff4981c5 CLOUDSTACK-3274: Remove duplicate cleanString calls in logging api for 
performance improvement.
 2013-08-16 11:10:25 -07:00
Bharat Kumar 15c93ba9b7 =CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted 
Nitin Mehta <nitin.mehta@citrix.com>
 2013-08-16 17:27:00 +05:30
Nitin Mehta 088ce975c6 CLOUDSTACK-4313 
Wrong error message is throwing on failure of dynamic scale up operation. Fix it.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-16 13:03:42 +05:30
Min Chen 081cfa7b6b CLOUDSTACK-4277:listTemplate should return empty list without any zone 
configuration.
 2013-08-15 16:47:35 -07:00
Min Chen c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied 
to Staging storage during snapshot creation.
 2013-08-14 18:12:53 -07:00
Alena Prokharchyk ae617b6a35 Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user" 
This reverts commit 94254e3c2b.

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java

Regular user should be able to list the network offering with specifyVlan=true. He just can't use when create the network as he is unaware of the physical network topology. But as the admin can create the network on the user's behalf using this kind of offering, so the user should be able to see the offering's details
 2013-08-14 15:22:36 -07:00
Mike Tutkowski 0f60b5d41c CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack 2013-08-14 15:02:57 -06:00
Alena Prokharchyk b727001f48 CLOUDSTACK-4315: VPC - when fail to add nic to the VR, a) remove the nic b) remove the reference to nic from router_network_ref table. Before the fix b) was missing, and it caused NPEs when tried to apply the rules on the routers not having nic in the network 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-08-14 11:44:34 -07:00
Edison Su f87eed5b79 fix compile 2013-08-13 15:16:46 -07:00
Edison Su 3eb34d082d CLOUDSTACK-4298: in case both xenserver/vmware mixed in one zone, need to make sure, ssvm is loaded with premiumsecondaryresource 2013-08-13 15:16:46 -07:00
Edison Su c58f15d867 CLOUDSTACK-4222: use new volume object in case of migrate volume 2013-08-13 15:16:45 -07:00
Wei Zhou 3ab1abc6ba CLOUDSTACK-4296: fix a similar issue 
(cherry picked from commit e2f47871d1)
 2013-08-13 21:56:21 +02:00
Wei Zhou da7f924cc5 CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command 
(cherry picked from commit 72f013f780)
 2013-08-13 21:39:24 +02:00
Wido den Hollander 227509be46 Remove .java.orig file 
Left over from somebodies editor?
 2013-08-13 16:25:09 +02:00
Likitha Shetty 4d48d9603d CLOUDSTACK-4286. Add one more check for validating vlanrange parameter with "dedicateGuestVlanRange" API 2013-08-13 18:54:10 +05:30
Kishan Kavala 29a399b9ae CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records. 
Filed CLOUDSTACK-4299 to make these entities always available.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-08-13 18:53:00 +05:30
Nitin Mehta 5b41be3567 CLOUDSTACK-4270 
ASF 4.1 to 4.2 Upgrade: Missing Global Configuration parameters on the Upgraded Setup related to "storage.cache". Adding them
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-13 12:16:31 +05:30
Alex Huang 3df5571d2e Resolved merge conflicts 2013-08-12 20:15:24 -07:00
Alex Huang de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -07:00
Alex Huang ae8ed58228 Added missing file 2013-08-12 19:05:23 -07:00
Alex Huang 0e19e82fac Split up the volume manager into two. One part is for self-service. One part belongs in the engine. Removed old 2.1 upgrade code. In order to upgrade from 2.1, you must upgrade to 2.2. first. So therefore these files are no necessary in the newer versions of CloudStack 2013-08-12 19:05:22 -07:00
Jessica Wang 3c16adf6dc CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response. 2013-08-12 17:50:02 -07:00
Min Chen ebdc5786bf CLOUDSTACK-4250: [Object_store_refactor] Register ISO fails in multizone 
environment if downloading to one of the zone fails.
 2013-08-12 11:26:26 -07:00
Saksham Srivastava 5510bca9e5 CLOUDSTACK-4189: [UI] In multi zone setup, dedicating a single zone to a domain, shows other zones dedicated as well 2013-08-12 18:27:52 +05:30
Murali Reddy 5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard 
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
 2013-08-12 18:12:13 +05:30
Likitha Shetty cd2ea3b844 CLOUDSTACK-4244. Unable to attach a volume to a VM deployed in Stopped (startvm=false) state. 
While attaching a volume to a VM, create volume on the hypervisor only if the VM has been started on the it.
 2013-08-12 15:49:08 +05:30
Rajesh Battala be9dbcc2c5 CLOUDSTACK-3946 [KVM] [Zone Wide Primary Storages] migrateVolume is deleting the volume if the source and destination pool are same 2013-08-12 13:41:49 +05:30
Murali Reddy f1c611ac60 CLOUDSTACK-4206: [EIP/ELB] Failed to disableStaticNAT when the userVM is 
in destroyed state.

ignore VM state when system is enabling static NAT on the system IP to
VM in EIP enable network
 2013-08-12 04:49:03 +05:30
Harikrishna Patnala 2868d4b336 CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm; Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-11 20:34:39 +05:30
Mike Tutkowski d39408cd0c CLOUDSTACK-4227 2013-08-10 17:43:15 -06:00
Harikrishna Patnala 5404bf6063 CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2 
Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade.
 2013-08-10 18:02:49 +05:30
Anthony Xu 36d7b49d5f CLOUDSTACK-4210 
delete templateVO entry when there is no image store having this template
 2013-08-09 12:08:00 -07:00
Likitha Shetty ec669ff48e CLOUDSTACK-3786. Snapshots removed field is not set after successful deletion of the snapshot. 
Set the removed field for snapshot when the storage gc removes the snapshot
 2013-08-09 18:48:29 +05:30
Koushik Das 8cf48ed2ce CLOUDSTACK-4179: [Performance Testing] Time taken for Deploy VM async job to complete is considerably higher 
The time increased due to the newly added dedicated resources feature. During regular VM deployment, all dedicated resources are put in avoid list so that they are not considered for deployment.
Now the way to compute the list of dedicated resources is not optimal and performance deteriorates in an environment having lot of pods, clusters and hosts as the logic is to query db. for each suc resource.

The fix is to optimize the logic not to loop through all resources but get the list of each resource type in a single query.

Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
 2013-08-09 16:57:21 +05:30
Devdeep Singh 32701f027a CLOUDSTACK-2670. Migrate volume doesn't allow migration of volumes of a stopped vm. 
The findStoragePoolsForMigration and migrateVolume api were explicitly blocking moving
a volume if the instance to which it was attached was stopped. Updated the check for
the same.
 2013-08-09 14:28:01 +05:30
Min Chen 99c3e4f3f5 CLOUDSTACK-4190: Add endpoint selector implementation for ImageCache 
data store and also delete object from staging area for volume copy from
primary to secondary or vice versa.
 2013-08-08 16:17:00 -07:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefc.
 2013-08-08 15:02:40 -07:00
Alena Prokharchyk 958c2b2040 CLOUDSTACK-4141: resizeVolume - read the result of AsyncCallFuture execution. If false, return null to the API caller 2013-08-08 13:53:58 -07:00
Alena Prokharchyk 4976a67bfc CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId 2013-08-08 10:49:12 -07:00
Bharat Kumar 5f2f5181e9 CLOUDSTACK-4083 if a failure occurs while adding VM to another network (this should be the first vm in the subnet). The ip alias created as a part of this process is not removed. 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-08-08 10:31:15 -07:00
Min Chen 1a194ef725 CLOUDSTACK-1405:ZWPS: listStoragePool API doesn't accept scope parameter 
.
 2013-08-08 10:10:15 -07:00
Likitha Shetty b7c5068327 CLOUDSTACK-4186. Signature computed while accessing VM's console is not aligned with how signature is computed for other APIs 2013-08-08 16:29:12 +05:30
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Likitha Shetty aba50f81cf CLOUDSTACK-4153. Guest vlan dedication is not working as expected in case of multiple physical networks. 2013-08-08 10:59:19 +05:30
Alex Huang 5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang 5161ded69c Removed the configuration parameters from Config.java 2013-08-07 16:41:05 -07:00
Alex Huang 49cd4fa380 Connected config gathering to CloudStack 2013-08-07 16:41:04 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Alex Huang cf3bbb1fb1 Switched AgentManager to use ConfigDepot 2013-08-07 16:41:00 -07:00
Edison Su e115ee4026 CLOUDSTACK-3535: still maintain stop agent wont trigger HA 2013-08-07 14:43:16 -07:00
Edison Su 5b0314fff9 CLOUDSTACK-3535: add kvminvestigator to investirage kvm host 
Conflicts:

	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2013-08-07 11:44:19 -07:00
Saksham Srivastava 61c7aa7afe CLOUDSTACK-4104: VM Creation should fail if a zone is dedicated to a domain and user of the same domain deploys vm without using affinity group "Explicit Dedication". 2013-08-07 17:15:12 +05:30
Likitha Shetty 31fe99ef91 CLOUDSTACK-4025. NPE observed during VM start. 
NPE was hit during VM start because the network it was to be deployed in didn't get implemented - Handling this failure.
 2013-08-07 13:28:27 +05:30
Sateesh Chodapuneedi c14c736d7a CLOUDSTACK-4047 [sM][VMWare][ZWPS]: no need of storage migration while migrating VM when the root volume is on zone wide primary storage 
Introduced check for zone wide pools while listing hosts for migration.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-08-07 01:36:32 +05:30
Wido den Hollander fd793f7fb6 config: Fix a typo in the configuration option 2013-08-06 15:19:43 +02:00
Bharat Kumar 1a89bc06c8 Cloudstack-4015 No error logged when deleteing all the valns when there are allocateed vnets. Alos not updating the vnet range in physicalnetworks table in the above case. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2013-08-06 17:28:22 +05:30
Murali Reddy 42b81009b9 CLOUDSTACK-4013: [PortableIP] [MultiplePhysicalNetworks] Associate 
portable IP is trying to insert network id as physical network id

ensuring network id, physical network id, source network id are properly
set for portable ip in user_ip_address and vlan tables
 2013-08-06 17:16:58 +05:30
Jayapal 6164077ee8 CLOUDSTACK-4084 Fixed the static nat vm ip address in public ip address table in external network gc 
In external network after network GC the network n/w cidr changes.
    In this case the static nat enable vm ip also chagnes. So updated the new
    vm ip address in user_ip_address table.
 2013-08-06 16:25:51 +05:30
Likitha Shetty eac3631abe CLOUDSTACK-4038. State of the DATA volumes remains in Allocated state if they are deleted before using them. 
If a volume is in Allocated state i.e. not present in primary or secondary mark the volume as removed.
 2013-08-06 16:02:40 +05:30
Murali Reddy 323f246765 CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of 
UI firing an incorrect API

adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response
 2013-08-06 16:01:11 +05:30
Prasanna Santhanam 0eafc0c0d8 CLOUDSTACK-4064: Missed renaming the config for KVM snapshots 
KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2)
 2013-08-06 10:39:14 +05:30
Murali Reddy 56d7ccef97 CLOUDSTACK-4037: [GSLB] removeFromGSLBRule is not cleaning the 
cloudsite1 infro from the second site NetScaler device

ensuring when a site no longer participates in GSLB, complete GSLB
config for that rule is wiped out on the GSLB provider for that site
 2013-08-06 05:56:26 +05:30
Alena Prokharchyk beabf596ba CLOUDSTACK-4080: don't GC the network when it has vms in Starting state even when the nics are not allocated for them yet (can happen when vm is being created) 2013-08-05 14:15:04 -07:00
Daan Hoogland d9202100e0 fix warnings in NetworkServiceImpl: removed unused code and add cases to switches 2013-08-05 11:21:39 -07:00
Alena Prokharchyk a5c2d24ee2 CLOUDSTACK-4087: updateTemplatePermissions - derive domainId from the template owner, not from the operation caller 
Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-08-05 10:39:48 -07:00
Wido den Hollander 6906a9016d config: Only user low-case names for variables 2013-08-05 17:37:57 +02:00
Sanjay Tripathi 8845aae0bc CLOUDSTACK-4075: User unable to archive events 2013-08-05 20:01:40 +05:30
Harikrishna Patnala 506f2a4b94 CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism 
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-08-05 18:19:16 +05:30
Nitin Mehta f28a28dc77 CLOUDSTACK-3913 
Private templates would now get copied to only one of image  storage chosen randamly as was the case earlier. Dont throw an exception for uploading volumes when there are multiple image stores, instead choose one of them randomly
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-08-05 17:43:57 +05:30
Min Chen 8ff2061db7 CLOUDSTACK-4040: [Object_store_refactor] System VMs are not spinning up 
if S3 storage configuration is not part of zone creation wizard.
 2013-08-02 18:17:58 -07:00
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Chiradeep Vittal d8a5f03c7f Revert "Starting the work of moving orchestration pieces to engine" 
This reverts commit 7a2aaf96fd.
 2013-08-02 15:09:29 -07:00
Alex Huang 7a2aaf96fd Starting the work of moving orchestration pieces to engine 2013-08-02 13:51:48 -07:00
Alena Prokharchyk fc33d69b2a CLOUDSTACK-4023: lock the network during the shutdownNetwork (just the way we do when implement network) 
Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-08-02 13:20:47 -07:00
Alex Huang a673d17171 Added missing file 2013-08-02 11:07:56 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Alex Huang 0b1f97d048 Added Configurable interface 2013-08-02 11:07:54 -07:00
Alena Prokharchyk 4e53ce0677 CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info 2013-08-02 09:03:57 -07:00
Bharat Kumar 80e2934bb7 fix to add the the overcommit details of the vms in uservm details table when decreasing the overcommit to one. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 19:09:26 +05:30
Kishan Kavala 536fd0e8a1 CLOUDSTACK-4005: Do not allow snapshot on zone wide primary storage when KVM.snapshot.enabled is set to false 2013-08-02 18:04:28 +05:30
Bharat Kumar 65370f31bc upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes" 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 17:07:22 +05:30
Ian Duffy 25e8e9b85f General cleanup, source formatting, remove whitespace 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Ian Duffy 00c17add3c Add SSL Support 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Ian Duffy 23f0187d05 Add Support for member of filter 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-08-02 14:20:47 +05:30
Kishan Kavala 65fc2ec345 CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-08-02 12:04:33 +05:30
Fang Wang 8f7b90badf CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer. 
Signed-off-by: Edison Su <sudison@gmail.com>
 2013-08-01 17:47:11 -07:00
Alena Prokharchyk a3b86573b9 CLOUDSTACK-4020: lock nic entry in releaseNic method. Otherwise multiple threads can try to release the same nic at the same time, and it will lead to NPEs and backend failures 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-08-01 16:19:10 -07:00
Bharat Kumar 21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command 
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2013-08-01 13:36:20 -07:00
Nitin Mehta 2a20ac21ac =CLOUDSTACK-3102 ResourceDetail API - If you add detail for any resource other than volume and nic then throw an exception 2013-08-01 17:38:58 +05:30
Likitha Shetty 871e3bb279 CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0. 
Add vpc resource count to the response. And set the right values for network resource count.
 2013-08-01 14:18:33 +05:30
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Harikrishna Patnala f12adfff8a CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template 
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-08-01 12:20:48 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-08-01 10:47:36 +08:00
Edison Su 4eefce15be CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered. 2013-07-31 15:49:48 -07:00
Bharat Kumar 980b227817 recalculate the capacity after overcomit change. 
Conflicts:
	server/src/com/cloud/capacity/CapacityManager.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-07-31 18:39:14 +05:30
Wido den Hollander ce06d6542a CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance 2013-07-31 15:07:32 +02:00
Harikrishna Patnala 3d9fc3dbc0 CLOUDSTACK-2717: listCapabilities API to return 
allow.public.user.templates configuration parameter value
 defined at account level.
Signed by - Nitin Mehta<nitin.mehta@citrix.com>
 2013-07-31 16:58:32 +05:30
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-31 15:31:42 +05:30
Harikrishna Patnala 2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Min Chen 622a9e1b95 CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event is 
generated for registered ISO.
 2013-07-30 18:08:05 -07:00
Prachi Damle a8360e41c0 CLOUDSTACK-3942 NPE from findStoragePool method 
Changes:
- Added null checks for podId

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
 2013-07-30 17:53:31 -07:00
Min Chen c2192808aa CLOUDSTACK-3686: Registering a template does not generate a usage event. 2013-07-30 17:35:12 -07:00
Alex Huang 1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Min Chen 730d045085 CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead 
of at AttachVolumeCmd.
 2013-07-30 14:51:02 -07:00
Alena Prokharchyk 9f66d18de6 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 2013-07-30 14:30:53 -07:00
Alena Prokharchyk 9b7c4a6c47 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
 2013-07-30 14:13:58 -07:00
Alena Prokharchyk 244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 
Fixed the build: use CallerContext instead of UserContext
 2013-07-30 13:53:31 -07:00
Alena Prokharchyk 43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command" 
This reverts commit 416331ae80.
 2013-07-30 12:05:09 -07:00
Alena Prokharchyk 416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
frank 6070a8b370 CloudStack CLOUDSTACK-1812 
create physical network fails while creating basic zone
 2013-07-30 11:11:17 -07:00
Marcus Sorensen 566ce3e625 Summary: Fix null pointer and op_networks blocker to account cleanup 
Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.

BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
 2013-07-30 11:22:11 -06:00
Alena Prokharchyk a36c8a962b CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in 2013-07-30 10:08:46 -07:00
Murali Reddy b2fdfc5084 CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events 
for portable IPs

generating usage event for acquire and release
 2013-07-30 19:01:10 +05:30
Murali Reddy c520aae346 CLOUDSTACK-2991: [PortableIPRange] CS should not allow portable IP with 
sourceNAT service on it

if a portable ip is first IP associated with a non-VPC network, then its
being considered as source nat IP. This fix adds exemption for portable
IP not to be considred for source nat.
 2013-07-30 15:49:09 +05:30
Thomas O'Dowd 5552d26872 Fix a few typos in ConfigurationManager. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c78ed39b2f)
 2013-07-30 11:25:15 +05:30
Prasanna Santhanam 34e751fb8d simulator supports migration 
Add simultor to the seemingly strict filter which should happen within
the hypervisor resource and not the virtualmachine :/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3d4d350dbe)
 2013-07-30 11:25:14 +05:30
Alex Huang 486e0d02f8 Fixed the applicationcontext.xml because I removed a class. oh kelven oh kelven, when can we get back our java based config for core components...this is so bad for refactoring 2013-07-29 19:13:33 -07:00
Alex Huang 1d4b22d6de Removed AgentMonitor and moved it inside AgentManager 2013-07-29 19:13:32 -07:00
Alex Huang d0a3a69170 Unused code removal 2013-07-29 19:13:31 -07:00
Alex Huang 46e644e134 Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used 2013-07-29 19:13:31 -07:00
Edison Su f486d36f88 CLOUDSTACK-3908: fix extract path 2013-07-29 16:58:51 -07:00
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Alena Prokharchyk e6ec6137ab CLOUDSTACK-3914: assignToLoadBalancer - return false, when empty vmIds list is passed in 2013-07-29 13:55:55 -07:00
Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume 
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-07-29 11:50:16 -07:00
Edison Su d64c318f57 CLOUDSTACK-3510 
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
 2013-07-29 11:50:15 -07:00
Alena Prokharchyk 4c0053fb2d CLOUDSTACK-3909: deployVM API - validate hypervisorType parameter when the vm is being deployed from ISO 2013-07-29 11:16:39 -07:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Rajesh Battala 1b398aa3fc CLOUDSTACK-3846 usage event is not generated for volume resize 2013-07-29 18:51:00 +05:30
Bharat Kumar 4dc874fefc Cloudstack-2622 createipAlias.sh/deleteipAliash.sh should not be allowed with Isolated Guest Networks 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-29 18:36:20 +05:30
Bharat Kumar a8387568f3 Fixed the conditon which checks for the provider's capabilty and reapply ipaliases on virtual router restart. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-29 17:40:00 +05:30
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare 
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
 2013-07-29 15:25:07 +05:30
Harikrishna Patnala 8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer. 
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
 2013-07-29 15:16:21 +05:30
Sateesh Chodapuneedi 26d8c668f9 CLOUDSTACK-3870 [VMware] Management traffic network over a VLAN is not working 
CLOUDSTACK-3437 In case of multiple physical network setup we see log message "can't get physical network"

CloudStack's control network is management network in case of VMware.
Processing management VLAN id provided in zone traffic label for management traffic.`

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-07-29 08:20:51 +05:30
Prachi Damle 790a02f936 CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner 
Changes:
- API is fixed to return the service_offering details

Conflicts:

	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
 2013-07-28 22:44:00 -07:00
Min Chen 1fb513e783 CLOUDSTACK-3861: Remove s3.enable and swift.enable from global setting. 2013-07-27 21:56:46 -07:00
Prachi Damle abfc351b78 CLOUDSTACK-3814 Duplicate entry for CPU, Public ip address in dashboard 
Changes:
- ListCapacity API was searching the capacities per zone, pod and cluster causing duplicates to end up in th result.
- Instead we should group by zone if zone and pod both are null. Group by pod if zone is provided but no pod. Or group by cluster when zone and pod both are provided.
 2013-07-27 16:24:48 -07:00
Harikrishna Patnala a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on 
Conflicts:
	server/test/com/cloud/vm/UserVmManagerTest.java
 2013-07-27 19:52:30 +05:30