df728fcf41
Include new DAO added since spring-modularization branch
2013-10-23 11:23:52 -07:00
76c22eae5b
Update to use new Transaction API
2013-10-23 11:23:18 -07:00
e3280bdba2
Merge remote-tracking branch 'origin/spring-modularization'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/nonossComponentContext.xml.in
client/tomcatconf/simulatorComponentContext.xml.in
framework/db/src/com/cloud/utils/db/Transaction.java
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
80509f9ba2
Update to new Transaction API
2013-10-23 11:03:47 -07:00
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
edeaf98117
Cleaner and more type safe Transaction API for checked exceptions
2013-10-23 10:02:43 -07:00
1f0dd7cc36
CLOUDSTACK-4931: Instance wizard: use fn to hide/show template root size
2013-10-23 09:58:38 -07:00
69b131fa15
CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
...
(cherry picked from commit a94acc5a43
2013-10-23 17:04:02 +02:00
294b0c7277
CLOUDSTACK-4921 : Add usage service to chkconfig
2013-10-23 16:05:12 +05:30
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 748315620b
2013-10-23 08:51:43 +05:30
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
eb33dc51e4
added license header to test
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 07:53:43 +02:00
6640f4d928
CLOUDSTACK-4649:
...
vm sync tracks the pv driver version for xenserver
Anthony
2013-10-22 17:55:35 -07:00
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
aca6c420b4
follow up fix for CLOUDSTACK-1049
...
add license header to cloudstack-sccs
2013-10-22 15:53:55 -07:00
c5c5e2367e
follow up fix for CLOUDSTACK-1049
2013-10-22 15:29:15 -07:00
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
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
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
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
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
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
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
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
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
b04b6a0fbe
Whitespace cleanup on index.jsp
2013-10-22 10:44:15 -07:00
ae7b0c50db
Cleanup formatting on index.jsp, to comply with indentation standards
2013-10-22 10:43:15 -07:00
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
0f976fd328
CLOUDSTAC.K-4923: add missing Network limits in Accounts details page
2013-10-22 15:58:17 +02:00
770bfe4354
CLOUDSTACK-3583: Fix for Management server stop is not removing the PID
2013-10-22 16:20:51 +05:30
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
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
7eb05fa221
Bug 4071 - Fixed Typo In Default Text
2013-10-22 05:27:06 -04:00
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
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
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
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
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
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
5c5326f6f7
CLOUDSTACK-4910 Fixed issue with Take VM Snapshot UI always returning success
2013-10-21 10:32:41 -07:00
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
90521a3e15
allow Domain Admin to list usage records in the domain
2013-10-21 14:30:17 +02:00
b79b2182ef
CLOUDSTACK-4624 Fixed security groups rules program issue in Advaced SG VM migration
2013-10-21 17:41:36 +05:30
cd72e2afee
fix a bug in listServiceOffering with vmId
2013-10-21 14:05:53 +02:00
db890bc71e
fix a bug in findAllChildren of domains
2013-10-21 14:02:53 +02:00
7623c4527a
Fix wome warning due to conflicting xml libraries
2013-10-21 09:45:31 +01:00
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
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
a99694b82e
[CLOUDSTACK-4849] adding lxc to the spring context
2013-10-18 14:45:36 +02:00
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
Darren Shepherd
Brian Federle
Wei Zhou
Kishan Kavala
Sateesh Chodapuneedi
Santhosh Edukulla
Laszlo Hornyak
Anthony Xu
Frank.Zhang
rayeesn
Alena Prokharchyk
Jessica Wang
Saksham Srivastava
dhoogland
alex@alexhitchins.com
Prasanna Santhanam
Harikrishna Patnala
Nitin Mehta
Chris Suich
Jayapal
Hugo Trippaers
Prachi Damle
Daan Hoogland
Murali Reddy