Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -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
Antonio Fornie
808c6df6d7
Fix and add some Rest unit and IT tests. Fix by adding a missing type of RoutingConfig.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-19 09:30:57 +01:00
Antonio Fornie
510972abde
Nvp and rest refactoring and more tests
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-18 09:51:54 +01: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
Hugo Trippaers
5fc03211ff
Findbugs finding: the collections should have been made static
2014-01-23 15:52:46 +00:00
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Hugo Trippaers
49124bdb7d
Fix license formatting to work with the mycila license check for nvp and opendaylight
2014-01-22 11:24:37 +01:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Hugo Trippaers
044a2078a1
Fix coverity issue 573580
2014-01-13 12:16:37 +01:00
Hugo Trippaers
15a08107d8
Fix coverity issue 600070
2014-01-13 12:16:37 +01:00
Hugo Trippaers
4683de5a92
Fix coverity issues 569415, 569416, 569417
2014-01-13 12:16:36 +01:00
Hugo Trippaers
5dc0c60239
Fix missing / in api url
2014-01-08 11:01:20 +01:00
Daan Hoogland
6d0dbf5968
check for BroadcastDomainTypes on sourceNatIp
2014-01-06 22:13:51 +01:00
Daan Hoogland
d69a35086f
another issue with vlan-number vs vlan-uri
2014-01-06 15:25:35 +01:00
Antonio Fornie
dad4249498
SecurityProfile and ACL for NiciraNvpApi, including Unit and Integration tests
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-23 14:30:03 +01:00
Min Chen
add277a4aa
Separate network and VPC related cmd to use two different views.
2013-12-12 16:53:59 -08:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
afornie
876b7e492f
Checkstyle adjustments in code and configuration
2013-11-18 19:22:42 +01:00
Hugo Trippaers
256763cf65
Fix checkstyle errors in Nicira NVP plugin
2013-11-04 15:24:54 +01:00
Darren Shepherd
9cbb309d6b
Refactor missed classes
2013-10-17 16:00:11 -07:00
Daan Hoogland
2614b00c51
sdn hosted vpc gateways (using lswitch)
2013-09-18 16:56:56 +02:00
Alex Huang
2e5bb63f77
Moved NetworkManagerImpl to NetworkOrchestrator
2013-09-06 15:40:32 -07:00
Alex Huang
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
Daan Hoogland
d9c06e538b
CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods
2013-09-01 22:53:23 +02:00
Alex Huang
092e20204a
Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl
2013-08-19 14:13:29 -07:00
Alex Huang
1325014a03
Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.
2013-07-22 11:48:11 -07:00
ahuang
11e1e585b1
UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch
2013-07-16 11:24:21 -07:00
Likitha Shetty
5b80af0cda
Add missing license headers
2013-05-22 18:17:11 +05:30
Hugo Trippaers
4e09079640
Update the Logical Router NatRules to be compatible with the NVP 3.x.x
...
platform
Use the Gson adapters to serialize/deserialize the NatRules
Switch the NiciraNvpApi to a single gson Object with the proper adapters
Fix missing order setting for static nat rules and portforwarding rules
Return an error when a port range is passed in a portforwarding rule
The serializer is not required
Fix a bug where an ip address could be released even if it was still in
use for SourceNat
Throw a json parse exception when the type is unknown to the adapter
2013-05-22 11:32:16 +02:00
Nitin Mehta
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
Hugo Trippaers
a28a19962a
CLOUDSTACK-2092 Don't push IP to the Nicira Controller when it is about
...
to be released.
2013-04-19 16:28:53 +02:00
Prachi Damle
ec1f48a4b2
CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
...
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:23:32 -08:00
Kelven Yang
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
Kelven Yang
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
Edison Su
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
Alex Huang
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
Koushik Das
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
Chiradeep Vittal
56cd809600
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
Min Chen
3dabd5fbf3
Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException
...
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:36:34 -08:00
Chiradeep Vittal
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
Kelven Yang
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
Kelven Yang
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
Rohit Yadav
bca2c928e8
PluggableService: Fix interface definition
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Kelven Yang
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
Alex Huang
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
Rohit Yadav
c4e890c55d
PluggableService: Refactor method to return map of key value pairs
...
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
properties map which is apiname:rolemask (both are strings)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
Kelven Yang
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
Chiradeep Vittal
0c3001530f
Network-refactor: move readonly interface NetworkModel into api project so that plugins can stop depending on the server project
...
Network-refactor: accidentally injected NetworkModel twice (revert one of them)
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00