Commit Graph

22077 Commits

Author SHA1 Message Date
Min Chen 3cd9dee1db CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as
secondary storage and zone-wide primary storage.(cherry picked from commit 900c51103a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:24:48 -08:00
Jayapal 278c54a970 CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding
(cherry picked from commit 7a71cf33ce)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:24:28 -08:00
Sanjay Tripathi 8a9b1f70b8 CLOUDSTACK-5953: In hypervisor_capabilities, max_guests_limit are
not correct for XS 6.2 or other specific version hypervisor.
(cherry picked from commit bba6b77177)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:23:33 -08:00
Anshul Gangwar cf7b62748d CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration.
(cherry picked from commit fb87c85b2a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:23:11 -08:00
Devdeep Singh 4961c1385a CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
(cherry picked from commit f0b861fede)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:39 -08:00
Devdeep Singh 9536569e1f CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
(cherry picked from commit 96d8e3c945)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:18 -08:00
Jessica Wang 74c98a1d3f CLOUDSTACK-6031: UI > infrastructure > count > pass listAll=true to all listXXXXXXX API for counting resource.
(cherry picked from commit e0dfe0ab15)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:20:17 -08:00
Rajesh Battala 3c891fcf66 Fixed agent code to handle untagged public vlan while parsing the vlan id
(cherry picked from commit 7df148c762)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:17:16 -08:00
Murali Reddy f93be7b2b6 CLOUDSTACK-5967: GRE tunnel creation is failing
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
(cherry picked from commit 2e004878b1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:52 -08:00
Hiroaki KAWAI f5b9fedb11 stratosphere-ssp plugin: Fix HttpClient4 connection leak
Replaced HttpClient#execute(HttpUriRequest) with
HttpClient#execute(HttpUriRequest,ResponseHandler<T>).
The former requires extra EntityUtils#consume(HttpEntity).
(cherry picked from commit 09e27fd7bf)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:31 -08:00
Jessica Wang f0b28794dd CLOUDSTACK-6026: UI > create network offering > pass serviceofferingid parameter instead of systemOfferingForRouter parameter to API.
(cherry picked from commit e7ec79b5f3)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:09 -08:00
Min Chen 85091e9b6b CLOUDSTACK-6027:CreateVolume from snapshot is failing with S3 on Vmware.
(cherry picked from commit d7ec9ca815)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:45 -08:00
Min Chen a439ec9b62 CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
migarting to S3 datastore.(cherry picked from commit a3caea7e0a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:18 -08:00
Min Chen 0d72e2ccf5 CLOUDSTACK-6019:CreateVolume from snapshot in NFS is throwing Warning
"sync snapshot from cache to region wide store failed for image store
test".
(cherry picked from commit b11c13d4a1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:14:55 -08:00
Sheng Yang 41e516b1a6 CLOUDSTACK-6018: Increase dnsmasq dhcp-lease-max to 2100
Would able to accomodate one /21 network then.
(cherry picked from commit 50234ea72b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:14:36 -08:00
Likitha Shetty 31d1da5681 CLOUDSTACK-6007. Restore VM command fails with NPE.
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE because CS tries to expunge a volume that has not been created in primary store.
(cherry picked from commit 92abb9439e)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:13:49 -08:00
edison bd335d01cb fix devcloud reboot issue: should not start heartbeat for devcloud 2014-02-06 14:19:29 -08:00
Min Chen 8f63c2cf9c CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root
volume with S3 as secondary storage.
(cherry picked from commit 402254337c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-03 14:05:20 -08:00
David Grizzanti 91ec548fc0 CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating
usage events are enabled

Signed-off-by: Daan Hoogland <daan@onecht.net>(cherry picked from commit 62a259ffa9)
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:10:35 -08:00
Sanjay Tripathi c0e70b51fc CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events .
(cherry picked from commit b811bc0945)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:09:52 -08:00
Likitha Shetty 5480a810a6 CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found.
(cherry picked from commit ba5b302ae6)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:08:56 -08:00
Marcus Sorensen 631ea240f4 CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
(cherry picked from commit 1aa1b3e19c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:06:36 -08:00
Koushik Das 4809d91c51 CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
(cherry picked from commit 1ae02009b5)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:06:14 -08:00
Hiroaki KAWAI 9961a8e710 Some rework stratosphere ssp plugin
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
(cherry picked from commit db3dc2ee17)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:03:11 -08:00
Hiroaki KAWAI eece5100f0 Fix mock socket client/server test.
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
(cherry picked from commit 1e9f066df2)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:02:35 -08:00
Daan Hoogland a42a345684 findbugs replaced byte[].toString() with new String(byte[]) 2014-02-02 19:50:58 +01:00
Daan Hoogland 438a4b0d5a Revert "findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)"
This reverts commit 55ec8f3a2d.
2014-02-02 19:38:49 +01:00
Daan Hoogland 8c45ab0761 findbugs Long comparison == -> equals()
(cherry picked from commit f4db8df66f)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:17:58 +01:00
Daan Hoogland 6aa3fd8a81 findbugs get from map with proper key-type
(cherry picked from commit a4f2f0b39f)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:17:21 +01:00
Daan Hoogland 5d11f9b149 findbugs explicit toString on enum for call get(Object)
(cherry picked from commit cce4a055ae)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:16:55 +01:00
Daan Hoogland 92ac450ca0 findbugs get proper object from map
(cherry picked from commit 901cf8ab32)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:16:30 +01:00
Daan Hoogland f5f22c9d3b findbugs: assign result of string manipulations
(cherry picked from commit 20127e09dc)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:15:55 +01:00
Sanjay Tripathi a5f73b7285 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
(cherry picked from commit 8024f2cc70)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 18:12:15 -08:00
Sanjay Tripathi 16dbb20b5d CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
(cherry picked from commit ae22d1990e)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 18:11:47 -08:00
Likitha Shetty e089b91385 CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade.
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
(cherry picked from commit 16c3f53793)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:59:37 -08:00
Jessica Wang 32fd3b837c CLOUDSTACK-5996: UI - In project view, the first listRotuers API(without projectid=-1) will return the same objects as the second listRouters API(with projectid=-1), because in project view, all API calls are appended with projectid=[projectID]. Therefore, we only call the second listRouters API(with projectid=-1) in non-project view.
(cherry picked from commit 713240baef)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:59:04 -08:00
Alena Prokharchyk a31eccc405 Fixed API doc that got broken by adding new commands for stratosphere ssp plugin
(cherry picked from commit 54f2234e21)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:58:30 -08:00
Daan Hoogland 55ec8f3a2d findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:57:50 -08:00
Animesh Chaturvedi 602faecafe Revertng based on mail thread discussion "Fix findbug issues within LDAP authenticator"
This reverts commit 92b4f66d73.
2014-01-30 17:55:39 -08:00
Koushik Das 523cbdda68 CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency
The fix is to fail the start operation if a vm snapshot is in progress
(cherry picked from commit 775fa0f0d0)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:54:50 -08:00
Sanjay Tripathi d7e1d38d48 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm".
(cherry picked from commit cff312ef74)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:44:48 -08:00
Jayapal ccc8aa78cd CLOUDSTACK-5966 Updated service monitoring config to start by default.
Global settings EnableServiceMonitoring param set to true
(cherry picked from commit 7255e50f20)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:42:42 -08:00
Jayapal bbe62ea134 CLOUDSTACK-5966 Update the schema-421-430.sql for EnableServiceMonitoring global setting
(cherry picked from commit 888b906776)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:42:21 -08:00
Sheng Yang 6f7653d56a CLOUDSTACK-5986: Make dnsmasq handle dnsmasq.leases when dhcp_release is available
The original issue has been exposed due to CloudStack VR would modify the
dnsmasq.leases, thus make it unsync with dnsmasq's memory lease.

Make the modification to let dnsmasq handle the lease file if dhcp_release is
available.
(cherry picked from commit 441d02dd40)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:40:17 -08:00
Alena Prokharchyk 45e45b930a LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller
Conflicts:
	server/src/com/cloud/api/query/QueryManagerImpl.java
(cherry picked from commit b1d4c06ad1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:39:28 -08:00
Animesh Chaturvedi 210b19c1f5 Reverting this change as it caused issues with userVmResponse. "Findbugs: different issues solved"
This reverts commit dcda79e2c0.
2014-01-30 15:33:31 -08:00
Jessica Wang 2f2adad508 CLOUDSTACK-5970: UI > network menu > guest network section > select non-VPC isolated network with SourceNAT enabled > IP Address section > select sourceNAT IP > show Configuration tab.
(cherry picked from commit 1ad7bce69b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-29 15:57:01 -08:00
Daan Hoogland d6bbfbbc59 findbugs: nullpointer guards and wrappertype comparisons 2014-01-29 21:44:06 +01:00
Daan Hoogland dcda79e2c0 Findbugs: different issues solved 2014-01-29 21:40:21 +01:00
Daan Hoogland 1fb32b58eb findbugs: null-checks 2014-01-29 21:39:11 +01:00