26027 Commits

Author SHA1 Message Date
Wei Zhou
c9d492d714 CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider 2014-12-12 11:13:18 +01:00
Wei Zhou
fec31d53c3 CLOUDSTACK-8064: UpdatePortForwardingRuleCmd implementation 2014-12-12 10:19:06 +01:00
Wei Zhou
dcb7fcc6df CLOUDSTACK-8063: list secondary Ips information in VM response 2014-12-12 09:47:27 +01:00
Anshul Gangwar
1115bc9cc6 CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM 2014-12-12 11:24:28 +05:30
Min Chen
fbe54974c5 CLOUDSTACK-8061: Extracting volume when it is in migrating state causes
both the operations to fail.
2014-12-11 11:36:34 -08:00
Min Chen
528bc80b4c CLOUDSTACK-8061: Extracting volume when it is in migrating state causes
both the operations to fail.
2014-12-11 09:53:33 -08:00
Wei Zhou
f5619f428b CLOUDSTACK-8051: fix NPE in updateNetwork due to static nat rules exist but no StaticNat provider 2014-12-11 15:13:36 +01:00
Wei Zhou
ed6333f3e4 [UI] bug fix: updateNetwork keep polling 2014-12-11 14:23:43 +01:00
Gaurav Aradhye
b45fe24e5c CLOUDSTACK-8062: test_multiple_ip_ranges.py - Fix the test case to avoid using same vlan IP range in each test case
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:54:32 +05:30
Gaurav Aradhye
d773eee39c CLOUDSTACK:8018: Fix test_redundant_router.test_redundantVR_internals - The SSH to router was being done from wrong host
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:54:22 +05:30
Gaurav Aradhye
487bf5f57d CLOUDSTACK:8058: Fix test_reset_ssh_keypair.py for EIP setup
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:54:00 +05:30
Gaurav Aradhye
9aefd9bf4f CLOUDSTACK:8058: Fix test_reset_ssh_keypair.py for EIP setup
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:48:17 +05:30
Gaurav Aradhye
bbebac7339 CLOUDSTACK:8018: Fix test_redundant_router.test_redundantVR_internals - The SSH to router was being done from wrong host
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:44:30 +05:30
Gaurav Aradhye
7ff118c90b CLOUDSTACK-8062: test_multiple_ip_ranges.py - Fix the test case to avoid using same vlan IP range in each test case
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-11 17:41:54 +05:30
Wei Zhou
9bfb8e5719 CLOUDSTACK-2823: pass cmdline info to system vms for 30 times
(cherry picked from commit 4eedfe53fcbab1d47b09eacaca1d803b67b6c4d2)
2014-12-11 08:33:42 +01:00
Rohit Yadav
fdb782ffcb CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8dde5491697b171b969e757f8f15858)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 19:31:27 +05:30
Rohit Yadav
e59dac201d CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8dde5491697b171b969e757f8f15858)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 19:30:56 +05:30
Gaurav Aradhye
40f26142b3 CLOUDSTACK-8059: test_host_high_availability.py - Adding necessary code to check the hosts in cluster and update the host with appropriate tags to make it HA enabled
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-10 18:45:43 +05:30
Gaurav Aradhye
75f9201853 CLOUDSTACK-8057: test_dedicate_guest_vlan_range.py - Marking a test as invalid
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-10 18:45:30 +05:30
Gaurav Aradhye
ec478c49a6 CLOUDSTACK-8057: test_dedicate_guest_vlan_range.py - Marking a test as invalid
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-10 18:44:25 +05:30
Gaurav Aradhye
345a2f8cdd CLOUDSTACK-8059: test_host_high_availability.py - Adding necessary code to check the hosts in cluster and update the host with appropriate tags to make it HA enabled
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-10 18:43:20 +05:30
Rohit Yadav
aae393dcd5 CLOUDSTACK-7974: remove old hostname entry for a VM when adding a VM
When adding a VM, it adds an entry to /etc/hosts file on the VR but does not
clear up any older entries for the VM with a same name. The fix uncomments the
command that removes any old entries in the VM.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 63298d9b742811919717ffd6303c8a2e9d37a3dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 18:25:22 +05:30
Rohit Yadav
f38c2f87b1 CLOUDSTACK-7974: remove old hostname entry for a VM when adding a VM
When adding a VM, it adds an entry to /etc/hosts file on the VR but does not
clear up any older entries for the VM with a same name. The fix uncomments the
command that removes any old entries in the VM.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 63298d9b742811919717ffd6303c8a2e9d37a3dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 18:23:16 +05:30
Sanjay Tripathi
4d78703522 CLOUDSTACK-8056: EN: Miss SC and UK keyboard option for VMware hypervisor when register a template. 2014-12-10 14:26:35 +05:30
Koushik Das
f6854bc984 CLOUDSTACK-8054: No event generated on host maintenance mode is completed
Added events for host maintenance start and completion
2014-12-10 10:18:34 +05:30
Jayapal
8278d88f76 CLOUDSTACK-8030: Updated router to come up egress default ALLOW
On default iptables rules are updated to add ACCEPT egress traffic.
    If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
    is egress default rule when there are no other egress rules.

    If the CS network egress default policy is true, CS won't configure any default rule for egress because
    router already came up to accept egress traffic. If there are already egress rules for network then the
    egress rules get applied on VR.

    For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
2014-12-10 10:13:41 +05:30
Jessica Wang
f00a62879b CLOUDSTACK-8023: UI > VM wizard widget > when next button is clicked, trigger event handler of event "cloudStack.module.instanceWizard.clickNextButton". 2014-12-09 16:25:54 -08:00
Brian Federle
2feef1722d ja_JP: Fix truncated column headers on multi-edit 2014-12-09 12:24:06 -08:00
Gaurav Aradhye
c4d383786f CLOUDSTACK-8053: Fix loop termination - test_vpc_host_maintenance.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:44 +05:30
Gaurav Aradhye
f07c6bce49 CLOUDSTACK-8049: Tagging test cases which cannot be run on simulator accordingly
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:34 +05:30
Gaurav Aradhye
0977140043 CLOUDSTACK-8048: Fix test_ss_limits.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:27 +05:30
Gaurav Aradhye
e22cc6e940 CLOUDSTACK-8048: Fix test_ss_limits.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 18:54:14 +05:30
Gaurav Aradhye
b23fd5ee53 CLOUDSTACK-8049: Tagging test cases which cannot be run on simulator accordingly
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 18:53:19 +05:30
Gaurav Aradhye
ab580de38d CLOUDSTACK-8053: Fix loop termination - test_vpc_host_maintenance.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 18:30:06 +05:30
Remi Bergsma
a592b01035 made iptables for the VPN connection more secure
Added destination and source definition. Flag -S can be used
to ignore this. It's the new default as it is more secure
and does not impact the way things work (backwords compatible).

(cherry picked from commit ef3b4bb4e3342f166489034fa7149540d2ef1383)
2014-12-09 11:19:43 +01:00
Remi Bergsma
85ba1f76a4 prevent CloudStack from removing the VPN connection
If connecting the VPN takes some time, for example because
the other end is not (yet) up, CloudStack will delete
the VPN because the ipsectunnel.sh does not return in time.
The VPN connection then enters the Error state.

This change makes sure ipsectunnel.sh returns in time,
and lets ipsec connect in the background. If it all fails,
the connection enters Disconnected.

(cherry picked from commit 7f33f7c3969d3b217ad6977f01bb487ebeee665d)
2014-12-09 11:19:30 +01:00
Remi Bergsma
cbc4fa2e9c add a flag -c whether or not to check the VPN on create
Changed default to no, as the other side may not be up yet.
If this check fails, the VPN enters Error state and will not
work. It's safe to just let it connect on its own so it will
connect when it can.

(cherry picked from commit f8d718e3e31ad517969663d24647fcbd9b50cc3d)
2014-12-09 11:19:20 +01:00
Remi Bergsma
e89f09aa51 starting the tunnel will make it keep trying until it connects
Changed 'auto=add' to 'auto=start' to make sure the tunnel starts.
When both sides are there they will connect. This resolves the
issue that there is only a small time frame in which the VPN
would connect.

(cherry picked from commit b95addd3efb45f61b129584ade49bad7bbaa16f8)
2014-12-09 11:19:07 +01:00
Remi Bergsma
08ab9a3769 renamed $leftgw to $leftnexthop to make clear what it does
(cherry picked from commit 8b2563a216b012ab1905e65f446c8b6b1435b983)
2014-12-09 11:18:59 +01:00
Remi Bergsma
bf7cd8a9f0 remove biglock usage from ipsectunnel.sh
Biglock breaks creating VPN's when other scripts run at the
same time that also use the same biglock. These other scripts
do nothing that could harm our deployment and even multiple
vpn's can safely be created simultaniously.

(cherry picked from commit 8b412ce194eaf195dc77531379687de43e14a088)
2014-12-09 11:18:10 +01:00
Koushik Das
016d009adf CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
The last commit 513adab51b53ba1acdea908225cfffab90ca1595 didn't fully fix it. Scenario #1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
2014-12-09 11:46:45 +05:30
Sateesh Chodapuneedi
aa84b05491 CLOUDSTACK-5933 Problem with VMware snapshot when datastore has a space in its name
Handling spaces in datastore name while extracting vmdk base name

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-12-09 05:34:41 +05:30
Rohit Yadav
ca121336a0 Merge remote-tracking branch 'worldline/master'
This closes #55

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-09 17:36:43 +05:30
Jean-Francois Vincent
068e508e3b Add the Userdata setting to the UI on VM creation step 2014-12-09 11:32:49 +01:00
Daan Hoogland
1a99c39da1 Merge remote-tracking branch 'origin/4.5' 2014-12-09 11:28:36 +01:00
Daan Hoogland
76bb54b777 Merge branch 'master' of https://github.com/remibergsma/cloudstack 2014-12-09 10:44:30 +01:00
Koushik Das
ef9830d6a4 Merge branch '4.5'
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	tools/appliance/build.sh
2014-12-09 14:59:36 +05:30
Wei Zhou
0fc07e6ea8 [UI] bug fix: update vm info after add/remove nic 2014-12-09 09:55:40 +01:00
Wei Zhou
bbca8cda94 [UI] list only non-existing networks when Add network to VM 2014-12-09 08:44:06 +01:00
Wei Zhou
13205e6be1 CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes 2014-12-09 08:21:35 +01:00