1b8a6986a6
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/async/AsyncJob.java
api/src/com/cloud/network/NetworkModel.java
api/src/com/cloud/network/rules/LoadBalancerContainer.java
api/src/org/apache/cloudstack/api/BaseCmd.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
client/tomcatconf/commands.properties.in
engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/test/com/cloud/network/MockNetworkModelImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkModelImpl.java
server/test/resources/appLoadBalancer.xml
setup/db/db/schema-410to420.sql
test/integration/component/test_multiple_ip_ranges.py
test/integration/smoke/test_guest_vlan_range.py
tools/marvin/marvin/integration/lib/base.py
2013-05-08 13:29:43 -07:00
738d35a61d
CLOUDSTACK-1907: Debian Squeeze 6.0 (64-bit) is not experimental any more
2013-05-08 19:54:54 +01:00
9e74fa9406
marvin changes for internallbvm provider
...
- changed the simulator context to load the internallb bean
- fixed deployDataCenter to use the additional provider by default
- fixed the sandbox script and the setup script for simulator checkin
tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-09 00:11:40 +05:30
99d0936314
CLOUDSTACK-2318: update volumes.path to fix stop/start vm error after
...
upgrade from 2.2.14 to 3.0.0
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-08 17:45:56 +01:00
44f3f5eca5
CLOUDSTACK-2145 : Failed to create guest nexus port profile while deploying the First VM on Nexus VMWARE Cluster
...
Additional stuff needs to be configured in guest port profile when Vnmc is present to provide firewall services.
The xml command used to configure port profile had issues with special characters in the input value for 'org' parameter.
2013-05-08 17:52:02 +05:30
305f3cb8a5
CLOUDSTACK-2387:Addition/Deletion of a VLAN Range from UI calls updateTrafficType API which makes all networklabels as undefined which finally results in failure to deploy VMs
2013-05-08 17:07:46 +05:30
76e8afa24f
CLOUDSTACK-2171:Unable to Create a VM In the VMware Setup with the latest Master
2013-05-08 17:05:36 +05:30
53e496517e
CLOUDSTACK-702: Tests for Multiple IP Ranges-R4
...
Add ip range overlapped with two ip ranges in the exiting cidr
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:37:29 +05:30
b8358e109e
CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:44 +05:30
1fe50a8d67
CLOUDSTACK-2363: fixing the scripts to conform with lib changes
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:43 +05:30
731cc439a3
CLOUDSTACK-2362: correct list append method
...
fix userdata integration test
2013-05-08 14:26:43 +05:30
8be304434e
CLOUDSTACK-2361: fix storage xenmotion test script
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:43 +05:30
93db64fc25
CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 14:26:40 +05:30
548a8d8c1f
Breaking down region tests
...
region tests will be run in smoke and regression. In smoke we only test
the basic creation of a region. More extensive testing of duplicate
regions, test for updating region atteributes is in component.
Separated the class for testing accounts within region (account sync)
into a a new suite.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 13:50:04 +05:30
5ef2f1f26f
CLOUDSTACK-2329, CLOUDSTACK-1820: Tests for regions
...
Marvin tests and corresponding library changes for the regions feature.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-08 13:49:13 +05:30
b6cb23cb99
CLOUDSTACK-957: Localization -- Add UK keyboard support.
2013-05-08 12:06:07 +05:30
3a41a83f88
[MARVIN] Fixing dedicate_guest_vlan_range test
2013-05-08 11:22:16 +05:30
20bc334f2c
CLOUDSTACK-2357 : Failed to update VNMC provider to enabled state
2013-05-08 08:32:48 +05:30
64dc39a2b0
Fix typo
...
Reported by Soheil Eizadi <seizadi@infoblox.com>
at dev@cloudstack.apache.org
2013-05-08 10:06:44 +09:00
0a2d49301b
Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider.
2013-05-07 15:53:03 -07:00
5b74b4d6fe
UI plugin API: Support IE-compatible CSS loading
...
If browser is IE < 9, use document.createStyleSheet to properly load
plugin's CSS dynamically.
2013-05-07 15:44:59 -07:00
43e1667f90
Moved all DAOs and VOs to the cloud-engine-schema project
2013-05-07 14:31:56 -07:00
2fd94c8bbe
CLOUDSTACK-893 api
2013-05-07 13:16:45 -07:00
12b64d6c00
Fixing the gmaven configuration for marvin/pom.xml
...
For the marvin checkin test custom properties had a typo when run for
the *nix environment.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:45 -07:00
1e4274dd9f
Renaming TesDedicateVlanRange -> TestDedicateVlanRange
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:45 -07:00
9264ac526f
Adding isolation method to the zone creation of marvin
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
3a0dc67de0
adding ACL for dedicateGuestVlanRange set of APIs
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
79f6e11368
add debug logs when access checkers fail to find API
...
When the access checkers fail for api discovery, we fail silently.
instead record a debug message.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
92cb7d3e0f
commit e0d8f01ecd enabled all tests. Fix
...
AWSAPI build by removing broken tests and excluding failing tests.
2013-05-07 13:16:44 -07:00
4a391464c7
commit e0d8f01ecd enabled all tests, but the tests in vmware-base are horribly broken and will not compile with the current CloudStack.
...
Removing the tests to fix the nonoss build and they are so broken they should be rewritten from scratch anyway.
2013-05-07 13:16:44 -07:00
2ca03a8513
moving test data to top level dictionary
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
ceaa4e1b0d
Adding tracelogs to the API discovery service
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
a3f5f01c7e
dedicateGuestVlanRange is admin only API
...
Adding ACL for the dedicateGuestVlanRange API.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:16:44 -07:00
1c4c80fe91
Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm
2013-05-07 13:16:43 -07:00
8103f3c386
CLOUDSTACK-893 first cut
2013-05-07 13:16:43 -07:00
67d0411d73
Add docs for MidoNet networking plugin [CLOUDSTACK-996]
...
Signed-off-by: Dave Cahill <dcahill@midokura.com>
2013-05-07 13:16:43 -07:00
c745e6d28e
Fixed up the simulator to run with windows paths in cygwin
2013-05-07 13:16:43 -07:00
be91c03702
Moved over the VLAN daos
2013-05-07 13:16:43 -07:00
dcc09f8472
Missing file and updated .gitignore
2013-05-07 13:16:43 -07:00
e9953cd1a8
Fixed up unit testing to use only an in class TestConfiguration
2013-05-07 13:16:43 -07:00
6727571403
Fixed an incorrect unit test for affinity group. Removed some useless pom.xml.
2013-05-07 13:15:33 -07:00
d015fb3520
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-07 13:15:33 -07:00
77547a58df
Removed files that are no longer used and further separated out the files in the core project
2013-05-07 13:15:31 -07:00
345f3d3482
Moved agent commands to core and out of api
2013-05-07 13:15:31 -07:00
e91ca00571
Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema.
2013-05-07 13:15:31 -07:00
f64564e490
Removing filterwin2k option
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-05-07 13:15:30 -07:00
944a7ea5d6
CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-07 13:15:30 -07:00
ff7f8ba362
CLOUDSTACK-2322: update network.gateway to fix deployVm error on
...
SharedNetwork after ipv6 support
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-07 13:15:30 -07:00
a153373c7e
CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack
2013-05-07 13:15:30 -07:00
46f59cd49e
Fixed the incorrect assertion in noncontiguous_vlan test
...
The assertion fails if the VLAN is found in which case find returns a
positive number. So here the assertion should infact assert < 0 result.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:13:56 -07:00
Alena Prokharchyk
Edison Su
Prasanna Santhanam
Wei Zhou
Koushik Das
Pranav Saxena
sanjeevneelarapu
Srikanteswararao Talluri
Sangeetha Hariharan
Sanjay Tripathi
Likitha Shetty
Hiroaki KAWAI
Jessica Wang
Brian Federle
Radhika PC
Hugo Trippaers
Hugo Trippaers
Dave Cahill
Alex Huang
Dennis Lawler