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
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
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
646e810fcf
fixing wildcard imports
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-07 13:13:56 -07:00
d5cd3f7e00
Dedicate guest vlan range to account
2013-05-07 13:13:54 -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
2b87261783
fixing wildcard imports
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-06 18:51:53 +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
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
64fb826640
fixing build break due to commit a3a5862301
2013-05-03 16:35:28 +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
d7cab21e9a
1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot
2013-05-03 12:32:53 +08:00
1f1467974f
CLOUDSTACK-1828 Source Nat on private gateway feature
2013-05-02 15:40:15 +05:30
f101241050
Apply patch for https://reviews.apache.org/r/10892/
2013-05-01 17:40:38 -07:00
8c8845bf77
Merge branch 'master' into internallb1
2013-05-01 10:39:10 -07:00
1cb9bd531f
CLOUDSTACK-2180: restoreVirtualMachine returns no password if the template is password enabled
...
New password is generated as part of restore vm(passwd enabled template) and send new password on VR
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-01 12:29:08 +05:30
7b24a7640c
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
setup/db/db/schema-410to420.sql
2013-04-29 16:12:10 -07:00
deaf9106ca
CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
...
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
ef00f1b04f
CLOUDSTACK-2120: mixed zone management - API: extend listClusters API to to take in zonetype.
2013-04-27 21:38:03 -07:00
271f8759be
CLOUDSTACK-2120: mixed zone management - API: extend listPods API to to take in zonetype.
2013-04-27 18:30:21 -07:00
774b2ebf9d
CLOUDSTACK-2120: mixed zone management - API: extend listSystemVMs API to to take in zonetype.
2013-04-27 11:41:53 -07:00
45dbd9cdc6
CLOUDSTACK-2120: mixed zone management - API: extend listTemplates, listIsos API to to take in zonetype.
2013-04-27 11:02:02 -07:00
1f0863f75b
CLOUDSTACK-2120: mixed zone management - API: extend listNetworks API to to take in zonetype.
2013-04-26 15:23:30 -07:00
a20ed3a43d
CLOUDSTACK-2120: mixed zone management - API: change listZones API to to take in zonetype instead of networktype (to be consistent with other listXXXXXXXs API).
2013-04-26 11:37:32 -07:00
7cf312a770
CLOUDSTACK-2120: mixed zone management - API: extend listSnapshots API to to take in zonetype.
2013-04-26 11:19:35 -07:00
4f9c47ce54
InternalLb: create internal lb vm specific service offering
2013-04-25 16:02:58 -07:00
6f60833f93
CLOUDSTACK-2120: mixed zone management - (1) extend listRouters API to to take in zonetype. (2) UI: populate Routers list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of Routers based on selected option in zone type dropdown on top menu.
2013-04-25 15:10:33 -07:00
408ee59d1f
Internallb: new set of Web services APIs for managing Internal LB VMs
2013-04-25 14:03:40 -07:00
b5979ba9b5
LOUDSTACK-2120: mixed zone management - (1) extend listZones API to to take in networktype. (2) UI: populate Zones list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of zones based on selected option in zone type dropdown on top menu.
2013-04-25 10:40:08 -07:00
ee02311fae
CLOUDSTACK-2120: mixed zone management - (1) extend listHosts API to to take in zonetype. (2) UI: populate Hosts/SecondaryStorages list page with ones whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-25 09:51:57 -07:00
d5c3f87903
CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-25 15:16:26 +05:30
79cc241c64
fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not getting cleaned up from the host
2013-04-25 14:25:03 +08:00
48b82a6f91
CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-24 16:36:07 -07:00
d893ba881b
CLOUDSTACK-2120: mixed zone management - (1) extend listVolumes API to to take in zonetype. (2) UI: populate Volumes list page with instances whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-24 11:26:58 -07:00
cdd459bb0b
CLOUDSTACK-2120: mixed zone management - (1) extend listVirtualMachines API to to take in zonetype. (2) UI: populate Instances list page with instances whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-24 10:38:28 -07:00
f65f3b9d50
CLOUDSTACK-1958: List GSLB response should have the GSLB site (zone load
...
balancer rule) details as well
2013-04-24 21:03:26 +05:30
b0caae6b33
CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements
...
Description:
Currently, userdata sent over to the DeployVMCmd and
updateVMCmd commands can be upto 2K in length, whether
sent over GET or POST. We remove this limitation for
POST to change this limit to 32K. Also enabling lazy
load on userdata to improve performance during reads
of large sized userdata from user VM records.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-04-24 13:42:38 +05:30
Alena Prokharchyk
Rajesh Battala
Alex Huang
Wei Zhou
Prasanna Santhanam
Likitha Shetty
Harikrishna Patnala
Murali Reddy
Mice Xia
Jayapal
Kelven Yang
Jessica Wang
Jessica Wang
Vijayendra Bhamidipati