Commit Graph

8038 Commits

Author SHA1 Message Date
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Min Chen 793becf524 CLOUDSTACK-5920: Add some interface methods and constants required by
IAM.
2014-03-05 09:40:55 -08:00
Min Chen d0ae4d9a9f CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
entity type.
2014-03-05 09:40:55 -08:00
Marcus Sorensen b8413b9413 CLOUDSTACK-6194: Failed to increase Shared network IP Range
Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com>
2014-03-04 22:19:08 -07:00
Prachi Damle 695d689de5 Adding annotations for more admin APIs 2014-03-04 18:14:05 -08:00
Alena Prokharchyk 5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Nitin Mehta 339c4f4c3f CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Alena Prokharchyk bbf5a912c6 list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only) 2014-03-03 14:37:46 -08:00
Prachi Damle a837ac8873 Adding Operate access check at service layer, since we are not checking access on the command parameter here 2014-03-03 13:35:19 -08:00
Alena Prokharchyk fd43cf1516 Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information"
This reverts commit ebcaec8632.
Reverting as it breaks API compatibility
2014-03-03 12:44:08 -08:00
David Grizzanti ebcaec8632 CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-03-03 11:02:34 +01:00
Kelven Yang 90262a81ec Do not do investigation for SSVM/CPVM agent host upon disconnect. 2014-02-28 15:36:00 -08:00
Kelven Yang 0c48f70762 pass over volume info through job boundary for all volume related tasks, since volume record may be re-created. 2014-02-28 15:36:00 -08:00
Kelven Yang 7ce5e5b1fb Add VM level HA for hypervisors that are not integrated with native HA with CloudStack, i.e., Xen/KVM. 2014-02-28 15:35:59 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang ee2adab7c7 reboot VR if a out-of-band power-on event is detected 2014-02-28 15:35:58 -08:00
Kelven Yang fed85813e9 use lock table for locking 2014-02-28 15:35:58 -08:00
Kelven Yang fa7d9ad1a8 VirtualMachineManager.migrateAway() need to put under management of new sync model 2014-02-28 15:35:58 -08:00
Kelven Yang fda7219646 CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled 2014-02-28 15:35:57 -08:00
Alena Prokharchyk d9a4e038a0 Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine 2014-02-28 14:35:37 -08:00
Jayapal 100a911229 CLOUDSTACK-6187: Fixed MigrateSystemVMCmd response for router 2014-02-28 16:46:57 +05:30
Nitin Mehta 5360ab3d43 CLOUDSTACK-6186:
Unable to register private template across all Zones - crosszones flag no longer works.
This was because the code skipped the loop after the first download initiation. Introduced a set so that if it is already downloaded to the same zone then skip it for private template.
2014-02-27 18:29:58 -08:00
Alena Prokharchyk bb6fddf434 listVirtualMachines API: ability to search by service offering the vm is created from
listVolumes API: ability to search by disk offering the volume is created from
2014-02-26 16:56:33 -08:00
Daan Hoogland e431538b0a findbugs possible nullpointer mitigated 2014-02-26 11:56:49 +01:00
Prachi Damle 187f9cd0a2 iam/plugin: Rename Acl to IAM everywhere 2014-02-25 16:43:23 -08:00
Prachi Damle f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-25 22:59:10 +01:00
Laszlo Hornyak 0e3fde5107 replace String != operation with .equals
replaced the != operation performed on two String objects with ObjectUtils.equals

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 21:54:32 +01:00
Alena Prokharchyk e2ec094722 Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn 2014-02-21 14:51:22 -08:00
Alena Prokharchyk 83bef78390 Fixed unittest 2014-02-21 14:29:00 -08:00
Alena Prokharchyk 0f489732c8 Display flag support for LB/InternalLB/NetworkACL rules 2014-02-21 14:03:10 -08:00
Alena Prokharchyk 92064e347a Display flag support for autoscale vmGroup and vmProfile 2014-02-21 11:52:50 -08:00
Alena Prokharchyk 27a790bdc1 DisplayFlag update support for PF/Firewall/EgressFirewall rules 2014-02-21 11:06:52 -08:00
Marcus Sorensen df1e3998ff CLOUDSTACK-6079:
fixed issue: if public traffic is on a physical network isolated by VLAN,
and guest traffic is on an another physical network isolated by VXLAN,
public traffic's broadcast type is updated to VXLAN by mistake.

submitted-by: mail@ynojima.net
2014-02-20 23:28:19 -07:00
Marcus Sorensen f1f79586da CLOUDSTACK-6072: Release VNIs when guest networks are destroyed
submitted-by: mail@ynojima.net
2014-02-20 23:21:07 -07:00
Alena Prokharchyk 21d016b3dd API response: added new field to @Param - RoleType[] authorized() default {}. The field defines who is authorized to see this partciluar reponse field. If not specified, the parameter is returned to everybody 2014-02-20 17:15:43 -08:00
Alena Prokharchyk 2f7bfc0c73 Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only 2014-02-20 17:15:42 -08:00
Nitin Mehta c171e2c3e4 CLOUDSTACK-4744: Enhance root admin API updateVolume with chaininfo parameter as a part of "Better control over first party objects" feature. 2014-02-19 18:01:18 -08:00
Prachi Damle 42a7d41c55 Adding annotations to router commands 2014-02-19 12:22:35 -08:00
Prachi Damle f0a9b3b510 @ACL from some commands 2014-02-19 12:22:30 -08:00
Min Chen 13e25d2aae Fixed a bug in constructing search parameters with accountName passed. 2014-02-19 11:35:00 -08:00
Sheng Yang 6bde675f87 Remove SetupGuestNetworkAnswer
It's unnecessary and not different from Answer itself.
2014-02-14 18:10:05 -08:00
Min Chen 586ee74000 Clean up SecurityChecker.AccessType and modify code to use them
consistently.
2014-02-14 11:23:05 -08:00
Hugo Trippaers 97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Daan Hoogland 15fa2ef8df findbugs: check for system template id == -> equals() 2014-02-14 18:37:47 +01:00
Daan Hoogland 0d7a96526c error message containing array content instead of array 2014-02-14 18:37:47 +01:00
Alex Hitchins 39cfc4968c AJH Findbugs [8] - Added .toString() to enum.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:45 +01:00
Alex Hitchins b8c228e151 AJH Findbugs [9] - Added object to map rather than string
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:45 +01:00
Min Chen 8072e50845 Fixed a bug for listTemplates with TemplateFilter=shared. 2014-02-13 16:47:41 -08:00
Marcus Sorensen df77c4310a CLOUDSTACK-6103: Pass VM iso information along with
PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well.
2014-02-14 00:34:48 -07:00