20996 Commits

Author SHA1 Message Date
Brian Federle
1f0dd7cc36 CLOUDSTACK-4931: Instance wizard: use fn to hide/show template root size 2013-10-23 09:58:38 -07:00
Wei Zhou
69b131fa15 CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
(cherry picked from commit a94acc5a43aeaf5f18f1912e2653a92f6041a6e5)
2013-10-23 17:04:02 +02:00
Kishan Kavala
294b0c7277 CLOUDSTACK-4921 : Add usage service to chkconfig 2013-10-23 16:05:12 +05:30
Sateesh Chodapuneedi
00e57c0713 CLOUDSTACK-4911 [Mixed Hypervisor] VM Status is marked as alive when exit status of ping command is not available within command timeout
Supplementing the fix/commit 748315620bbbc472652e38df960d136beee4882e
While remote executing commands through ssh, wait for channel condition of EXIT_STATUS.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-10-23 08:51:43 +05:30
Santhosh Edukulla
d4072c6daa Added few changes related to bug 4920. Removed unwanted code
There were few unwanted calls as part of test client, did some clean up
Made the test client API uniform to accept both mgmt and dbsvr details
Did some minor bug fixes as well.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-23 13:53:43 +05:30
Laszlo Hornyak
eb33dc51e4 added license header to test
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 07:53:43 +02:00
Anthony Xu
6640f4d928 CLOUDSTACK-4649:
vm sync tracks the pv driver version for xenserver

 Anthony
2013-10-22 17:55:35 -07:00
Anthony Xu
e33ae74067 CLOUDSTACK-4649:
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.

Anthony
2013-10-22 17:54:51 -07:00
Frank.Zhang
aca6c420b4 follow up fix for CLOUDSTACK-1049
add license header to cloudstack-sccs
2013-10-22 15:53:55 -07:00
rayeesn
c5c5e2367e follow up fix for CLOUDSTACK-1049 2013-10-22 15:29:15 -07:00
Laszlo Hornyak
eb798d3198 Test for AgentShell.loadProperties
- stream closed after properties load (with commons io)
- test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:09 +02:00
Laszlo Hornyak
8d67e15365 Test for AgentShell.parseCommand
- minor cleanups on the method body
  - java 1.5 for loop
  - paramName and paramValue to make the code more readable
  - NumbersUtil replaced by NumberUtils
- Test case for the parseCommand

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:09 +02:00
Laszlo Hornyak
a98e038620 removed unused import
just an unused import, nothing extraordinary

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:09 +02:00
Laszlo Hornyak
5d5acadc8b removed unused static field
- s_httpClientManager was not used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:09 +02:00
Laszlo Hornyak
847274f31f Some StringBuffers replaced by StringBuilders
StringBuffers replaced by StringBuilders to avoid unnecesary synchronization overhead.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:08 +02:00
Alena Prokharchyk
d79135f4e6 CLOUDSTACK-4649: allow to update template details with addResourceDetails API
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 14:01:54 -07:00
Alena Prokharchyk
3ec14c4baf CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter)
Conflicts:
	api/src/org/apache/cloudstack/api/response/UserVmResponse.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/api/query/vo/UserVmJoinVO.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 13:50:43 -07:00
Brian Federle
43b18025e3 CLOUDSTACK-4758: Add 'root disk size' field
Add 'root disk size' slider to instance wizard UI, under select
template/iso, if the selected template's size is able to be customized.
2013-10-22 11:45:18 -07:00
Jessica Wang
5795664bd2 CLOUDSTACK-4925: UI > dialog widget > extend isChecked property to take function type (it takes only boolean type before this check-in). 2013-10-22 11:31:28 -07:00
Brian Federle
b04b6a0fbe Whitespace cleanup on index.jsp 2013-10-22 10:44:15 -07:00
Brian Federle
ae7b0c50db Cleanup formatting on index.jsp, to comply with indentation standards 2013-10-22 10:43:15 -07:00
Alena Prokharchyk
8685661339 CLOUDSTACK-4743: durning the accountCleanup, never attempt to release the public ips when the guest networks of the account failed to cleanup 2013-10-22 09:48:46 -07:00
Wei Zhou
0f976fd328 CLOUDSTAC.K-4923: add missing Network limits in Accounts details page 2013-10-22 15:58:17 +02:00
Saksham Srivastava
770bfe4354 CLOUDSTACK-3583: Fix for Management server stop is not removing the PID 2013-10-22 16:20:51 +05:30
dhoogland
c0c46268ac CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
Santhosh Edukulla
3f656b0434 The code module represents enum for constant comparison
This module provides facilitation to use uniform codes across various test
features. Users can import this  module and use these codes to maintain
readability and one point of change.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-22 15:38:48 +05:30
alex@alexhitchins.com
7eb05fa221 Bug 4071 - Fixed Typo In Default Text 2013-10-22 05:27:06 -04:00
Prasanna Santhanam
dfa0678fc6 marvin: a1b979da8 breaks formatting and pep8.
setup/dev/advanced.cfg is used by the simulator deployments that are
usually not https. disabled the http within this config file.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-22 11:59:14 +05:30
Santhosh Edukulla
a1b979da86 CLOUDSTACK-4832. Added support for https to marvin.
advanced.cfg: Contains three additional flags "useHttps,certCAPath,certPath"
for https usage in marvin for establishing cs connection. We will use the
configuraiton under advanced.cfg provided by user to establish connection over
https. If establishing the connection over https failed, then the default certs
will be used.  or else raise the exception, the existing http will work as it
is when useHttps flag set to "False"

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-22 11:32:10 +05:30
Harikrishna Patnala
54e365d00b CLOUDSTACK-4493: registerSSHKeyPair API doc contains wrong API response (private key) Changing the response object of register and list ssh keypairs APIs
Signed-off-by: Koushik Das <koushik@apache.org>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
2013-10-22 10:43:00 +05:30
Alena Prokharchyk
1ff5994a1c RemoveResourceDetail API - fixed response name to be lowercase to follow the rest of CS APIs' convention 2013-10-21 21:01:50 -07:00
Nitin Mehta
17dd9a832b CLOUDSTACK-3737:
Delete the uploaded volume once its copied successfully to the primary storage.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-21 14:54:42 -07:00
Alena Prokharchyk
25d6e6ec66 CLOUDSTACK-4894: DestroyVirtualMachine API - added "expunge" admin-only parameter. When passed as true, the vm gets expunged immediately (false by default to preserve the initial command behavior)
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
2013-10-21 11:11:42 -07:00
Chris Suich
5c5326f6f7 CLOUDSTACK-4910 Fixed issue with Take VM Snapshot UI always returning success 2013-10-21 10:32:41 -07:00
Sateesh Chodapuneedi
748315620b CLOUDSTACK-4911 - [Mixed Hypervisor] VM Status is marked as alive when exit status of ping command is not available within command timeout
Currently during ssh execution of remote command, if no response is received within timeout, Cloudstack is returning success result.
This is resulting in false positives. Fix is to check if exit status of remote command is available or not. If not, return failure result.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-10-21 16:34:57 +05:30
Wei Zhou
90521a3e15 allow Domain Admin to list usage records in the domain 2013-10-21 14:30:17 +02:00
Jayapal
b79b2182ef CLOUDSTACK-4624 Fixed security groups rules program issue in Advaced SG VM migration 2013-10-21 17:41:36 +05:30
Wei Zhou
cd72e2afee fix a bug in listServiceOffering with vmId 2013-10-21 14:05:53 +02:00
Wei Zhou
db890bc71e fix a bug in findAllChildren of domains 2013-10-21 14:02:53 +02:00
Hugo Trippaers
7623c4527a Fix wome warning due to conflicting xml libraries 2013-10-21 09:45:31 +01:00
Prachi Damle
9d625405d3 CLOUDSTACK-4895: Management server fails to start because snapshot policy time zones have day light savings
Changes:

-     Calendar throws IllegalArgumentException when the hour of the day happens to be skipped due to DST changes.
-     Fix will ask Calendar to adjust the time accordingly and get the next closest time
2013-10-18 17:25:14 -07:00
Jessica Wang
ebd4b8fa9f cloudstack UI: IP Addresses page > change logic of hiding/showing Acquire New IP button since args.context does contain networks property even it's from VPC section. 2013-10-18 11:57:01 -07:00
Daan Hoogland
a99694b82e [CLOUDSTACK-4849] adding lxc to the spring context 2013-10-18 14:45:36 +02:00
Murali Reddy
a3b1a49c30 CLOUDSTACK-3911: [PortableIP] there is no check while adding a zone
public range to see whether the same VLAN exists in portable IP range.

added check to enusre a VLAN id used for a public IP range is not used
for portable ip range

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-10-18 17:34:03 +05:30
Koushik Das
0c1800f70f CLOUDSTACK-4681: data disk with local disk offering are geting created on shared storage
The cluster and zone wide storage pool allocators returned shared pools even for volumes meant to be on local storage pool.
If the VM uses local disk then cluster and zone storage allocators should not handle it and return null or empty list.

Also fixed the deployment planner to avoid a cluster if
a. avoid set returned by storage pool allocators is empty OR
b. all local or shared pools in a cluster are in avoid state

Conflicts:
	engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
	engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
2013-10-18 17:10:17 +05:30
Damodar Reddy
a92095a4a6 CLOUDSTACK-4811:Fixed zone creation wizard is allowing to accept wrong sub net mask which is cauing wrong cidr value for a given ip range
Signed-off-by: Jayapal <jayapal@apache.org>
2013-10-18 15:51:51 +05:30
Murali Reddy
aaa99cd9de CLOUDSTACK-4596: CloudStack is currently allowing same ip range to be
defined in different VLANs across public and portable ranges

added checks to restric same ip range to be configure as both public ip
range and portable ip range
2013-10-18 15:38:41 +05:30
Anshul Gangwar
325c94ed60 CLOUDSTACK-2232: marvin tests for Persistent networks without running a VM 2013-10-18 14:04:46 +05:30
Sheng Yang
484d6c4eb7 CLOUDSTACK-2792: Call savepassword.sh inside VR
Also only set password when password service is running, thus avoid setting for
redundant router BACKUP router.
2013-10-17 20:04:44 -07:00
Sheng Yang
85dc65c7f7 CLOUDSTACK-4786: Reset Redundant Router priority after all the routers are stopped
This patch would reset the priority in such condition:
1. All redundant routers are stopped, e.g. due to network GC
2. User start one VM in the network
3. The routers would be brought up with reseted priority(100 & 99).

This would resolve the issue of network GC result in lower limit of redundant router priority reached.
2013-10-17 20:00:48 -07:00