7128 Commits

Author SHA1 Message Date
Anthony Xu
04cdd90a84 in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan. 2013-07-22 14:29:38 -07:00
Alex Huang
1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Alex Huang
7928963d16 Changed start to use uuid instead of generic vm start 2013-07-22 11:46:33 -07:00
Alena Prokharchyk
d0422904d7 CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account
Conflicts:
	server/src/com/cloud/api/ApiServer.java
2013-07-22 10:28:42 -07:00
Sheng Yang
2df1d7f328 Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"
This reverts commit f99d599930a4bc1bfcdfd44d4f088cdae58890e5.

Due to it break vpc function and block regression test.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
2013-07-21 22:23:48 -07:00
Min Chen
d423a755f5 CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
2013-07-20 18:01:49 -07:00
Min Chen
6689e83d7f CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results
when id and zoneid are passed.
2013-07-20 15:18:33 -07:00
Harikrishna Patnala
78f1092df1 CLOUDSTACK-3365: cluster level parameters cluster.(cpu/memory).allocated.capacity.notificationthreshold is not considering overcommit value 2013-07-20 16:53:45 +05:30
frank
0633608f80 CLOUDSTACK-3453
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
2013-07-19 16:16:41 -07:00
Edison Su
cd6853cc1a CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.
Signed-off-by: Edison Su <sudison@gmail.com>

Conflicts:

	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
2013-07-19 13:26:19 -07:00
Alena Prokharchyk
823c72552e InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it 2013-07-19 13:20:57 -07:00
Murali Reddy
a5dcb27547 CLOUDSTACK-3640: [Usage][GSLB] usage events are not generated for GSLB
geneating usage events for create/delete of GSLB rule
2013-07-19 18:45:36 +05:30
Murali Reddy
28aaa7534a CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
for portable IPs

generating usage events for acquire/release of portable IP
2013-07-19 18:45:14 +05:30
Sanjay Tripathi
3771e8a0e6 CLOUDSTACK-3496: [Regression]Primary Storage resource usage is not getting updated if detached volume is deleted 2013-07-19 16:04:36 +05:30
Sanjay Tripathi
539eb38908 CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly.
The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result.
2013-07-19 16:04:10 +05:30
Devdeep Singh
bd54fa13a3 CLOUDSTACK-3661: Fix for IndexOutOfBoundException in connect process to SSVM. 2013-07-19 13:03:21 +05:30
Harikrishna Patnala
03fac83180 CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-19 11:55:32 +05:30
Alex Huang
5af61a85ae Fixed build. Not sure why it didn't come up on my compile before the commit 2013-07-18 22:53:30 -07:00
Alex Huang
b18c72626b Moved the SprintUtils which is for testing only to be in test directory. Changed pom.xml for different projects to use the utils test-jar. Removed some @Component annotations. Moved majority of the dependencies from cloudstack pom to utils pom 2013-07-18 21:53:51 -07:00
Mike Tutkowski
b43a2a5fae Changes related to Review Board comments 2013-07-18 20:10:58 -06:00
Min Chen
e1c17bd853 CLOUDSTACK-3513: add debug message to diagnose copyIso issue on
automation setup where DownloadCommand is never sent.
2013-07-18 16:08:29 -07:00
Prachi Damle
463a3aba71 CLOUDSTACK-3451 Parallel deployment - Xenserver - When deploying 30 Vms in parallel, some of the Vm deployment fails when “applying dhcp entry/applying userdata and password entry on router” and retry eventually happens when they succeed.
Changes:
- Passing the avoid set generated by the first pass of deployment to the second try.
- The second try is done, when the first pass that uses a reserved plan fails to deploy on the reserved host, to search over the entire zone again
2013-07-18 15:32:30 -07:00
Min Chen
598a647105 ListIsos only shows cross-zone ISO in one zone. 2013-07-18 10:56:45 -07:00
Devdeep Singh
876a7b3361 Add VHDX image support, which is missing from DiskFormat class, revised ImageFormat interface, StorageManager implementation, and the application component spec. 2013-07-18 18:58:05 +05:30
Prasanna Santhanam
0c5b698ac8 CLOUDSTACK-3633: AffinityGroupResponse does not include uuid
The uuid->id of the affinity group created is not included as part of
the response. Included the uuid.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit fbf38a35d286a3c9da38e42d3a2675169775bb27)

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-18 18:31:23 +05:30
Harikrishna Patnala
b4662af0a9 CLOUDSTACK-3551: scaling up VM to service offering with 2gbram
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-18 15:04:20 +05:30
ahuang
11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
Min Chen
cb2a84241b CLOUDSTACK-3513: [Automation] Failed to copy iso and template between
zones.
2013-07-17 17:31:50 -07:00
ahuang
1e3e131e14 Save the zone and pod 2013-07-17 17:14:30 -07:00
ahuang
cb5ab37916 Fixed the account id 2013-07-17 16:21:14 -07:00
ahuang
541f9d7f9c Changed allocate method to be virtual machine type agnostic 2013-07-17 15:58:46 -07:00
Saksham Srivastava
e8e207863c CLOUDSTACK-3476:deleteDomain api should fail when release dedicated resource to that domain fails 2013-07-17 11:25:39 -07:00
Bharat Kumar
f76bf5b053 Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 15:22:33 +05:30
Sanjay Tripathi
21b1c9449a CLOUDSTACK-3376: NPE: resource count calculation from the account manager on account cleanup
This issue is happing because of the steps the code follow to cleanup the account.
The cleanupAccount was deleting the entries from the resource_limit and
resource_count table and performing further cleaning afterwards. Ideally, deletion
of entries from resourceLimit and resourceCount should be the last step in
cleanupAccount process.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-17 12:39:16 +05:30
Bharat Kumar
d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Abhinandan Prateek
954e197813 Cloudstack-2997: maxconn missing param 2013-07-17 10:06:11 +05:30
Bharat Kumar
dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Bharat Kumar
6b549074fa Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Edison Su
bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
Sheng Yang
86bbe211f2 CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
2013-07-16 17:26:51 -07:00
Vijayendra Bhamidipati
fff763ef81 CLOUDSTACK-3514: [Automation] Vmware - Failed to download default template for first zone
Description:

    Fixing reference to null object.
2013-07-16 16:14:51 -07:00
Sheng Yang
43ebb1c822 CLOUDSTACK-1670: Fix the order of user vm's multiple nics
They should follow the order of networkIds parameter of deployVMCmd(). And eth0
would be always on default network.
2013-07-16 16:07:36 -07:00
Prachi Damle
ee664a1cac CLOUDSTACK-2159 Anti-Affinity - When "HostAntiAffinityProcessor" plugin is not included in the deployment , deployVirtualMachine() command does not error out when passing the affiitygroupnames parameter.
Changes:
- Added a check during vm deployment to see if a processor for the affinity group type is available
2013-07-16 15:48:07 -07:00
ahuang
11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Prachi Damle
fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle
661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Likitha Shetty
d7122bc144 CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref. 2013-07-16 14:53:58 +05:30
Likitha Shetty
33d6f7a8c4 Revert "CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref."
This reverts commit 22ddc3fa0644b9dae6bbbc6e87d425d11f574f30.
2013-07-16 14:10:28 +05:30
Likitha Shetty
22ddc3fa06 CLOUDSTACK-3293. DeleteAccount fails with ConstraintViolation on snapshot_store_ref. 2013-07-16 13:45:11 +05:30
Devdeep Singh
04a8682313 CLOUDSTACK-3545: NPE in listStoragePoolsForMigration api. The volume table no longer holds
the pod id, the column is null now. Made a change to get the pod id from the storage pool
on which the volume resides.
2013-07-16 12:01:28 +05:30