307ad15bb6
check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
...
6d0dbf5968d38a503431
2014-02-18 14:12:50 -08:00
70ba92fc14
Updating pom.xml version numbers for release 4.3.0
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
9e5e9fdc67
Fix version and build paths for the checkstyle code
2013-11-04 20:01:14 +01:00
256763cf65
Fix checkstyle errors in Nicira NVP plugin
2013-11-04 15:24:54 +01:00
f39b6b2c56
Add checkstyle to the build process and enable it for the Nicira NVP plugin
2013-11-04 15:24:54 +01:00
891b85d516
Add missing licenses
2013-10-23 15:20:08 -07:00
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
9cbb309d6b
Refactor missed classes
2013-10-17 16:00:11 -07:00
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
2614b00c51
sdn hosted vpc gateways (using lswitch)
2013-09-18 16:56:56 +02:00
2e5bb63f77
Moved NetworkManagerImpl to NetworkOrchestrator
2013-09-06 15:40:32 -07:00
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
d9c06e538b
CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods
2013-09-01 22:53:23 +02:00
092e20204a
Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl
2013-08-19 14:13:29 -07:00
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc
2013-08-08 15:02:40 -07:00
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
5287f4c9ec
Got everything running through testing
2013-08-07 16:41:06 -07:00
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
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
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
5b80af0cda
Add missing license headers
2013-05-22 18:17:11 +05:30
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
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
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
368a5d5a9a
Prachi's commit 20a747601c introduced a
...
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4
2013-02-21 14:08:56 +01:00
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
80d58b6c73
CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
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
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
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
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
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
bca2c928e8
PluggableService: Fix interface definition
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
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
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
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
5a830c4db0
Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
...
NetworkManager's exclusive focus is now
- handling plugins during orchestration, and
- to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
596f9d0905
api: Annotate netscaler apis, remove IdentityMapper from everywhere
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:09:40 -08:00
a2f8f42575
nicira-nvp: Annotate nvp plugin, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 16:33:40 -08:00
e37f458a8d
Rationalize the interface by injecting all service providers by the service provider interface instead of assuming everybody implements NetworkElement. This is step 2 and includes all the plugins
...
import cleanups - remove unneeded and add explicit classes
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:13:47 -08:00
edb00bb613
Merge branch 'master' into api_refactoring
2013-01-03 08:32:56 -08:00
Daan Hoogland
Animesh Chaturvedi
Hugo Trippaers
Darren Shepherd
Darren Shepherd
Daan Hoogland
Alex Huang
Prasanna Santhanam
Chip Childers
Likitha Shetty
Nitin Mehta
Hugo Trippaers
Prachi Damle
Rohit Yadav
Kelven Yang
Edison Su
Koushik Das
Chiradeep Vittal
Min Chen