apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 02:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,935 Commits 312 Branches 325 Tags
Commit Graph

156 Commits

Author SHA1 Message Date
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
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
Hugo Trippaers
d3cd73d861 Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp) 2014-01-22 11:22:42 +01:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Hugo Trippaers
3bea60435e Remove commented elements 2014-01-13 12:16:37 +01: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
f33b247fc3 Moved the checkstyle project from parents to build to store all build tools in one location. Modified the config file to use 1024 for now. 2013-12-12 12:23:49 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01: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
9e5e9fdc67 Fix version and build paths for the checkstyle code 2013-11-04 20:01:14 +01:00
Hugo Trippaers
256763cf65 Fix checkstyle errors in Nicira NVP plugin 2013-11-04 15:24:54 +01:00
Hugo Trippaers
f39b6b2c56 Add checkstyle to the build process and enable it for the Nicira NVP plugin 2013-11-04 15:24:54 +01:00
Darren Shepherd
891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
Darren Shepherd
e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Darren Shepherd
9cbb309d6b Refactor missed classes 2013-10-17 16:00:11 -07:00
Darren Shepherd
67186429e1 Spring Modularization 
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
 2013-10-02 15:41:04 -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
5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
 2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang
5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-08-01 10:35:00 -04: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
Hugo Trippaers
368a5d5a9a Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a 
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4590775eff6291ddfbbd6de777d1b63)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
 2013-02-21 14:08:56 +01: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