24981 Commits

Author SHA1 Message Date
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
Jessica Wang
54f4240e0e CLOUDSTACK-8005: UI > storage > volume > Resize Volume action > hide "Shrink OK" checkbox when selected disk offering's disksize is bigger than the volume's disksize. Show it otherwise. 2014-12-02 11:16:08 -08:00
Gaurav Aradhye
98d75b0259 CLOUDSTACK-7991: test_security_groups.py - Move config data to test_data.py and fix pep8 issues
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
2014-12-02 10:03:41 -05:00
Rohit Yadav
d42e3df9cf CLOUDSTACK-7563: Fix potential NPE in checking answer
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-02 16:14:29 +05:30
Chandan Purushothama
4c21172f3b CLOUDSTACK-7979 : Fixed the script 'test_security_groups.py' - Zone Network Type Information should to be passed to VirtualMachine create method 2014-12-02 15:44:22 +05:30
Gaurav Aradhye
3d279bbb19 CLOUDSTACK-7993: Code enhancement - test_egress_fw_rules.py - Removing unncessary waits
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-02 15:40:47 +05:30
Gaurav Aradhye
e6236297a1 CLOUDSTACK-8001: test_add_remove_network.py - Tag invalid test case as invalid
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-02 15:32:33 +05:30
Sheng Yang
c987080c26 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 18:59:25 -08:00
Logan Barfield
3a36681b6e Fixed root disk resize on deploy for RBD.
Signed-off-by: Wido den Hollander <wido@widodh.nl>
(cherry picked from commit 3a52a83faeaa72a8488b2db1253fef6d3308d708)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
2014-12-02 01:56:37 +05:30
Wei Zhou
bf9e1ae7e8 Deploy vm to specified host through Infrastructure -> Hosts -> <Select one> -> View Instances -> Add Instance
(cherry picked from commit ce2b2a1fc7c4b018bde11385c25b5a41333b2312)
2014-12-01 14:50:01 +01:00
Koushik Das
513adab51b CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
2014-12-01 18:09:58 +05:30
Wei Zhou
21b0ad4a62 Remove error message when start management server if JAVA_HOME is not set
(cherry picked from commit 449d123ce73393d79467314446fb50cc06f957d7)
2014-12-01 13:38:27 +01:00
Loic Lambiel
99cb19787e CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit c1bf7eeeeeb3bd4dad384225d411e21859cce470)
2014-12-01 13:05:12 +01:00
Rohit Yadav
1a67b6e98b README: add information about official git repository
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 45423c737e091eca89c93f4279862a07020b1f10)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 17:10:35 +05:30