56d94fc074
Merge branch 'master' into internallb1
...
Conflicts:
plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2013-05-09 10:21:34 -07:00
2e21060028
CLOUDSTACK-869 nTier Apps 2.0 : Support NetScalar as external LB provider
2013-05-09 15:23:00 +05:30
600f140df6
fix CLOUDSTACK-2277 Add approriate message for the user informing about the absence of vm-tools when adding nics to vm on vmware
2013-05-09 14:27:13 +08:00
6ef615e40d
fix bug CLOUDSTACK-2341 remove network from VM is not removing PF/LB/static nat rules for the VM
2013-05-09 11:04:30 +08:00
3c59747635
Made a cast so we don't get warnings
2013-05-08 15:38:00 -07:00
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
43e1667f90
Moved all DAOs and VOs to the cloud-engine-schema project
2013-05-07 14:31:56 -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
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
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
a153373c7e
CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack
2013-05-07 13:15:30 -07:00
d8e61a1c0a
CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-07 13:13:55 -07:00
d5cd3f7e00
Dedicate guest vlan range to account
2013-05-07 13:13:54 -07:00
732566e703
CLOUDSTACK-2364: fixed private gateway creation in VPC - the vnet for the private gateway network is not stored in data_center_vnet table
2013-05-07 13:07:47 -07:00
b3dce64577
fix unitest
2013-05-07 10:59:06 -07:00
b17885f0f6
InternalLb: some fixes to the unittest
2013-05-07 09:55:47 -07:00
bc823f946c
Fixed up the simulator to run with windows paths in cygwin
2013-05-06 16:34:41 -07:00
2639b9f91e
Moved over the VLAN daos
2013-05-06 16:34:41 -07:00
3722d66aae
Fixed up unit testing to use only an in class TestConfiguration
2013-05-06 16:34:27 -07:00
074df0b415
Fixed an incorrect unit test for affinity group. Removed some useless pom.xml.
2013-05-06 16:34:26 -07:00
572e71e57d
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-06 16:34:26 -07:00
f6913b5088
Removed files that are no longer used and further separated out the files in the core project
2013-05-06 16:34:21 -07:00
ad2777c547
Moved agent commands to core and out of api
2013-05-06 16:34:20 -07:00
e0d8f01ecd
Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema.
2013-05-06 16:34:16 -07:00
af5bf94b43
CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-06 20:58:32 +01:00
b29449b4b7
CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack
2013-05-06 11:46:43 -07:00
e56d2a401c
CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-06 15:11:49 +05:30
c8d843241e
Dedicate guest vlan range to account
2013-05-06 10:02:41 +05:30
1cff609347
Merge branch 'master' into internallb1
...
Conflicts:
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/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-05-03 12:50:59 -07:00
053e18454d
InternalLB: marvin integration test for internal lb feature
2013-05-03 11:07:07 -07:00
a3a5c13427
CLOUDSTACK-2303: upgrade failed from 2.2.14 to 4.1.0 - part2
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-03 16:03:56 +01:00
38b4f84f17
CLOUDSTACK-2146: system vm scaleup failed ;{ "scalevirtualmachineresponse" : {"errorcode":530,"cserrorcode":9999,"errortext":"Failed to scale vm"} }
...
Only response generation for system vm scale up failed so fixed by changing the response object.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-03 16:49:08 +05:30
a3a5862301
CLOUDSTACK-2317: NPE while cloudstack trying to get system ip and enable
...
static nat for the vm VM
splitting enableStaticNat() method in to a service and manager layer
method. So as to ensure action event annotation is present only on
service layer method.
2013-05-03 15:37:25 +05:30
3ae4819732
fixes bug which was storing NetScale site public IP as site private IP
2013-05-03 12:36:02 +05:30
0680fbdff3
CLOUDSTACK-2193: associateIpAddress is failing in "basic zone" that is
...
enabled for EIP/ELB
restricting check that shared network should have services in orider to
associate ip, to advaced zone shared networks only. On basic zone shared
network associateIpAddress should work.
2013-05-03 11:38:40 +05:30
4a40f3f6da
CLOUDSTACK-741: Granular Global Parameters fixing network.throttling.rate to work per zone in vmware
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-03 10:52:04 +05:30
d7cab21e9a
1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot
2013-05-03 12:32:53 +08:00
f8504c0960
CLOUDSTACK-2303: fix upgrade failed from 2.2.14 to 4.1.0 for systemvm changes
...
The version of systemvm of 3.* and 4.0.* is systemvm-kvm-3.0.0.(from
http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.0.2/pdf/Release_Notes/Apache_CloudStack-4.0.2-Release_Notes-en-US.pdf )
However, on cloudstack 4.1.0, the systemvm version is 4.1.0. (from
http://dissociatedpress.net/uploads/Apache_CloudStack-4.1.0-Release_Notes-en-US.pdf )
so the upgrade processing from 2.2.14 to 4.1.0 will abort at
updateSystemVms in Upgrade2214to30.java.
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-02 13:12:18 -04:00
85a1cc962c
CLOUDSTACK-2087: Destroying the instance is not decrementing the primary storage usage [Resource Count table - No of volumes is not got decremented]
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-02 16:17:13 +05:30
1f1467974f
CLOUDSTACK-1828 Source Nat on private gateway feature
2013-05-02 15:40:15 +05:30
f1c794de1b
CLOUDSTACK-2160: fix bug add a huge size guest network will cause out of memory
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-02 13:19:12 +08:00
f101241050
Apply patch for https://reviews.apache.org/r/10892/
2013-05-01 17:40:38 -07:00
3d10f700f9
CLOUDSTACK-2120: API - mixed zone management - fix a bug that listTemplates/listIsos API didn't take in zoneType properly.
2013-05-01 16:13:20 -07:00
2e8e2f98f5
InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa
2013-05-01 14:06:01 -07:00
Alena Prokharchyk
Rajesh Battala
Mice Xia
Alex Huang
Wei Zhou
Sanjay Tripathi
Likitha Shetty
Kelven Yang
Harikrishna Patnala
Murali Reddy
Jayapal
Hongtu Zang
Jessica Wang