etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,035 Commits 328 Branches 325 Tags 884 MiB
Commit Graph

8146 Commits

Author SHA1 Message Date
Edison Su 504a6cdee2 CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm 
Conflicts:

	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/hypervisor/KVMGuru.java
 2014-03-28 16:24:07 -07:00
edison d4c7574f12 CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool 2014-03-28 16:23:27 -07:00
Edison Su 7c04aa6115 CLOUDSTACK-5831: return quiescevm field in volumeresponse 
Conflicts:

	api/src/org/apache/cloudstack/api/response/VolumeResponse.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
 2014-03-28 16:23:19 -07:00
edison 550834e4b9 CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities. 2014-03-28 16:23:09 -07:00
edison 5bfef62ab0 CLOUDSTACK-5607: Don't delete the template if its stored in other zones. 2014-03-28 16:22:57 -07:00
edison 8583b70f2a CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-03-28 16:22:49 -07:00
Edison Su 6b7994512d CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage 
Conflicts:

	api/src/com/cloud/storage/StoragePool.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2014-03-28 16:22:16 -07:00
Edison Su b38dbc64db CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex 
(cherry picked from commit d4fdc184fe)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>

Conflicts:

	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
 2014-03-28 16:21:50 -07:00
Edison Su 7416988c58 CLOUDSTACK-4506: fix NPE in case hostid is null 
Conflicts:

	server/src/com/cloud/capacity/CapacityManagerImpl.java
 2014-03-28 16:14:46 -07:00
Prachi Damle 4e61e49143 CLOUDSTACK-6303 [Automation] [UI] Account creation hang in UI 
Changes:
- Caused due to a MySql error during 'Project' account cleanup. The MySql error hits a deadlock bug in the MessageBus code that does not release the lock/decrement the counter Eventually all callers on the MessageBus end up waiting to enter
- This fixes the account cleanup MySql error.
 2014-03-28 14:35:00 -07:00
Laszlo Hornyak 05c9d54c4f removed Integer and Long instantiations 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-28 18:40:25 +01:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Anshul Gangwar e3e452625e CLOUDSTACK-6267: unblocking smb as zone wide primary storage for hyperv 
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
 2014-03-27 16:24:40 +05:30
Anthony Xu d14f66f58d when start vm times out, check VM status, if it is running , return succeed. 
change XAPI timeout to 60 second.
 2014-03-24 17:15:08 -07:00
Anthony Xu 726dd16daa use vm instance name in log 2014-03-24 16:24:55 -07:00
Anthony Xu bf48309e14 addHostCmd will try to load all hosts in a pool 2014-03-24 16:06:26 -07:00
Laszlo Hornyak c6d2549939 StringBuffer replaced with StringBuilder in ApiServerService 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 21:04:06 +01:00
Laszlo Hornyak aef76f71ec StringBuffer replaced with StringBuilder in ApiServlet 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 21:03:48 +01:00
Laszlo Hornyak 843464efc8 removed commented-out code 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 19:05:47 +01:00
Laszlo Hornyak 96d56b7525 Tests for ApiServlet 
- tests for login
- loginSuccessResponse test for xml and json

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-24 19:05:47 +01:00
Jayapal fb498a40ba CLOUDSTACK-6250: updated review comments, added unit test case 2014-03-24 17:54:54 +05:30
Damodar Reddy 93c46c9be8 CLOUDSTACK-6105: Initial version Windowsfication of the management server 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2014-03-24 10:54:46 +05:30
Laszlo Hornyak 265208a261 Basic tests for ApiServlet 
new tests for ApiServlet covering
 - utf8Fixup
 - some of processRequestInContext

minor cleanup done in StringBuffer handling and utf8Fixup got a bit shorter

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak 3dc4d2ec21 Removed commented-out code 
A big block of code commented out for about a year.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak dd225684f4 new unit test for ApiResponseHelper 
- unit test for getDateStringInternal
- StringBuffer replaced with StringBuilder, string concatenation replaced with append

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:46 +01:00
Laszlo Hornyak 2c4ac5e4d3 removed some redundant Boolean isntantiations 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-03-22 18:34:45 +01:00
Mike Tutkowski 7629d6f129 CLOUDSTACK-6170 2014-03-20 23:54:53 -06:00
Min Chen ea2ee15214 Add newly separated admin cmd class in ManagementServerImpl.getCommands. 2014-03-20 16:42:31 -07:00
Min Chen a1831bc864 Revert "CLOUDSTACK-6170" due to unit test failure. 
This reverts commit 50b5e2e247.
 2014-03-20 16:40:45 -07:00
Mike Tutkowski 50b5e2e247 CLOUDSTACK-6170 2014-03-20 16:52:52 -06:00
Jayapal d38cab879b CLOUDSTACK-6250 Review comments fixes for CLOUDSTACK-2692 2014-03-20 17:22:28 +05:30
Murali Reddy 2b51207510 persist fact that network can span multiple zones, if network offering 
has strechedL2Subnet capability and return the zones in which
network spans in the networkreponse object
 2014-03-20 17:01:33 +05:30
Murali Reddy d2d54a9463 region level VPC support 
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.

introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.

adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley

enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities

make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC

in region level vpc, let the network/tier to be created in any zone of
the region

keep zoneid as required param for createVpc

skip external guest network guru if 'Connectivy' service is present in
network offering

fix build break in contrail manager

permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet

add integration tests for region level VPC

rebase to master

Conflicts:
	setup/db/db/schema-430to440.sql

Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	engine/schema/src/com/cloud/network/vpc/VpcVO.java
	setup/db/db/schema-430to440.sql
 2014-03-20 16:32:22 +05:30
Murali Reddy c838f3abb8 fix scripts that handle setting up bridge for tunnel network and for 
distributed routing. Fix ensures there is approproate flag in other
config of the network to indicate the bridge type.

Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2014-03-20 16:30:07 +05:30
Prachi Damle c3ee01cca1 More changes to support 'readOnly' access 2014-03-19 11:00:23 -07:00
Jayapal 289ac0465c CLOUDSTACK-6240 Fixed updating advanced SG rules for vm nic secondary ip 2014-03-19 15:46:15 +05:30
Min Chen 6e034cad03 Refactor listNetworks logic to use new IAM model. 2014-03-18 17:02:22 -07:00
Kelven Yang ce1e53f451 Fix style-check issue after cherry-picks 2014-03-18 17:00:08 -07:00
Kelven Yang d9506d2a05 Let VMSync be aware of HA take-over on VM state management. 2014-03-18 16:45:45 -07:00
Nitin Mehta 5d19a936a2 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature 
Work done for network offering.
 2014-03-18 14:00:55 -07:00
Nitin Mehta 7442b56fa8 CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature 
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
 2014-03-18 14:00:25 -07:00
Min Chen 22eb5eb2d6 Fix a regression caused by IAM search criteria refactor on VPC. 2014-03-18 10:41:55 -07:00
Marcus Sorensen d638d04cbf CLOUDSTACK-6181: Merge of resize root feature (resize-root branch) 2014-03-14 07:17:33 -06:00
Min Chen ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate 
entityType.
 2014-03-17 17:19:55 -07:00
Alena Prokharchyk 78a04c5315 CLOUDSTACK-6235: listSystemVms - retrieve vlan info of EIP address only when ip address can be found in the DB 2014-03-16 16:29:56 -07:00
Alena Prokharchyk d9e1c9c502 CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2014-03-14 11:57:58 -07:00
Daan Hoogland 3aee404a49 findbugs: removed unused variable 2014-03-14 18:50:43 +01:00
Jayapal 384eeaf792 CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips 2014-03-14 22:47:17 +05:30
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Saksham Srivastava 48f8a95b06 CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level. 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2014-03-14 12:16:46 +05:30