21485 Commits

Author SHA1 Message Date
Jayapal
0be4a685e8 CLOUDSTACK-5164 Unmonit for 30 minutes for a failed process 2013-11-25 15:12:48 +05:30
Girish Shilamkar
ab2c38c050 Add test/integration/component/test_add_remove_network.py 2013-11-25 13:43:18 +05:30
Gaurav Aradhye
2ba27db0ce CLOUDSTACK 2233: Automation test cases for Add Remove Networks to VM
Signed-off-by: Girish Shilamkar <girish@clogeny.com>
2013-11-25 13:15:49 +05:30
Min Chen
6227ba6356 CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from
ROOT volume fails with NullPointer Exception due to new jobs framework
merge.
2013-11-22 10:56:27 -08:00
Alena Prokharchyk
fad0cfcc18 Added new paramerer "start" to createVPC command. When false is passed in, VPC won't be started (its VPC VR won't get implemented) till the point when the first netwotrk gets implemented in the VPC.
The parameter is optional and true by default to preserve the original behavior

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
2013-11-22 09:39:54 -08:00
Jijun
4517b9277b rhel 6.x os mapping for vmware 2013-11-22 17:54:39 +01:00
Yichi Lu
8e580cc411 CLOUDSTACK-5231: add helper messages for DynamicallyScalable and Routing 2013-11-22 17:15:59 +01:00
Jessica Wang
386ee6bf34 CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > listView of Zone, Total of Virtual Routers, Virtual Routers require upgrade. 2013-11-21 16:49:48 -08:00
Jessica Wang
7b0cae6021 CLOUDSTACK-4793: UI > Virtual Routers > add "Select View" dropdown on top of listView. 2013-11-21 16:04:00 -08:00
Alena Prokharchyk
e8ec75a2b5 Removed unused agent lb timer 2013-11-21 14:29:40 -08:00
Alena Prokharchyk
7df7abf327 Added missing @Inject to the ipAddressManager
Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
2013-11-21 14:29:39 -08:00
Alena Prokharchyk
602d4ef0cf Resource metadata - support for VPC 2013-11-21 14:29:39 -08:00
Brian Federle
b4282c214f System, main routers page: Split into subsections (WIP) 2013-11-21 13:56:29 -08:00
Brian Federle
285c06865c List view: Support passing custom ID to detail view context
For section select list views, if 'id' is specied under section: {},
then use that ID instead of the section's key ID. This allows sections
to use i.e. the same ID as each other for a consistent context ID.
2013-11-21 13:56:29 -08:00
Hugo Trippaers
b689e615c5 Bump the debian package version to 4.4.0-snapshot 2013-11-21 21:03:16 +01:00
Wido den Hollander
308b7a5c37 CLOUDSTACK-1302: Allow cache_mode to be NULL in the database
Not allowing this field to be NULL broke master due to the default
data which gets loaded into the database during initial startup of the
management server.

During generation of the XML for the VM it will however default to
'none' if NULL is passed
2013-11-21 18:59:31 +01:00
Alex Huang
de6bf7470c One more merge conflict 2013-11-21 08:16:48 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
3a414a850f Add the upgrade path to all versions 2013-11-21 16:38:08 +01:00
Alex Huang
170f32f171 Broke up some long strings 2013-11-21 07:25:01 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Wido den Hollander
036fffcd7c Add upgrade path from 4.3 to 4.4 2013-11-21 15:48:01 +01:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Wido den Hollander
dc037b8d2f Revert "CLOUDSTACK-1302: Add cache mode to SQL upgrade file"
This reverts commit 7f1168cec74c704257f2d6040cd352b240d5d299.
2013-11-21 15:09:26 +01:00
Alex Huang
eaa250fd3c Formatted again after all the tab expansions and eol removals 2013-11-21 04:47:01 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang
62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Alex Huang
0232906708 Brought in Hugo's checkstyle 2013-11-21 03:09:07 -08:00
Murali Reddy
899e9f0d60 CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as
"Public IP Address" for system VMs

In system VM response object return EIP as public IP in case of basic
zone with EIP service.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2013-11-21 15:20:28 +05:30
Rajesh Battala
8c6840e489 Modified GetExternalVirtSwitch to take the switchname param and return the same or default one 2013-11-21 14:36:47 +05:30
Likitha Shetty
6aafb9c50d CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API.
During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters.
2013-11-21 13:40:06 +05:30
Wido den Hollander
7f1168cec7 CLOUDSTACK-1302: Add cache mode to SQL upgrade file
This got lost in the previous commit

Not sure though if this is the right file, since this feature won't make it into
4.3, but there is no 4.4 file.
2013-11-21 09:00:11 +01:00
Rajesh Battala
4f1821bf3a Add support of attaching nic's to the specified network labels in HyperV 2013-11-21 11:55:17 +05:30
Gaurav Aradhye
138cee401f CLOUDSTACK-5201: Correcting code related to schedule of
recurring snapshot policy
2013-11-21 11:15:32 +05:30
Ashutosh K
db2ea0a16a CLOUDSTACK-5204: test_routers - fixed ssh issue 2013-11-21 11:06:34 +05:30
Gaurav Aradhye
6aca7de291 CLOUDSTACK-5215: Correcting and refactoring code related to
getting free vlan
2013-11-21 10:53:27 +05:30
Likitha Shetty
273c912bb6 CLOUDSTACK-1868. GetVmStatsCommand throws NullPointerException with VMWare. 2013-11-21 09:39:44 +05:30
Kelven Yang
278ef81a83 side-by-side VM sync management at manager level 2013-11-20 17:59:38 -08:00
Edison Su
2d42b2d1ab Add logs in case ipassoccmd failed 2013-11-20 15:07:02 -08:00
Jessica Wang
86736d6d4a CLOUDSTACK-5222: UI > Infrastructure > Sockets > count only hosts whose type is routing. 2013-11-20 14:50:31 -08:00
Wido den Hollander
1edaa36cc6 CLOUDSTACK-1302: Allow a cache mode per disk offering
Per disk offering the setting none, writeback or writethrough can be set

This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Ian Duffy
31758ed8d0 Fix codestyle/formatting within plugins/userauthenticators/ldap 2013-11-20 14:00:08 +01:00
Rajani Karuturi
917ea33ba9 added LDAP group name label in add account wizard
changed the parameter for domain in api importLdapUser from name to UUID

improved error handling
2013-11-20 13:57:41 +01:00
Chip Childers
2febc318aa No, this field does not use CIDR notation 2013-11-20 11:10:14 +00:00
Likitha Shetty
90fb76a72c CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable. 2013-11-20 16:12:22 +05:30
fjkdf
8321ea4d78 add mgt.server.vendor global configuration, in case different vendor wants to identify its identity 2013-11-19 17:55:58 -08:00
Alex Huang
465626f6d1 Fixed issues with execute in sequence 2013-11-19 17:20:58 -08:00
Jessica Wang
829f1db6e8 CLOUDSTACK-4793: UI > Virtual Routers > add new action "Upgrade Router to Newer Template" in detailView. 2013-11-19 16:15:49 -08:00