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
440e8484d6
InternalLB: unittests for InternalLoadBalancerVMManager
2013-04-29 13:43:11 -07:00
a0dbf89090
Look for null pointer on account id before trying to update usage when releasing
...
an IP. This seems to be possible if expunge fails at some point after freeing
an IP, on subsequent expunge tries the IP is freed already and gets null pointer
when looking for account id.
BUG-ID: CLOUDSTACK-2279
Bugfix-for: 4.1,4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367251304 -0600
2013-04-29 10:01:44 -06: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
63babe4b7e
InternalLb:
...
1) Added unittests for InternalLoadBalancerVMService
2) Added unittests for InternalLoadBalancerElementService
2013-04-26 15:22:19 -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
318c7f2af0
CLOUDSTACK-1794 Throwing error when configuring egress rules for shared networks
2013-04-26 15:09:41 +05:30
f429c6687b
Don't allow success to be reported when we fail to stop vm due to no agent
...
connection
BUG-ID: CLOUDSTACK-2195
Bugfix-for: 4.2
Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366950954 -0600
2013-04-25 22:35:54 -06:00
efb4471dc9
CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in
...
listXXX api and incorrect async job status in other async api.
Conflicts:
server/src/com/cloud/api/query/vo/AccountJoinVO.java
2013-04-25 17:40:18 -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
099677a124
CLOUDSTACK-2172: adding database upgrade to 4.1.0 in PremiumDatabaseUpgradeChecker
...
Add migration to 4.1.0 in the PremiumDatabaseUpgradeChecker, like in the
DatabaseUpgradeChecker.
I opened the ticket CS 2172, and this fix corrects the issue.
Regards.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-25 15:20:26 +01: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
1f97b528c5
CLOUDSTACK-1573 listNics response update for not showing vlan to normal user
2013-04-25 14:48:41 +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
7680e1cc10
Internallb:
...
1) InternalLb and PublicLb can't be enabled on the same network offering
2) Can have internalLb only on VPC tier
2013-04-24 17:24:06 -07: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
d73ca7ef73
InternalLb:
...
1) fixed the bug when the guest nic on internal lb vm wasnt set to be default
2) Don't send the rules to the internal lb vm if its in Stopped state
2013-04-24 16:10:04 -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
ff7112a074
Correcting the spelling errors in the Non contigous Vlan range code
2013-04-24 19:58:10 +05:30
8ff442bbeb
fix CLOUDSTACK-1944 Destruction of a VM with StaticNAT/FW throws a NullPointerException during VM Expunge
2013-04-24 20:11:18 +08:00
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
434525b836
fix CLOUDSTACK-2149 and related unit test
2013-04-24 11:12:34 +08:00
ca2fc30655
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-04-23 16:58:28 -07:00
04a2b2d326
CLOUDSTACK-2120: mixed zone management - extend listPods, listClusters, listHosts, listStoragePools, listSystemVms, listRouters API to return zone type.
2013-04-23 16:32:19 -07:00
8057567aaa
Internallb: more unittests for ApplicationLoadBalancerService
2013-04-23 15:13:30 -07:00
15e2bc463f
CLOUDSTACK-2120: mixed zone management - extend listSnapshots API to return zone type.
2013-04-23 14:03:35 -07:00
6230e5b77b
CLOUDSTACK-2120 - mixed zone management - extend listIsos API to return zone type.
2013-04-23 13:46:36 -07:00
f7f1279d81
CLOUDSTACK-2120: mixed zone management - extend listTemplates API to return zone type.
2013-04-23 13:01:55 -07:00
16ba999bf1
CLOUDSTACK-2120: mixed zone management - extend listNetworks API to return zone type.
2013-04-23 13:01:55 -07:00
35e2072660
CLOUDSTACK-2120: mixed zone management - extend listVolumes API to return zone type.
2013-04-23 13:01:55 -07:00
ba4b8f1705
LOUDSTACK-751: changed the way the code retrieves the blacklisted.routes config. Now it always reads it from the DB while before we used to load it only on the management server start, and the update happened only after MS restart
2013-04-23 12:22:04 -07:00
7dd88fbbc6
fix CLOUDSTACK-2139 When VM is live migrated to a different host , stopped and started , It starts on the original host where it was before live migration.
2013-04-23 14:27:03 +08:00
c9c2c5902d
CLOUDSTACK-751: added a support for blacklisting certain routes on a zone level so they can't be used when create Static Route for VPC Private Gateway
2013-04-22 13:35:15 -07:00
b30e39b0e3
CLOUDSTACK-1392: add create template from snapshot and volume
2013-04-22 13:24:10 -07:00
612e5fb672
LOUDSTACK-2120: mixed zone management - extend listVirtualMachines API to return zone type.
2013-04-22 10:08:19 -07:00
f1b9ef8581
CLOUDSTACK-2065: addNetscalerLoadBalancer is faling to persist
...
gslb_site_publicip and privateip in db table `external_load_balancer_devices`
2013-04-22 19:01:32 +05:30
5118e9e29f
1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128
...
2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent
2013-04-22 19:38:32 +08:00
35c0273b85
InternalLb: unittests for ApplicationLoadBalancerService
2013-04-19 23:31:54 -07:00
Alena Prokharchyk
Marcus Sorensen
Harikrishna Patnala
Jessica Wang
Jessica Wang
Jayapal
Min Chen
Nicolas Lamirault
Mice Xia
Murali Reddy
Pranav Saxena
Vijayendra Bhamidipati
Edison Su