Kelven Yang
ce1e53f451
Fix style-check issue after cherry-picks
2014-03-18 17:00:08 -07:00
Kelven Yang
d9506d2a05
Let VMSync be aware of HA take-over on VM state management.
2014-03-18 16:45:45 -07:00
Nitin Mehta
5d19a936a2
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
Work done for network offering.
2014-03-18 14:00:55 -07:00
Nitin Mehta
7442b56fa8
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
2014-03-18 14:00:25 -07:00
Min Chen
22eb5eb2d6
Fix a regression caused by IAM search criteria refactor on VPC.
2014-03-18 10:41:55 -07:00
Marcus Sorensen
d638d04cbf
CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)
2014-03-14 07:17:33 -06:00
Min Chen
ae1d6a771b
Remove IAMEntityType to use existing VO interface class to annotate
...
entityType.
2014-03-17 17:19:55 -07:00
Alena Prokharchyk
78a04c5315
CLOUDSTACK-6235: listSystemVms - retrieve vlan info of EIP address only when ip address can be found in the DB
2014-03-16 16:29:56 -07:00
Alena Prokharchyk
d9e1c9c502
CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately
...
Conflicts:
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2014-03-14 11:57:58 -07:00
Daan Hoogland
3aee404a49
findbugs: removed unused variable
2014-03-14 18:50:43 +01:00
Jayapal
384eeaf792
CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips
2014-03-14 22:47:17 +05:30
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Saksham Srivastava
48f8a95b06
CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level.
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-03-14 12:16:46 +05:30
Rajesh Battala
1b4325d2c8
CLOUDSTACK-6106 supporting VPC VR on Hyper-V
2014-03-14 17:36:43 +05:30
Murali Reddy
794b38a789
fix unit-test failure
2014-03-14 17:19:27 +05:30
Murali Reddy
423a748807
adds hypervisor script to convert JSON routing polcies (ACL) config in
...
to flow rules and applies them on the bridge
add event subscriber in OvsTunnelManager, that listens to
replaceNetworkAcl events. On event sends the updated policy info to all
the hosts in the VPC
2014-03-14 16:56:37 +05:30
Murali Reddy
2c7786992f
some bug fixes
2014-03-14 16:56:37 +05:30
Murali Reddy
e045883c52
introduce OvsNetworkTopologyGuru that has convinenace functions to
...
- get the hosts on which VPC spans given vpc id
- get the VM's in the VPC
- get the hosts on which a network spans
- get the VPC's to which a hosts is part of
- get VM's of a VPC on a hosts
introduces capability to build a physical toplogy representation of a
VPC. This json file is encapsulated in
OvsVpcPhysicalTopologyConfigCommand, and is used to send full topology
to hypervisor hosts. On hypervisor this json config can be used to setup
tunnels, configure bridge, add flow rules etc
Ovs GURU, to use different broasdcast scheme VS://vpcid.gerkey for the
networks in VPC that use distributed routing
each VIF and tunnel interface to carry the network UUID in other/options
config
2014-03-14 16:56:37 +05:30
Murali Reddy
32ac021043
make Ovs as VPC provider
2014-03-14 16:56:36 +05:30
Murali Reddy
3139b35518
mark VPC to be using distributed router if VPC offerign supports
...
distributedrouter capability.
2014-03-14 16:56:35 +05:30
Murali Reddy
e3ec12e5d0
-add check to ensure 'Connectivity' service provider specified in
...
createVpcOffering actually supports 'DistributedRouter' capability
- enable OVS to support 'DistributedRouter' capability
2014-03-14 16:56:35 +05:30
Murali Reddy
7c4443e233
-introduces 'DistributedRouter' as capability to 'Connectivity' service.
...
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
2014-03-14 16:56:35 +05:30
Devdeep Singh
2aff39f8c7
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
...
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Harikrishna Patnala
f7337527cf
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-14 15:14:15 +05:30
Sanjay Tripathi
6a5d3e96c9
CLOUDSTACK-6238: NPE in HostStatsCollector.
2014-03-14 13:37:19 +05:30
Kelven Yang
42d637376b
Handle a race-condition in VirtualNetworkManagerImpl.java in the process of starting it parallelly.
2014-03-13 16:59:56 -07:00
Kelven Yang
3123c30f23
BUG-ID: CS-19196: Relax HA work termination rule on exceptions. It could cause premature HA termination due to unhandled exceptions. Reviewed-By:Anthony
2014-03-13 16:59:56 -07:00
Kelven Yang
7fa4715b99
perform VM HA based on agent state report.
2014-03-13 16:59:56 -07:00
Kelven Yang
6ad245e675
Restore to old HA logic, but suppress VM state change on resource state report to avoid interferring HA.
2014-03-13 16:59:56 -07:00
Kelven Yang
4312d88462
HA manager to check target state of the VM to make decisions on whether or not to carry on a cheduled step. Fix NPE in capacity manager when releasing capacity of a stopped VM.
2014-03-13 16:59:56 -07:00
Kelven Yang
3d5fbe7073
move HA rescheduling operation to HA worker context.
2014-03-13 16:59:56 -07:00
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 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
Daan Hoogland
ea5f318c9d
pass isSourceNat to second ip on the same network
2014-02-11 14:12:00 +01:00
Jayapal
11c5574b05
CLOUDSTACK-5966 enable/disable global setting for service monitor in VR
2014-02-11 15:35:02 +05:30
Alena Prokharchyk
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
Devdeep Singh
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
Min Chen
7bab0bc304
Optimize fix for CLOUDSTACK-5987.
2014-02-07 16:08:12 -08:00
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Hugo Trippaers
b6db18fae4
Slightly improve the error message to make it clean what the problem actually is
2014-02-07 14:10:02 +01:00
Alena Prokharchyk
782c530685
Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type
...
This reverts commit 447430c3df .
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-02-06 14:46:58 -08:00
Hugo Trippaers
cbbe3e0cd7
Fix several AssertionErrors caused by improper transaction handling. Rewrite to new way of doing transactions.
2014-02-06 16:51:20 +01:00
Min Chen
c440d90466
Merge fix for CLOUDSTACK-5987 in master to RBAC.
2014-02-05 16:34:01 -08:00
Min Chen
7c0170e3e9
Hook up IAM update for updateTemplatePermission api.
2014-02-05 16:04:13 -08:00
Alena Prokharchyk
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08:00
Alena Prokharchyk
a873a0efdd
Fixed the build broken by changes made to MonitoringServiceVO
2014-02-05 10:37:03 -08:00
Alena Prokharchyk
9641e1dbee
External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer
2014-02-05 10:36:21 -08:00
Hugo Trippaers
3cfa5fbfe1
Fix camelcasing inconsistency causing an assertion error.
2014-02-05 19:32:32 +01:00
Alex Huang
54f32a8e46
Moved the controlling logic for secondary storage vm into place
2014-02-05 01:39:17 +00:00
Alex Huang
03a424e45a
Removed some useless imports
2014-02-05 01:39:16 +00:00
Alex Huang
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
Alena Prokharchyk
aaa20947a9
ExternalUUID control support for Firewall and Egress Firewall rules
2014-02-04 17:06:04 -08:00
Alena Prokharchyk
7cb4b571c8
ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching
2014-02-04 15:47:13 -08:00
Alena Prokharchyk
e5335cd6e4
CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter
2014-02-04 15:47:13 -08:00
Alena Prokharchyk
8065ee445f
External UUID control support for VPC and NetworkACLItemp
2014-02-04 15:47:12 -08:00
Alena Prokharchyk
7cd0ad336b
External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup
2014-02-04 15:47:12 -08:00
Alena Prokharchyk
6af6ce7e9e
1) Added External UUID control support for network.
...
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
Prachi Damle
9e92197dfd
Fixing Build after merge
2014-02-04 15:10:24 -08:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Antonio Fornie
447430c3df
CLOUDSTACK-6003 fixing plus refactoring dispatcher
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-04 13:37:08 +01:00
Prachi Damle
72c0f1a617
Remove trailing whitespace
2014-02-03 18:28:09 -08:00
Prachi Damle
cb4d3a3c54
Support deleteAffinitygroup - remove access
2014-02-03 18:22:57 -08:00
Prachi Damle
022b9b8f80
Add access for domain wide createAffinityGroup
2014-02-03 18:14:56 -08:00
Prachi Damle
939b15169c
changes to support the domain wide resources for Network
2014-02-03 17:34:03 -08:00
Alena Prokharchyk
ea355d7383
listSslCerts: removed an exception thrown when there is no certificate mapped to the lbId specified in the list* command. Exception in the list* command should be thrown only when id specified in the command, is invalid CS id, but never in the case when we can't find data satisfying search criteria. In this case we just return empty list
2014-02-03 17:20:28 -08:00
Alena Prokharchyk
fc56f0cf42
Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response
...
This reverts commit fae0556021 .
Conflicts:
server/src/com/cloud/dc/DedicatedResourceVO.java
2014-02-03 17:20:28 -08:00
Anthony Xu
657d9e4789
Allow different VLANs have ovveride subnet for shared network
2014-02-03 15:03:31 -08:00
Likitha Shetty
f4a96d4c85
CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead
2014-02-03 18:17:25 +05:30
Likitha Shetty
9cb37ec349
CLOUDSTACK-6007. Restore VM command fails with NPE.
...
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store.
2014-02-03 12:32:14 +05:30
David Grizzanti
ce4b718f4a
CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit fc796632ed984f37fdf32e6aedf26d179a70b22f)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-01 21:08:24 +01:00
Prachi Damle
7d0472bdaa
CLOUDSTACK-5995 ; change service offering is not honouring host tags
...
- Check host tag when the lastHostId is set.
2014-01-31 12:02:44 -08:00
Alena Prokharchyk
48361d8a8b
Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId)
2014-01-31 09:21:55 -08:00
Sanjay Tripathi
e8438f1b6d
CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75
...
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts" message while deleting multiple events .
2014-01-31 17:10:04 +05:30
sbalineni
ed3e1b95b0
VPC Support for contrail networking
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-30 18:13:48 -08:00
Nitin Mehta
0e2e6995b7
CLOUDSTACK-5997:
...
Template state changes side affects
2014-01-30 17:59:55 -08:00
Alena Prokharchyk
02bdb28d76
Resource metadata support for autoscale vm group object
2014-01-30 13:04:56 -08:00
Alena Prokharchyk
cb073e0634
listAutoscaleVmProfiles: added zoneId to the list of optional api parameters
2014-01-30 12:36:56 -08:00
David Grizzanti
5de9ae0bce
CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID
...
When Action Events are generated and placed on the Event Bus, an
"account" parameter is included with the event. When these events are
generated for resources within projects, this "account" parameter is not
useful as it's the UUID of the project account, instead of the project.
To solve this, I updated ActionEventsUtil class to include a "project"
parameter in the generated events when the resource is being
changed/add/deleted in a project.
2014-01-30 17:35:01 +05:30
Saksham Srivastava
85d0f8f93a
CLOUDSTACK-5916: associateIpAddress leaves an IP in allocating state
2014-01-30 17:11:02 +05:30
Sanjay Tripathi
20fd2769a9
CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"".
2014-01-30 16:29:18 +05:30
Alena Prokharchyk
b38c033d5c
LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller
2014-01-29 17:12:46 -08:00
Alena Prokharchyk
37fa8012f8
Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl
2014-01-29 14:57:01 -08:00
Alena Prokharchyk
65c5de1cb6
Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url'
2014-01-29 14:57:01 -08:00
Alena Prokharchyk
fdb25d6f5b
Resource metadata support for autoscaleVmProfile CS object
2014-01-29 14:57:00 -08:00
Daan Hoogland
920163f24f
findbugs: possible nulpointer derefs
2014-01-29 13:09:17 +01:00
Daan Hoogland
ee1e8a6c2a
findbugs: use system account id instead of null (security considerations
...
to be made here)
2014-01-29 12:36:34 +01:00
Daan Hoogland
fef2daf5d4
findbugs: compare strings with equals()
2014-01-29 12:06:34 +01:00
Min Chen
0063b60701
Remove ACL permission for a particular entity when it is deleted. The
...
hook is currently only done for deleteTemplateCmd.
2014-01-28 18:17:01 -08:00
Min Chen
72812cdf22
Grant public template permission to domain admin and normal user policy.
2014-01-28 17:41:27 -08:00
Daan Hoogland
bd2acd1eff
findbugs: comparison of wrapper objects
2014-01-28 23:20:45 +01:00
Prachi Damle
91317dc497
Changes for createDomain - create new group AND createAccount - add account to domain group
2014-01-28 09:48:19 -08:00
Marcus Sorensen
29e22384b7
fix checkstyle in DedicatedResourceVO.java, trailing space
2014-01-28 10:38:30 -07:00
Daan Hoogland
53777c9523
findbugs: removed obfuscating fields(cherry picked from commit
...
9495c68c13 )
2014-01-28 17:42:17 +01:00
Daan Hoogland
be21822cba
findbugs: throw exceptions when found(cherry picked from commit
...
9772693dca )
2014-01-28 17:39:02 +01:00
Daan Hoogland
5d8e8fd3a2
findbugs: nullpointer guards and wrappertype comparisons(cherry picked
...
from commit 791b7f8f7f )
2014-01-28 16:46:05 +01:00
Daan Hoogland
9edeb24f3f
findbugs: assign result of string manipulations(cherry picked from
...
commit 20127e09dc )
2014-01-28 16:36:27 +01:00
Daan Hoogland
fae0556021
Findbugs: different issues solved(cherry picked from commit
...
0b13f8e59d )
2014-01-28 16:30:04 +01:00
Daan Hoogland
0daca84eff
findbugs: removed fields injected in parent(cherry picked from commit 866a539b06)
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-01-28 15:59:04 +01:00
Daan Hoogland
a16759a9b1
findbugs: byte[].toString -> Arrays.toString(byte[])(cherry picked from commit 23a3d99fc0)
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-01-28 15:51:08 +01:00
Daan Hoogland
44bc2beb14
findbugs: null-checks(cherry picked from commit
...
c58e509924 )
2014-01-28 15:44:04 +01:00
Daan Hoogland
fe262caa75
findbugs: retrieve the objects to remove from the collection(s)
2014-01-28 15:36:40 +01:00
Daan Hoogland
53feecaa76
findbugs: null check for gateway and netmask instead of gateway
...
twice(cherry picked from commit
d30ddf6d59 )
2014-01-28 14:53:11 +01:00
Daan Hoogland
a71871d11c
findbugs: fixes for ApiServer, ApiSerializerHelper and
...
ApiXmlDocWriter(cherry picked from commit
9aced41d70 )
2014-01-28 14:47:06 +01:00
Daan Hoogland
1c7361756c
Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from
...
commit 9a1b882d0e )
2014-01-28 14:24:21 +01:00
Daan Hoogland
60e8d131cf
findbugs: moved call on static object to synchronized block(cherry
...
picked from commit f3529a19a9 )
2014-01-28 14:14:47 +01:00
Daan Hoogland
9eae5f6929
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git
2014-01-28 13:49:42 +01:00
Daan Hoogland
4f6638d7c7
findbugs: nullpointer dereference guarded(cherry picked from commit
...
43ba36f979 )
2014-01-28 13:49:14 +01:00
Likitha Shetty
95bd04e449
CLOUDSTACK-5965. VM displayname is not returned by API.
...
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
2014-01-28 16:43:12 +05:30
Rajesh Battala
807dc09138
CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV
2014-01-28 07:03:08 +05:30
Min Chen
f77974b5d2
Fix trailing whitespace from cherry-pick
2014-01-27 13:31:35 -08:00
Min Chen
cfe7864618
CLOUDSTACK-5960: Domain admin or user cannot register a template using
...
S3/Swift object store.
2014-01-27 13:31:35 -08:00
Marcus Sorensen
0502d2f375
CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
...
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00