17989 Commits

Author SHA1 Message Date
Min Chen
d5050d3157 Fix ExtractVolume bug in generating URL. 2013-05-15 18:53:22 -07:00
Sheng Yang
265acca9d5 Merge remote-tracking branch 'origin/master' 2013-05-15 17:23:51 -07:00
Min Chen
7ffb6d8464 Fix DettachAnswer to have default result state for CLOUDSTACK-2526. 2013-05-15 16:52:28 -07:00
Sheng Yang
2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Min Chen
62a9daa5d6 Properly invoke parent constructor to default Answer result to true. 2013-05-15 15:52:46 -07:00
Chiradeep Vittal
521e156520 CLOUDSTACK-2521: auto download ISO if not present 2013-05-15 15:33:57 -07:00
Chiradeep Vittal
076c32db9a CLOUDSTACK-2492: enable time sync on vmware if ntp is not installed 2013-05-15 15:00:31 -07:00
Min Chen
4740f84c19 Fix CLOUDSTACK-2482: NPE in createVolume when displayVolume parameter is
not passed.
2013-05-15 14:47:23 -07:00
Prachi Damle
c8af438e64 CLOUDSTACK-2522: While processing agents behind on ping, we may fail to process a host that is already in 'Down' state
Changes:
- Added a transition for DOWN -> DOWN state on PING TIMEOUT so that transition will set mgmt_server_id in the host table to null.
2013-05-15 14:27:27 -07:00
Min Chen
8de401caad Fix CLOUDSTACK-2520: Invoke parent constructor to set result state to
default true to avoid attachVolume error.
2013-05-15 14:08:09 -07:00
Prachi Damle
ddd7cfd71c CLOUDSTACK-2519: VMs on local storage incorrectly destroyed when removing another host using deleteHost API
- For DeleteHost API: Search for Volumes in READY state on the local storage of the host to find VM's in 'Running' State
- For PrepareForMaintenance API: Search for Volumes not in Destroy or Expunging state to check if the Local Storage on the host is being used.
2013-05-15 13:28:41 -07:00
Alena Prokharchyk
9f59c618e2 CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
Prachi Damle
73030f4372 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Changing the correct details dao. Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:58:13 -07:00
Prachi Damle
d31217f3be CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Added the index found missing after upgrade

Contained in branches: master
Contained in no tag
2013-05-15 11:16:43 -07:00
Prachi Damle
a13dd59d16 CLOUDSTACK-2486: Deleting the host_details and inserting them back can lead to mysql deadlock
- Instead of using separate delete and insert, we will use ON DUPLICATE KEY UPDATE to avoid the MySQL deadlock
2013-05-15 11:16:41 -07:00
Jessica Wang
7e0006a3e5 CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC. 2013-05-15 11:03:51 -07:00
Alena Prokharchyk
dbb223e4de Fixed applyLbRules for Netscaler. 2013-05-15 10:32:32 -07:00
Marcus Sorensen
bfc5887a1b Summary: Use hypervisor as clock source for system vms
BUG-ID: CLOUDSTACK-2492
Bugfix-for: 4.1,master
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1368635782 -0600
2013-05-15 10:36:22 -06:00
Wei Zhou
8f7a51ee5f CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 16:39:22 +01:00
Joe Mills
987c3427dd Midonet Plugin bugfixes
* Updated SQL upgrade scripts to include midonet configs.
* Fixed bug where default ICMP allow rule was missing
  on static NAT creation, keeping VMs from being able
  to ping the gateway.
* Changed the filter in the MidoNetElement callbacks to allow
  calls when Midonet is configured.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-05-15 17:06:00 +02:00
Jayapal
36a312d4b2 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 18:08:15 +05:30
Likitha Shetty
f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Pranav Saxena
6d6887533f CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails 2013-05-15 18:01:10 +05:30
Wido den Hollander
68a428f84d CLOUDSTACK-2515: Verify if the targetPath isn't null before comparing 2013-05-15 13:57:58 +02:00
Jayapal
9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Wei Zhou
7370638915 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 16:45:52 +05:30
Harikrishna Patnala
ffe90c0059 CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 16:17:21 +05:30
Sanjay Tripathi
9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Prasanna Santhanam
b17be94cf5 don't let requests logs
requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-15 14:52:33 +05:30
Nitin Mehta
24cdddbf5e CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 14:25:39 +05:30
Kishan Kavala
39caa0ebdd Updated network acl service test to avoid default ACL modification 2013-05-15 14:20:29 +05:30
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Kishan Kavala
3388b77156 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 12:51:08 +05:30
Edison Su
ed065418b6 add license header 2013-05-14 21:58:07 -07:00
Edison Su
879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Min Chen
c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
radhikap
be9850161e CLOUDSTACK-2467 and CLOUDSTACK-2466 2013-05-15 09:18:57 +05:30
Koushik Das
f484f4af09 CLOUDSTACK-2475: Failed to create PF rules with Cisco VNMC as the port pool object name is exceeding the max limit
Ip and port pool object names in VNMC were created by appending guest vlan, public ip and id of corresponding rule for better readability. This resulted in the name exceeding max. length allowed.
Shortened the name by removing public ip part from it.
2013-05-15 09:12:48 +05:30
Anthony Xu
1518e7ee43 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode 2013-05-14 17:52:10 -07:00
Edison Su
68ffe1c706 fix bug in create volume from snapshot 2013-05-14 16:38:02 -07:00
Min Chen
564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Alena Prokharchyk
26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Min Chen
252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen
95e7e270d4 Fix the hanging issue in deleting ISO referenced by some user vms. 2013-05-14 14:57:02 -07:00
Min Chen
03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Min Chen
87af4ddab0 Only download eligible system template for S3 image store. 2013-05-14 14:57:01 -07:00
Edison Su
12583bbffc snapshot path is accountId + volumeid 2013-05-14 13:20:10 -07:00
Pranav Saxena
edb2f3da26 CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView 2013-05-15 00:22:26 +05:30
Min Chen
2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Alena Prokharchyk
eff7587d51 InternalLB: allow domain admin to stop/start internal lb vms 2013-05-14 10:38:17 -07:00