Min Chen
8ff94601f1
Merge branch 'rbac' to master
2014-03-13 16:42:22 -07:00
Alena Prokharchyk
6c23e201ad
1) More fixes for the problems found by findBugs
...
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
Prachi Damle
36c0a4e2c3
Removed the AccessType.UseNetwork - replaced all referrences by AccessType.UseEntry
2014-03-13 15:32:38 -07:00
Min Chen
84a528fad6
Merge branch 'master' into rbac
2014-03-13 14:52:37 -07:00
Alena Prokharchyk
90c485e5d6
Fixed some problems reported by FindBugs
2014-03-13 13:45:30 -07:00
Prachi Damle
d9696b26e1
After merge, fix isRootAdmin() calls to use accountId instead of type
2014-03-13 13:28:40 -07:00
Alena Prokharchyk
df85211945
Removed unused imports and instance vars from FirstFitAllocator
2014-03-13 11:05:37 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
Antonio Fornie
39e5b768e8
More generic parameters that are not unknown
...
Adding some more parameter names that should not be considered unknown since they belong to general use paramters
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-03-13 10:40:14 -07:00
Alena Prokharchyk
1b83698dac
deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only)
2014-03-13 10:23:34 -07:00
Koushik Das
5779292e93
CLOUDSTACK-6052: List VM enhancement to support querying with multiple VM IDs
...
New parameter 'ids' added to listVirtualMachine API. The syntax looks like
http://localhost:8096/api?command=listVirtualMachines&listAll=true&ids=eddac053-9b12-4d2e-acb7-233de2e98112,009966fc-4d7b-4f84-8609-254979ba0134
The new parameter will be mutually exclusive with the existing 'id' parameter.
2014-03-13 17:05:35 +05:30
amogh.vasekar
3ee1fc28de
CLOUDSTACK-6217:
...
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Alena Prokharchyk
40192cd8a1
CLOUDSTACK-6235 - return gateway/netmask of publicVlan, along with the EIP information, for system vms in EIP/ELB setup
2014-03-12 15:11:01 -07:00
Daan Hoogland
b5c8a56eea
CLOUDSTACK-6232 allow expansion of ip on isolated networks as well
2014-03-12 19:36:11 +01:00
Daan Hoogland
6c035240ba
check-style: tabs to spaces
2014-03-12 18:04:22 +01:00
Daan Hoogland
5685d14537
[CLOUDSTACK-6232] bridging allowed in isolated networks
2014-03-12 17:47:55 +01:00
Sheng Yang
467986321a
CLOUDSTACK-6047: Enable VR aggregation commands for VPC
2014-03-11 16:14:33 -07:00
Sheng Yang
f45de30d1b
CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot
2014-03-11 13:04:26 -07:00
Min Chen
b554d4ac1f
Fix issues found through FindBugs.
2014-03-11 11:49:48 -07:00
Kishan Kavala
c63f43a9cc
CLOUDSTACK-6122: Add LXC to supported hypervisor list for VPC
2014-03-11 23:49:28 +05:30
Sanjay Tripathi
c7d31fe288
CLOUDSTACK-4760 : Enabling GPU support for XenServer.
...
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.
This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Nitin Mehta
33a0dec965
CLOUDSTACK-6221:
...
Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example - during attach/detachIso along with iso id, vm id should be available as well.
2014-03-10 16:22:34 -07:00
Alena Prokharchyk
bf9375b8b9
CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
Conflicts:
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2014-03-10 11:42:24 -07:00
Daan Hoogland
d182a51162
findbugs: another array pointer in error message
2014-03-10 13:21:13 +01:00
Daan Hoogland
e0d20fb6eb
findbugs: null check before use of pointer
2014-03-10 13:08:15 +01:00
Daan Hoogland
579cb9c479
findbugs: output vlanids in errormessage instead of array object pointer
2014-03-10 13:04:10 +01:00
Daan Hoogland
0aca7cfab6
unneeded imports removed
2014-03-10 10:56:37 +01:00
Daan Hoogland
2386ad73da
rat
2014-03-10 10:54:31 +01:00
Daan Hoogland
1075bed06c
findbugs: String for Service type mismatch (plus test for dummy data)
2014-03-10 10:44:10 +01:00
Daan Hoogland
07102b400f
findbugs: scope and final to mitgate possible abuse of fields
2014-03-10 09:39:35 +01:00
John Kinsella
09c375379d
CLOUDSTACK-6204: removing realhostip dependency
...
Moving default transport for console proxy, SSVM to http.
See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.
jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.
Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
Nitin Mehta
ded7e682dc
CLOUDSTACK-5478: Enable publishing uuid for all the async apis in the CallContext.
...
The advantage would be that event publishing can pick up the uuid and publish them.
2014-03-07 16:50:21 -08:00
Alena Prokharchyk
7b0c5cfcbe
Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class
2014-03-07 11:33:10 -08:00
Daan Hoogland
c257fb0e3e
rats
2014-03-07 19:27:58 +01:00
Antonio Fornie
c211f0bbbe
Dispatcher corrections, refactoring and tests
...
Corrects problems from previous attempt. Fixes based on help comments from
the community and conflict resolution
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-07 19:12:07 +01:00
Sheng Yang
60dc25450a
CLOUDSTACK-6047: Introduce Aggregated commands queue to VR
2014-03-06 16:22:01 -08:00
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
Mike Tutkowski
9b66866dc2
CLOUDSTACK-6170
2014-03-06 13:01:11 -07:00
Nitin Mehta
830328b63d
CLOUDSTACK-6199: Hide action events for Vm/Volume commands when the resources have display flag=0.
...
Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention
2014-03-05 16:40:44 -08:00
Alena Prokharchyk
d1c0b81dc1
CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well
2014-03-05 15:39:34 -08:00
Mike Tutkowski
b06e66c50a
CLOUDSTACK-6170
2014-03-05 13:55:12 -07: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 ebcaec8632dbd92c071317f3190915244a287afb.
Reverting as it breaks API compatibility
2014-03-03 12:44:08 -08:00