Commit Graph

23311 Commits

Author SHA1 Message Date
Kishan Kavala 3a3fec3cb6 CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
Conflicts:
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
2013-12-16 18:02:43 +05:30
Likitha Shetty 7cac5aa9fc CLOUDSTACK-5514. Response of listAccounts API call includes removed users 2013-12-16 15:53:08 +05:30
Sebastien Goasguen 09a45d402e Merge remote-tracking branch 'upstream/master' 2013-12-16 10:24:13 +01:00
Sebastien Goasguen 9a707a92c5 Adding travis icon [ci skip] 2013-12-16 09:52:16 +01:00
Girish Shilamkar 75f4f55c35 CLOUDSTACK-5506: Fixed egress_fw_rules.py, one of hunks was missing. 2013-12-16 14:00:38 +05:30
Sebastien Goasguen d55e218999 basic travis config 2013-12-16 09:28:09 +01:00
Anthony Xu a44459d6dd add license header for new file 2013-12-15 17:40:39 -08:00
Min Chen 46d1e1afb2 CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
2013-12-13 22:04:29 -08:00
Prachi Damle 3f092d14cc Adding the AclEntityType attribute to APICommand annotation 2013-12-13 16:04:25 -08:00
Jessica Wang 420e7aed1f CLOUDSTACK-5098: UI > VMware > during zone creation, after addVmwareDc succeeds, if addClsuter fails (e.g. because of wrong input value), zone detail page will show wrong button ("Add Vmware Datacenter") since listVmwareDcs is only called when a zone has a VMware cluster.
To resolve this specific use case, change UI to use listApis instead of listClusters to determine whether to call listVmwareDcs.
2013-12-13 15:51:11 -08:00
Jessica Wang 5dc1d46c6d CLOUDSTACK-5345: UI > Infrastructure > virtual routers > group by zone/pod/cluster/account > hide Upgrade Router to Use Newer Template action when upgrade is not required (i.e. all rouster under the zone/pod/cluster/account have latest version). 2013-12-13 14:00:14 -08:00
Brian Federle 44f71f06e2 CLOUDSTACK-5477: Fix view all link breaking detail view
Fixes issue where 'view all' link permanently writes properties to
cloudStack namespace, causing breakage when viewing detail view from
another location.
2013-12-13 10:37:40 -08:00
Brian Federle 8821d75442 CLOUDSTACK-5480: Fix broken password confirm validation
Properly destroy add account dialog on close, to fix password confirm
validation pointing to wrong dialog's field.
2013-12-13 08:48:22 -08:00
Hugo Trippaers 1cc68ae6c6 The python module perfmon is not installed by default on XenServer, so be carefull about importing it without checks 2013-12-13 13:36:22 +01:00
Rajani Karuturi b54ac9a635 CLOUDSTACK-5483 : Failed to start management server when db
encryption is enabled When db encryption is enabled, the server expects all
 secure,hidden fields in encrypted form. moved the insert statements which has
 dafault values to java and populated encrypted values if encryption is
 enabled.
2013-12-13 17:44:24 +05:30
Rajani Karuturi 1d5051f60e CLOUDSTACK-5435 enabled encryption for ldap params 2013-12-13 17:44:24 +05:30
Devdeep Singh 86dadaaec4 CLOUDSTACK-5489: Cloud user doesn't have permissions to copy systemvm.iso to secondary.
Make sure when a cifs (secondary) is mounted, uid is set for the user who owns the files
and directories on the filesystem.
2013-12-13 17:32:34 +05:30
Wei Zhou 880c87e704 CLOUDSTACK-5481: fix ui bug when regular user add isolated network
(cherry picked from commit 5cec27c858)
2013-12-13 10:30:19 +01:00
Jayapal bd54ed8071 CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart 2013-12-13 14:45:44 +05:30
Devdeep Singh db2b8d9b0d CLOUDSTACK-5311: Fix the host version reported by the hyper-v agent. Also updated the hypervisor
capabilities for hyper-v.
2013-12-13 10:28:17 +05:30
Min Chen d2922b9254 Separate ListAccounts cmd to use two different views. 2013-12-12 17:52:45 -08:00
Min Chen 312ff76f69 Separate listZones cmd to use two different views, also renamed previous
listZonesByCmd to listZonesCmd.
2013-12-12 17:40:30 -08:00
Min Chen a6d03cd826 Separate IpAddress related cmds to use two different views. 2013-12-12 17:20:34 -08:00
Alex Huang affe7efc82 Have the check happen earlier 2013-12-12 17:05:24 -08:00
Alex Huang f1eadc09e6 Fixed problem with checkstyle 2013-12-12 16:57:38 -08:00
Min Chen add277a4aa Separate network and VPC related cmd to use two different views. 2013-12-12 16:53:59 -08:00
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
Prachi Damle 7c6f1c14c2 ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and 2013-12-12 16:31:00 -08:00
Prachi Damle d2c74bcf14 Changes to RoleBasedEntityAccessChecker to replace Role by Policy 2013-12-12 16:30:56 -08:00
Prachi Damle 1a985227b5 Changes to SecurityChecker 2013-12-12 16:30:53 -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 67b97539ac Separate ListTemplatePermissions and ListIsoPermissions commands to use
two different views.
2013-12-11 17:41:10 -08:00