24994 Commits

Author SHA1 Message Date
Wei Zhou
76dc20a0ee CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
(cherry picked from commit c9d492d7140dd53f1630bc5ea14b948184233612)
2014-12-12 11:15:08 +01:00
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
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
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
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
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
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
Jessica Wang
0af15e4a2c CLOUDSTACK-8047: UI > zone wizard > add primary storage step: (zone-wide-primary-storage) fix a bug that failed to get cluster's hypervisor value if previous step (e.g. add host step) has ever failed. 2014-12-08 15:18:01 -08:00
Mike Tutkowski
be38b97066 Fixing an issue related to figuring out the name of a datastore that is backed by managed storage 2014-12-08 14:40:49 -07:00
Rohit Yadav
d276c0faab developer: increase disable thresholds global settings for developers
- Increases the disable thresholds for developers
- Removes the use local storage for systemvms

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 314e2daceeeecccdbdc34973d039d16817d2d166)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 21:59:10 +05:30
Daan Hoogland
b0845150fb Merge branch 'hotfix/4.5-7959' into 4.5 2014-12-08 16:47:26 +01:00
Daan Hoogland
ad59970d37 specifying MinVRVersion as 4.5.0 for the 4.5 branch 2014-12-08 15:40:39 +01:00
Sudhansu
0347b2f5f3 CLOUDSTACK-7986 [F5 LB] Failed to execute IPAssocCommand due to com.cloud.utils.exception.ExecutionException: Exception caught in Networking::urn:iControl:Networking/VLAN::create()
added 3 new method to strip partition information from VirtualServer, LBPool, VLAN api response.

With BigIP V11.x VirtualServer, LBPool, VLAN api response has been modified.
Now BigIP returns resource  name with user partition information
ex: if vlanname is vlan-100 then the get_list() will return /Common/vlan-100 (/Common -> Suer portition)
This method will strip the partition information and only returns a list with vlan name (vlan-100)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-12-08 15:46:58 +05:30
Rohit Yadav
57a210ede9 Merge branch 'hotfix/CLOUDSTACK-6212' into 4.5
This closes #52

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 14:46:23 +05:30
Rohit Yadav
a11ddf3077 CLOUDSTACK-6212: auto_increment for some other resource tables
This fix alters table columns which are primary keys but don't have them
auto_increment such as region, domain_router, user_vm etc.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-06 06:26:31 +05:30
Jessica Wang
3ddf553d16 CLOUDSTACK-8040: UI: register template dialog, register ISO dialog - fix a bug that hidden fields fail to be generated before cloudStack.preFilter.createTemplate() is called. Thus, cloudStack.preFilter.createTemplate() is unable to change hidden fields's css display property from none to inline-block for admin users. 2014-12-05 16:47:34 -08:00
Rohit Yadav
e1e5e12aaa CLOUDSTACK-6212: Let vm_instance table's ID field be unique and auto_increment
`vm_instance` table's id column is unique but does not auto_increment like other
resource tables. The fix simply alter the table's id column to have it
auto_increment which may avoid id conflicts in a multi-master mysql setup.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-06 05:54:39 +05:30
Jessica Wang
4f748e6e30 CLOUDSTACK-8039: UI > Infrastructure > router, systemvm > detailView > hide ChangeServiceOffering action when vm's hypervisor is XenServer and vm's status is Running. 2014-12-05 14:40:21 -08:00
Gaurav Aradhye
7c951a2fa9 CLOUDSTACK-8018: Improve code quality - test_redundant_router.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-05 19:51:13 +05:30
Sheng Yang
ddf6fd2f9a CLOUDSTACK-7436: Fix automation test on RvR status detection
Everytime when checking the RvR status, you must wait some time for RvR to
update it's status. The polling thread would update the status only every 30
seconds by default.
2014-12-05 19:51:04 +05:30
Gaurav Aradhye
8d5ce97edc CLOUDSTACK-8029: Remove unused kaypairs from test_data.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-05 18:36:19 +05:30
Gaurav Aradhye
a72b6a7f99 CLOUDSTACK-8028: Fix test_data.py - Separate virtual_machine dict having userdata key
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-05 18:36:19 +05:30
Jayapal
2d7f0c693b CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:55:41 +05:30
Gaurav Aradhye
d5370a95d2 CLOUDSTACK-8002: test_high_availability.py - Skip test cases if enough hosts are not available
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-05 11:19:03 +05:30
Gaurav Aradhye
a6fd3190c0 CLOUDSTACK-8003: test_egress_fw_rules.py - Remove test case dependency on each other and improve cleanup code
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-05 11:18:54 +05:30
Damodar
7ef0f5507d Attach volume events are not correctly shown in events.
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 20:01:41 +05:30
Rohit Yadav
bf88be5b25 Revert "CLOUDSTACK-8011: Upgrade maven dependencies"
This reverts commit 482815d084e549b4cf8ba893d7c5174092e33437.
2014-12-04 19:47:23 +05:30
Rohit Yadav
752980f370 Revert "packaging: updated hardcoded jasypt version to 1.9.2"
This reverts commit 43f39a1ec37de08e5b8e97dfd74a853c0aae76c7.
2014-12-04 19:47:10 +05:30
Ashutosh K
1f7699f458 CLOUDSTACK-7998: test_escalations_instances.py - Correcting code related to detach volume
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-04 16:37:35 +05:30
Ashutosh K
c2c7ee25ed CLOUDSTACK-8020: test_snapshots.py - Fixed cleanup issue
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-04 16:32:48 +05:30
Sheng Yang
feeafa76a4 CLOUDSTACK-5241: Remove Rot13 cipher 2014-12-03 19:30:31 -08:00
Min Chen
ab16011874 CLOUDSTACK-5949: remove unused vnc_password from user_vm_view view to avoid decryption bottleneck. 2014-12-03 14:48:01 -08:00
Rohit Yadav
43f39a1ec3 packaging: updated hardcoded jasypt version to 1.9.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 04:02:46 +05:30
Rohit Yadav
482815d084 CLOUDSTACK-8011: Upgrade maven dependencies
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fac7bfc5d503aa25a82a684f7ec545197d255fb2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	pom.xml
2014-12-04 02:14:54 +05:30
Min Chen
344d98e0bd CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:48:07 -08:00
Will Stevens
3f8d0dd487 CLOUDSTACK-7959: fixed 'qemu-img convert' compat issue 2014-12-02 18:24:16 -05:00