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
Murali Reddy
794b38a789
fix unit-test failure
2014-03-14 17:19:27 +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
Min Chen
84a528fad6
Merge branch 'master' into rbac
2014-03-13 14:52:37 -07:00
Prachi Damle
d9696b26e1
After merge, fix isRootAdmin() calls to use accountId instead of type
2014-03-13 13:28:40 -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
Sheng Yang
f45de30d1b
CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot
2014-03-11 13:04:26 -07:00
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
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
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
Alena Prokharchyk
7b0c5cfcbe
Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class
2014-03-07 11:33:10 -08: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
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -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
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
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
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
27a790bdc1
DisplayFlag update support for PF/Firewall/EgressFirewall rules
2014-02-21 11:06:52 -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
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
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
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08: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 447430c3df38c36d947c44c4aebd961d8cbb14c4.
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
Alena Prokharchyk
4305d817ba
External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection
2014-02-05 15:56:40 -08: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
8065ee445f
External UUID control support for VPC and NetworkACLItemp
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
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
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
Prachi Damle
af14699c4c
fixing the build _ AffinityGroup command changes
2014-01-23 18:17:43 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Min Chen
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
Alex Huang
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
Min Chen
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
Murali Reddy
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Alex Huang
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
Hugo Trippaers
7c8facf3c9
Change checkstyle to run on every sub project, so it will also run when you build an individual module
2014-01-09 17:00:11 +01:00
Alena Prokharchyk
b15431e574
CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller
2014-01-06 17:09:14 -08:00
Alena Prokharchyk
647ea6e2d0
listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm
2014-01-06 17:09:14 -08:00
Murali Reddy
8b151c98c2
CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
...
restart, firewall rules dropped from iptables post restart
on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-27 14:27:57 +05:30