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
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
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
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
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
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -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
00847482cc
Summary: Small fixes for issues found during unittests
2013-01-03 11:56:50 +01:00
6cf0c5683d
Summary: Make canHandle protected
...
Change access to canHandle so it's easier to unittest.
Make a note that answers can be null if the host is down, there should
be a way to deal with this, but for now an NPE is an adequate indication
that something is wrong.
2013-01-03 11:56:26 +01:00
9122809e00
Summary: nothing to see here, move along
...
Fix for a stupid mistake.
2013-01-03 11:56:02 +01:00
d235859168
Fix PluggableService to provide interface for ACL adapters etc. to get configs
...
- Fix interface to return array of strings, or filenames
- Fix StaticRoleBased ACL adapter to process config files by going through all pluggable services
- Refactor interface names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 16:29:39 -08:00
057ac12d23
Enforce InternalIdentity interface on all VO classes that impls long getId()
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:09:44 -08:00
018b5215e0
api: Annotate apis in various plugins
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:03:23 -08:00
296b49c2f8
Merge branch 'master' into test-merge-api
...
Conflicts:
api/src/com/cloud/agent/api/BackupSnapshotCommand.java
api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/resource/ResourceService.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/storage/SnapshotVO.java
pom.xml
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
98b022a430
Remove IdentityProxy from plugin response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 13:09:02 -08:00
2235776aed
Unittests for NiciraNvpGuestNetworkGuru
...
These unittests do not depend on the componentlocator but instead are
completely dependent on mock objects. This ensures that they can be run
standalone without any requirements on the environment.
Includes some fixes to NiciraNvpGuestNetworkGuru and GuestNetworkGuru
2012-12-14 10:41:36 +01:00
fa207d2b4d
Add unittests for NiciraNvpApi
...
Added some unittests for the NiciraNvpApi. These tests mainly validate
the logic of the execute methods, which are the main thing in this
class. Other methods are basically wrappers around these functions.
Changed NiciraNvpApi to have a factory method for obtaining the
HttpMethod. This makes it easier to mock it.
Changed the executeMethods in NiciraNvpApi to protected so the unittests
have access.
Fixed a bug in NiciraNvpApi where releaseconnection was not called in
some cases.
2012-12-07 15:55:26 +01:00
1fbf2a2864
Fix bug in Port Forwarding
...
Nicira NVP can't handle a range of port when implementing port
forwarding, so return an error message when a rule is being implemented
that uses port ranges.
Include unittest to verify this behaviour
2012-12-06 16:50:56 +01:00
cfd2a0bdf8
Fixes for some bug discovered while writing unittests
...
Rewritten handling for static nat and port forwarding, should make some
more sense now and the complex functions are split in smaller units.
Fix a small bug in Match
Add equals function to NatRule that ignores the uuid field.
2012-12-06 14:45:58 +01:00
48308ec070
Redoing NatRule usage and some fixes based on issues found while writing
...
unittests
2012-12-06 14:45:37 +01:00
ba8e61bfb5
api_refactoring: for network api refactoring move interfaces so it works
...
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:53:16 -08:00
5edfc2760a
refactor: remove redundant imports, fix trailing chars
2012-12-03 13:54:37 -08:00
751e74708e
Setup unittests for the nicira nvp plugin
...
Changed the creation of the NiciraNvpApi to a factory method that can be
overridden by a mock object.
Setup two tests to test the configure function of the NiciraNvpResource
to test this factory method.
2012-12-02 10:50:14 -08:00
a28f4cac3c
HttpClient needs releaseConnection method call
...
reviewboard: https://reviews.apache.org/r/8186/
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
c8832cd4b6
Commit https://reviews.apache.org/r/8075/
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2012-11-19 12:02:26 +01:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
28c31e3707
truncate names that are longer than 40 characters, this is the max
...
length nicira api accepts for display_name.
2012-10-17 13:29:03 +02:00
a4a3194899
Fix license headers
2012-10-15 10:22:12 +02:00
51f9a98871
Check all TODO and FIXME tasks
2012-10-12 12:02:54 +02:00
ab8ba3d61d
Implement the portforwarding code in the resource
...
Fix a small naming typo
2012-10-12 11:57:27 +02:00
553a72047f
Implement static nat handling
2012-10-11 18:13:47 +02:00
18e11ac0c8
These need to be objects instead of primitives otherwise they get
...
included by default during conversion to json.
2012-10-05 09:27:21 -07:00
c9b0b0b1a9
Add Nicira configuration to the UI
2012-09-30 23:33:37 -07:00
Likitha Shetty
Hugo Trippaers
Nitin Mehta
Hugo Trippaers
Prachi Damle
Kelven Yang
Edison Su
Alex Huang
Koushik Das
Chiradeep Vittal
Rohit Yadav
Min Chen
Hiroaki Kawai
Alena Prokharchyk