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
e398b1e47a
api: Refactor command and response classes to org.apache.cloudstack.api.*
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 19:23:24 -08:00
af28c06998
api: move and group all under command, org.apache.cloudstack.command.*
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
9c8eba1da3
Fix the tests
...
Note to self, surefire actually runs with assertions enabled where junit
inside eclipse doesn't. Sure surefire will mark tests as failed when an
assertion is triggered. Take care when mocking stuff.
2012-12-07 17:34:14 +01:00
2b74b6e827
Start removing the old ant build files
...
Removed all build.xml files from the plugins
2012-12-07 15:58:56 +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
22ef646b23
Add more unittests for NiciraNvpResource
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
700050a713
More unittests for NiciraNvpResource
...
Add some basic unittest for NatRule
2012-12-06 14:45:09 +01:00
b0955e43ff
Put the mockito version in the central version list
2012-12-06 14:42:59 +01:00
6657246cd4
Summary: partical check-in for L4-L7 network services in the shared
...
network in the advanced zone
Changing the F5, NetScaler, SRX network elemetns to handle both 'isolated networks'
and 'shared networks' in the advanced zone
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 11:55:19 +05:30
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
456b852c0c
api_refactor: refactor loadbalancer apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -08:00
658cf56120
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
28df57ec75
api_refactor: refactor serviceoffering apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:27:19 -08:00
6fc3bc3760
api_refactor: refactor vpn and vm apis
...
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
5edfc2760a
refactor: remove redundant imports, fix trailing chars
2012-12-03 13:54:37 -08:00
0902f60c61
Quickly add the license header before Chip finds out.
2012-12-02 11:19:32 -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
affc162556
AutoScale: Fixing issues that occurred during rebase with master
2012-11-16 11:04:37 +05:30
527b5c8ee2
Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep
2012-11-16 10:57:00 +05:30
4836aba56f
Create Autoscale config in Netscaler with unique Identifier based on Vmgroup
2012-11-16 10:56:59 +05:30
35b0e086d4
enable Autoscale VMs to be named as Autoscale-LB-<lbname>
2012-11-16 10:56:59 +05:30
57416188a2
Enabling aUtoscale VMs to be provisioned in a loadbalancer's network
2012-11-16 10:56:59 +05:30
bf1e6ed991
CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay
2012-11-16 10:56:58 +05:30
3e32a29048
Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935
2012-11-16 10:56:58 +05:30
c7f84cae77
Autoscale:7078-NetScaler's API changes for autoscale
2012-11-16 10:56:58 +05:30
3ceebc140a
AutoScale. Re-organized NetScalerResource. Bringing autoscale functions in a logical order.
2012-11-16 10:56:57 +05:30
eec892dfbc
Handling of errors during AutoScaleConfig in NetScaler.
2012-11-16 10:56:57 +05:30
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
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
91e68b5f2c
A bunch of .project changes again
2012-11-04 19:25:03 -08:00
f92ce72639
Correct dependency errors
2012-10-24 11:12:40 -07:00
059f605ace
add more interfaces
2012-10-22 17:50:51 -07:00
53cea844bc
The interface change introduced by commit
...
214bbf3ebd
2012-10-18 09:40:13 +02: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
b48d0d7d08
CLOUDSTACK-326: Removing extra license and README files
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 14:29:51 -04:00
c07d6d28ee
Merge branch 'nicira-l3support'
...
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
2012-10-12 14:15:17 +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
5fee891162
merge from master
2012-10-11 17:42:25 -07: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
aa6355ffe6
Updated master to 4.1.0
...
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
bb4dadaed8
small fixes
2012-10-01 10:12:59 -07:00
c9b0b0b1a9
Add Nicira configuration to the UI
2012-09-30 23:33:37 -07:00
c5634b9687
Wire the PortForwarding and StaticNat calls
2012-09-30 10:20:54 -07:00
de41cb7cb5
Start implementing IpDeployer
2012-09-28 11:32:53 -07:00
dd68a00338
Persist the uuid of the logical router once created
2012-09-27 22:16:11 -07:00
af77912034
Keep naming consistent
2012-09-27 18:26:56 -07:00
8ba7749869
Prepare all capabilities we will be supporting
...
Remove the logical router if we are done with it.
2012-09-27 18:24:19 -07:00
fe997651a6
Wired up the creation of the SourceNat router in the element
2012-09-27 15:34:53 -07:00
bfc8da1082
Update Nicira Api to support L3 functionality
2012-09-25 15:51:48 -07:00
6eedfdfb79
Master pull
2012-09-14 11:20:45 -07:00
763311c006
License header updates, and modification to root pom for exclusions.
2012-09-13 16:55:48 -04:00
c9aa08350a
[DOC] docbook conversion - choosing a deployment architecture
2012-09-13 16:12:06 -04:00
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -07:00
cfc2b85651
Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
5532f58bbc
remove cloud.com license headers
2012-09-13 12:34:32 +08:00
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
2ba09d88c8
Patch from Gavin Lee: Change license to ASL2.0 in plugin
2012-08-30 09:17:11 -04:00
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07:00
fe8a01106b
rename cloud-plugins to cloudstack-plugins
2012-08-27 16:53:51 +02:00
c68dd35b6e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-27 16:44:18 +02:00
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
e2b814d045
If there already is an entry in the nic mapping table for a starting VM,
...
try to reconcile with the Nicira Controller.
2012-08-27 13:41:27 +02:00
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -07:00
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
dd6fd2b68d
Remove XTrustProvider as this class is kept within the
...
cloud-iControl.jar.
2012-08-06 16:31:36 +02:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
3a882fa17c
License header updates for the plugins folder.
2012-08-03 09:07:43 -04:00
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
65daade79a
Add a "ping" function to the resource and allow commands to be retried.
2012-08-01 14:11:32 +02:00
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
b4bcd7f3fe
Use the name of the network (or uuid) as display text of the nicira logical switch.
2012-07-30 15:17:46 +02:00
236f63fd34
When cleaning up or setting ip associations the NiciraNvpElement should be ignored.
...
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
2012-07-30 15:17:35 +02:00
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
4421cd9dee
fixing a few more license headers
2012-07-24 10:47:03 -04:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
67bc9c819a
fixing some more license headers
2012-07-20 15:59:31 -04:00
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
Hugo Trippaers
Rohit Yadav
Murali Reddy
Hiroaki Kawai
Vijay Venkatachalam
Deepak Garg
Kelven Yang
Alex Huang
Edison Su
Hugo Trippaers
Alena Prokharchyk
Chip Childers
Kelven Yang
Jie Feng
Manikanta Kattamuri
Mice Xia
Sheng Yang
olivier lamy
Darren Shepherd
Darren Shepherd
tomoe@midokura.jp
kishan
David Nalley
bfederle