21711 Commits

Author SHA1 Message Date
Alena Prokharchyk
eb9147f709 Fixed code style errors in cloud-apidoc project 2013-12-12 16:39:02 -08:00
Alena Prokharchyk
9df10718e4 Resource metadata support for S2SVpnConnection
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -08:00
Jessica Wang
d5fcc6ef5a CLOUDSTACK-5345: UI > Infrastructure > virtual routers > no grouping > hide Upgrade Router to Use Newer Template action when a router has latest version (i.e. does not require upgrade). 2013-12-12 16:06:11 -08:00
Alena Prokharchyk
523d9dc3c0 Resource metadata support for customer gateway 2013-12-12 14:18:20 -08:00
Nitin Mehta
b084cc469a CLOUDSTACK-5283:
Not able to list snapshots when few snapshots are in "CreatedOnPrimary" state. Dont throw an exception when snapshot doesnt have an entry in the snapshot store ref for the snapshot in Image store because that fails to list all snapshots and also it can a perfect use case when the backup flag is not turned on.
2013-12-12 13:18:56 -08:00
Alex Huang
cf0a11e45a pull merges 2013-12-12 13:00:26 -08:00
Alex Huang
0c2a4b251a Everything now builds 2013-12-12 12:26:08 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alex Huang
f33b247fc3 Moved the checkstyle project from parents to build to store all build tools in one location. Modified the config file to use 1024 for now. 2013-12-12 12:23:49 -08:00
Alena Prokharchyk
9a21afb50b Resource metadata support for customer gateway
Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b Resource metadata support for Site2SiteVpnGateway
Conflicts:
	setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -08:00
Alena Prokharchyk
958b890f55 Added vhd-util to .gitignore 2013-12-12 10:14:41 -08:00
Antonio Fornie
7833dd592c JUnit test for NetworkACLManagerImpl#applyNetworkACL
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 15:01:51 +01:00
Kishan Kavala
fa38a7a409 Upgrade router template by accountName and domainId instead of accountId
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-12 18:28:30 +05:30
Antonio Fornie
e08f64e6ae Fix several Resource Leak issues related to not closed PStmts and ResultSets
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 13:24:22 +01:00
SrikanteswaraRao Talluri
8374ff591d CLOUDSTACK-5449: fixed pep8 errors
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-12 17:10:37 +05:30
Rajani Karuturi
ca1e10398d CLOUDSTACK-5454 added upgrade path from 4.2.1 to 4.3
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-12-12 15:36:03 +05:30
Donal Lafferty
ffd1a078d4 CLOUDSTACK-5462: Hyperv agent confused by existing volume of different
image type. Works by avoiding volume image format inference errors and
removing existing files with same name, but different format.
2013-12-12 14:56:37 +05:30
Devdeep Singh
bdbc5f2ae3 CLOUDSTACK-5473: Fixed the name with which the hyper-v agent gets
installed as a service.
2013-12-12 14:56:29 +05:30
Abhinandan Prateek
bbeb164abf CLOUDSTACK-5259: added 32 bit support for vhd-util 2013-12-12 14:48:08 +05:30
Min Chen
5dccaa1832 CLOUDSTACK-5454: Delete previous template and snapshot after migrating
NFS to S3 throws Error.
2013-12-11 16:54:40 -08:00
Kelven Yang
26c1ba296c CLOUDSTACK-669: put user vm work under new vmsync model 2013-12-11 16:29:59 -08:00
Jessica Wang
9ed2c2e224 CLOUDSTACK-4793: UI > Virtual Routers > Select View > add "group by account". 2013-12-11 15:31:04 -08:00
Min Chen
df1c34bf2b CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3,
previous Ready template is not ready anymore.
2013-12-11 14:18:06 -08:00
Min Chen
010b007ee4 CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
Devdeep Singh
78b39bbe12 CLOUDSTACK-5455: Fix detach iso on hyperv. Made sure normalized path is
used while attaching and detaching iso. Also made normalization of path
across the agent code.
2013-12-11 19:42:36 +05:30
Santhosh Edukulla
e498bf00d4 CLOUDSTACK-5443: Fixed the issue. 2013-12-11 19:37:29 +05:30
Devdeep Singh
2b1d997728 CLOUDSTACK-5248: Fixed creation of mount point when running as non root (cloud) user.
The systemvm iso file is copied only when a systemvm or router vm is to be started on
a host. The file gets copied to the secondary storage. The mount point used is the one
that has permissions for regular user to mount a share.
CLOUDSTACK-5275: The failure was because a secondary storage wasn't available when the
host was added. When a setup is done through wizard the hosts get added before the
secondary storage. CS was tying to copy yhe systemvm iso to secondary and it used to
fail if it wasn't available. Made a change to copy the iso only when a systemvm is
being started on a host.
CLOUDSTACK-5202: Made changes to clean up mount points on stop and start.

All the three are related fixes; so putting a fix in one commit.
2013-12-11 17:50:13 +05:30
Santhosh Edukulla
ab025f0269 Fixed CLOUDSTACK-5436
Fixed few RAT issues reported for new additions of files to repo.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-12-11 15:33:52 +05:30
Rajani Karuturi
db8f83d71b CLOUDSTACK-5375 :ldapconfig and ldapRemove api's are not working Added support for 4.2 ldap apis
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-12-11 15:30:03 +05:30
tuna
a3b7248a16 enable stp on ovstunnel 2013-12-11 15:58:32 +07:00
Jayapal
b385cb4f7a Fixed test case failures in network acl 2013-12-11 14:20:11 +05:30
Bharat Kumar
36cbc2dfbf CLOUDSTACK-4498 we should not reserve memory and cpu for vmware VMs if the
vmware.reserve.cpu and vmware.reserve.mem are set to false while not overcommiting

Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-11 13:07:56 +05:30
Santhosh Edukulla
d715058fa1 Added a temp sleep fix for vm start command
Added a temporary time sleep fix post a restart command. Applies to 4.2,master,4.3
Note: Has to clean other things as well and will do more cleaner way of handling things.
2013-12-11 13:04:17 +05:30
Girish Shilamkar
623529060f Revert "Fixed an Issue reported by xen server team"
The commit message is incorrect.
This reverts commit ed477744c85a7d9024c5b765e7fe7a15ec46da2a.
2013-12-11 12:37:52 +05:30
Santhosh Edukulla
ed477744c8 Fixed an Issue reported by xen server team 2013-12-11 12:20:06 +05:30
Jayapal
27ee78fe0a CLOUDSTACK-5244 Fixed issue with applying acl items of acl to private gateway 2013-12-11 11:02:15 +05:30
Sheng Yang
e02682327d CLOUDSTACK-5453: Fix VPN connection monitoring in KVM
It's broken by:

commit 7f104b1feb489ae09b1a2060262a122deda44a8e
Author: Edison Su <sudison@gmail.com>
Date: Fri Oct 12 18:24:50 2012 -0700

    [PATCH] CLOUDSTACK-335: fix lb for vpc on kvm
2013-12-10 17:36:12 -08:00
Jessica Wang
28a4bfc559 CLOUDSTACK-5412: UI > Add Secondary Storage > NFS Server field > change label from "NFS Server" to "Server" since this field is also shown when provider "SMB/CIFS" is elected. 2013-12-10 16:07:15 -08:00
Jessica Wang
9ea949e80c CLOUDSTACK-5341: UI > Infrastructure > secondary storage > add secondary storage > Create NFS Secondary Staging Store checkbox > make this checkbox not disabled any more because NFS staging (of a zone) might already exist (from "NFS secondary storage => Prepare Object Store Migration => NFS staging") 2013-12-10 15:38:32 -08:00
Brian Federle
a9258ae807 Volumes page: Hide add/upload action if instance selected, to reduce confusion. 2013-12-10 15:20:39 -08:00
Brian Federle
248195fcd7 List view: Fix context not being passed correctly to header actions pre-filter 2013-12-10 15:20:39 -08:00
Jessica Wang
93ba232eea CLOUDSTACK-5252: UI > Infrastructure > Virtual Routers > Select view: group by zone/pod/cluster > (1) pass listAll=true to listRouters. (2) reduce redundant API call. 2013-12-10 14:41:45 -08:00
SrikanteswaraRao Talluri
a9d96aff06 CLOUDSTACK-5449: fix the log creation failure case and added an option
for user to provide --log-folder-path=

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-12-11 01:57:44 +05:30
Santhosh Edukulla
3144e01c13 CLOUDSTACK-5423: Fixed 5423 2013-12-10 20:25:23 +05:30
Ashutosh K
ae911a2ad2 CLOUDSTACK-4820: Remove netacl check from test_01_wait_network_gc
From 4.2, network ACLs are no longer associated with a single network.
Multiple tiers within a VPC can share the same ACL.
Due to this, ACLs should not be cleaned up during network GC.
2013-12-10 00:58:58 -05:00
Girish Shilamkar
a55f108285 CLOUDSTACK-5405: Changed marvin to create sg in account into which vm is deployed 2013-12-10 00:27:49 -05:00
Harikrishna Patnala
5036097659 CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-10 16:49:44 +05:30
Anthony Xu
1ddc0b99fe put CS/XS plugin log into seperate directory 2013-12-10 01:23:46 -08:00
Jayapal
5c12250dea CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
1. Egress default policy rules is send to the firewall provider. It is up to the
    provider to configure the rules.
   2. The default policy rules are send for both allow and deny default policy.
   3. On network shutdown rules for delete are send.
   4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:19:03 +05:30