21799 Commits

Author SHA1 Message Date
Nitin Mehta
6b62a04eaf CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
Nitin Mehta
f083f91b0b CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Brian Federle
08a69b0053 CLOUDSTACK-5544: Snapshot action filter: Remove check on volume state
Removes conditional check of volume state for snapshot action filter,
since it causes a null pointer when trying to access view outside the storage
section. Now only '.revertable' attribute is checked. Storage state should now
be verified at the API level only.
2013-12-20 13:48:21 -08:00
Alena Prokharchyk
1832cf6660 CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet. 2013-12-20 13:39:13 -08:00
Brian Federle
932758e2ef CLOUDSTACK-5551: Pass search 'name' field to listConfigurations UI
Passes search bar value (by 'name') for the settings in the following sections'
detail views:

-Account
-Primary storage
-Cluster
-Zone
2013-12-20 13:38:46 -08:00
Edison Su
9947e688c4 CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
2013-12-20 12:45:02 -08:00
Edison Su
e52a4d9306 CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
Edison Su
179cdea8e9 CLOUDSTACK-5596: reload vm state after vm been force stopped
Conflicts:

	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
Daan Hoogland
7b0c85da3c CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null 2013-12-20 13:46:58 +01:00
Rajani Karuturi
50a428c3aa CLOUDSTACK-4886: printing ****** to stdout instead of db users password 2013-12-20 17:38:39 +05:30
Devdeep Singh
74cb4b1c5a CLOUDSTACK-5555: Fixing booting a vm on hyperv with data disk. Made
changes to attach a data disk on scsi controller when a vm is being
created.
2013-12-20 17:12:59 +05:30
Devdeep Singh
0182a18797 CLOUDSTACK-5311: Fixing the hypervisor version in capabilities table. 2013-12-20 11:26:56 +05:30
Marcus Sorensen
7644b92a8b account for vxlan interfaces named vx<vni> 2013-12-19 17:42:42 -07:00
Edison Su
62bb5d8848 fix checkstyle 2013-12-19 15:05:58 -08:00
Edison Su
0824c78761 CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
Conflicts:

	engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java

Conflicts:

	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
Edison Su
8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
Edison Su
c40d03b417 CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
	engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
edison su
9c77f68095 Revert "Remove uncessary changes."
This reverts commit fcab2b776a252de4e6159de76b89f4fc776d5bca.
2013-12-19 13:35:52 -08:00
edison su
336241be76 Remove uncessary changes. 2013-12-19 13:35:37 -08:00
edison su
02ace3442d 0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to- 2013-12-19 13:35:21 -08:00
edison su
864c91ba7f Add AUTO_INCREMENT in details dao 2013-12-19 13:35:15 -08:00
edison su
a3fade86b2 Fix snapshot details dao 2013-12-19 13:35:08 -08:00
Harikrishna Patnala
227567cf6c CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value 2013-12-19 22:56:34 +05:30
Damodar Reddy
9190b03056 CLOUDSTACK-5457: DBHA features is broken due to RuntimeException thrown from underlying layer. Fixed my catching in ClusterManagerImpl
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-19 17:07:13 +05:30
Kishan Kavala
29b90e7a5c CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc885ee5e9a5d4bb3003bef651c849d6 Commented the exception. 2013-12-19 16:17:37 +05:30
Harikrishna Patnala
707da55fe3 CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
Koushik Das
f2fab9d5b1 CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
2013-12-19 14:15:39 +05:30
Jayapal
26858c16ee CLOUDSTACK-4535 Fixed issue in PF in connecting from private nw when public and private ports are different 2013-12-19 10:57:18 +05:30
Gaurav Aradhye
33fb241fdf CLOUDSTACK-4780: Changes related to checking snapshot on NFS server 2013-12-19 10:21:33 +05:30
Nitin Mehta
13ba5e45a1 CLOUDSTACK-4941:
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 18:56:12 -08:00
Nitin Mehta
1c0b8db01b CLOUDSTACK-4941:
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Kelven Yang
3c965d0685 CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations 2013-12-18 16:14:07 -08:00
Min Chen
afcf967d24 Revert "CLOUDSTACK-4941:"
This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
2013-12-18 16:01:37 -08:00
Min Chen
bb91b739a8 CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store. 2013-12-18 15:44:00 -08:00
Nitin Mehta
231e7c01f2 CLOUDSTACK-4941:
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Jessica Wang
5fb80f90f0 CLOUDSTACK-4738: UI > VM Wizard > select compute offering step > make Number of CPU Cores/CPU/Memory field required when selected compute offering is customized. 2013-12-18 14:49:24 -08:00
Brian Federle
15a860d560 Add missing strings for LDAP section, S3 fields 2013-12-18 13:29:25 -08:00
Brian Federle
34174bbcbb Add missing strings for quiesce VM, SMB fields 2013-12-18 13:10:15 -08:00
Daan Hoogland
2e91cbe1ae rats 2013-12-18 14:30:26 +01:00
Kishan Kavala
cc27a740dc CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
Conflicts:
	server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30
Antonio Fornie
55a6df4501 Resources leaks, refactoring and testing
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)

Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)

Create Unit and Integration Tests for UsageSanityChecker

Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
2013-12-18 10:55:04 +01:00
Jayapal
961834661c CLOUDSTACK-5466:Fixed freeing ip address in removeIpFromNic 2013-12-18 14:49:47 +05:30
Kishan Kavala
d810ab46fe Revert "reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test"
This reverts commit f4ee1a8115cd927ce15feb9af60b18d108dcd6e7.
2013-12-18 14:43:25 +05:30
Jayapal
96309a7867 Fixed issue in getting interface number in IpAssocVpcCommand
Regression from the below commit

commit 494ccd821d711a2957531d1c33274ed293e4d925
Author: ynojima <mail@ynojima.net>
Date:   Wed Nov 6 11:02:56 2013 -0700
    Bugfix: VR has double NICs connected to Public network
2013-12-18 12:06:50 +05:30
Harikrishna Patnala
55237f8b15 CLOUDSTACK-5507: Unable to add XenServer 5.6 host to cloudstack
Fixed "ImportError: No module named cloudstack_pluginlib" on Xenserver 5.6

Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-18 12:03:03 +05:30
Min Chen
e53081fe26 CLOUDSTACK-5534: MySQL exception raised when searching for users with
keyword.
2013-12-17 16:58:22 -08:00
Sheng Yang
e54d1dec9d CLOUDSTACK-5533: Disable VR's DNS functionality if user choose to use external dns
Also fix the regression that external dns won't be used if "dns" service in the
network offering is unset.
2013-12-17 16:06:58 -08:00
Brian Federle
c7e2914bcd CLOUDSTACK-5476: Fix missing settings tab on zone details 2013-12-17 15:42:00 -08:00
Alex Huang
f4ee1a8115 reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test 2013-12-17 15:16:48 -08:00
Prachi Damle
6d6d11f7a4 CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
Changes:
- Removing the trailing spaces in the file
2013-12-17 14:55:59 -08:00