Commit Graph

22387 Commits

Author SHA1 Message Date
Rohit Yadav 2a87d7e8c1 travis: remove the marvin flag require_hardware which is not needed for 4.3
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 19:38:27 +02:00
Sebastien Goasguen 9669a2031c Adding Travis badge on README.md 2014-09-01 11:34:36 -04:00
Rohit Yadav 28500840a1 travis: remove --zone and --hypervisor for 4.3 branch
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 17:25:18 +02:00
Rohit Yadav 514c2ef0fb NetUtils: Check for NPE in getDefaultHostIp method when processing nic/mac
On hosts or containers where they don't have valid mac address on nic resulting
in null, NetUtils.getNetworkParam can throw NPE.

This was a case found on TravisCI where OpenVZ containers are used. This method
(getDefaultHostIp) is used at several other places within the ACS codebase to
get the host IP and if null is caught we fallback to localhost or 127.0.0.1, so
we therefore set info to null before trying to process network param and if we
fail we return null and expect other layers to use localhost.

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

Conflicts:
	utils/src/com/cloud/utils/net/NetUtils.java
2014-09-01 16:09:36 +02:00
Rohit Yadav 435fa225c6 CLOUDSTACK-4770: In MacAddress skip macAddress when parsed value is 0x00
In MacAddress class, we start by settig macAddress String as null and go through
the output of ifconfig -a and pick the one string that is a valid mac address
but is not 0x00 and 0xff. With each loop we set the macAddress to null so that
it does not pick the last one if everything fails.

Tested on Ubuntu where I had an interface called cloud0 whose mac id was 0x00
and it was skipped to get the next one:

$ java -classpath <path-to-cloud-utils.jar> com.cloud.utils.net.MacAddress
addr in integer is 5071953436
addr in bytes is  0 1 2e 4f de 1c
addr in char is 00:01:2e:4f:de:1c

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 3b5aa42c6d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 16:06:48 +02:00
Rohit Yadav f5483eeeab schema: fix upgrade paths in the upgrade map of DatabaseUpgradeChecker
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 13:52:25 +02:00
Rohit Yadav df5dfd40c3 apidoc: use non-harcoded path to client artifacts
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 13:07:07 +02:00
Ian Duffy 78c2e5296b Fix RAT issue
(cherry picked from commit b38d0b6b43)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 12:41:09 +02:00
Ian Duffy a58f098ec0 [CLOUDSTACK-6115] Investigate the use of TravisCI for CloudStack integration testing
(cherry picked from commit 26069aa377)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-01 12:40:58 +02:00
Sebastien Goasguen a743937e49 Update debian changelog version 2014-08-28 14:22:42 +00:00
Sebastien Goasguen 93ab0611fc Updating version number in Debian package changelog 2014-08-28 13:41:10 +00:00
Sebastien Goasguen 12efdd92e6 Fix version number in pom 2014-08-28 11:22:15 +02:00
Erik Weber b3bfe21cf1 CLOUDSTACK-7405: Allow all VR urls to be accessed without trailing slash
Signed-off-by: Erik Weber <terbolous@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-26 05:02:50 -04:00
Sebastien Goasguen b866fe750c Update CHANGES file with list of bug fixes 2014-08-25 11:37:05 -04:00
Sebastien Goasguen a654894dbd Updating pom.xml version numbers for release 4.3.1-SNAPSHOT
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-25 09:16:27 -04:00
Erik Weber ac04e6d97e CLOUDSTACK-7405: allowing VR meta-data to be accessed without trailing slash
Signed-off-by: Erik Weber <terbolous@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-25 08:29:34 -04:00
Min Chen 997f74af1c CLOUDSTACK-7260: Management server not responding after some time for
Vmware due to Oom (cannot create native thread).
2014-08-21 15:06:55 -07:00
Sebastien Goasguen 7e2888b4cf Merge branch 'hotfix/4.3/7038' into 4.3 2014-08-20 08:47:27 -04:00
Sebastien Goasguen 4d48f9f238 Merge branch 'hotfix/4.3/6892' into 4.3 2014-08-20 08:46:52 -04:00
Rohit Yadav f912bd7f23 CLOUDSTACK-7038: Add mysql client dependency for mgmt server pkg for debian
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-20 12:16:13 +02:00
Rohit Yadav 907d39fb94 CLOUDSTACK-6892: Create separate package for the mysql HA component
Manually picked from Hugo's fix: 539db08956

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-20 12:00:08 +02:00
Rohit Yadav 2028ca4b2d CLOUDSTACK-7038: Add mysql client dependency for mgmt server/rpms
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-20 11:47:00 +02:00
Vincent Bernat e4ae5b20fb CLOUDSTACK-7193: handle domain ID being an int
Recent versions of libvirt (at least 0.9.8) will return an int when
queried for the ID of a domain, not a string. This breaks some parts of
the `security_group.py` script which expects a string containing an
int. Notably, this breaks the part handling VM reboots which is
therefore not executed.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-18 10:39:00 -04:00
Joris van Lieshout 45deade1df sysctl improvements. 1. ip_nonlocal_bind for smooth transition in case of a keepalived failover. 2. panic settings so that a vm dies in a way that ACS understands it's down. 3. also up the nf_conntrack limits.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-08-14 13:45:57 +02:00
Luis Henrique Okama e7ef14abae bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 23:57:49 +02:00
Will Stevens 433be68a6c CLOUDSTACK-6886 - Fixed the issue created by the SSL feature with the SDX: 2014-07-22 18:32:39 -04:00
Saksham Srivastava 19b72d6cf5 CLOUDSTACK-6508: impossible to list projects from API with domainid set 2014-07-22 13:36:42 -04:00
Edison Su 720315b8d1 CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool 2014-07-16 16:30:15 -07:00
Harikrishna Patnala 5cd4c41054 CLOUDSTACK-7087: Latest OS X VPN client not working Downgrading openswan version to 1:2.6.37-3
Reviewed-by: Abhinandan

Signed-off-by: Sheng Yang
2014-07-09 14:03:22 -07:00
Rajani Karuturi 3bf4c29431 CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-03 15:08:18 +02:00
Wei Zhou ec823db47a [UI] bug fix: error message was not shown if fail to delete snapshot 2014-07-03 11:20:44 +02:00
Wei Zhou ec55f5ca96 [UI] bug fix: vpn configuration does not show ipsec presharedkey 2014-07-03 11:20:37 +02:00
Wei Zhou fe1cdbd235 [UI] update vm nic information after add/remove NIC 2014-07-03 11:20:30 +02:00
Wei Zhou 9b7ac9dfac [UI] show all secondary ips in VM NIC page 2014-07-03 11:20:22 +02:00
Wei Zhou c3cbb7972e [UI] deploy vm to specified host in Infrastructure->Hosts page 2014-07-03 11:20:16 +02:00
Sebastien Goasguen f6aff77b8e Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3 2014-07-02 16:29:15 +02:00
Joris van Lieshout 0e50cb1246 CLOUDSTACK-6665: A fix for vpc routers not releasing dhcp leases.
Author: John Nielsen <john@betterservers.com>

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-02 16:28:02 +02:00
Joris van Lieshout 6d0650bbcd CLOUDSTACK-6665: A fix for vpc routers not releasing dhcp leases.
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-02 16:26:45 +02:00
Rajani Karuturi dae442e091 COVERITY: Fixed few coverity issues unused assignments, boxing and unboxing of values etc.
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-02 16:08:00 +02:00
Rajani Karuturi 85bed5fa2b COVERITY: Fixed issues reported by coverity NPEs, unwritten field access and self assignment
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-02 16:07:06 +02:00
Rajani Karuturi 44c8e1f67f COVERITY: Fixed Resource leak (RESOURCE_LEAK) 11.
overwrite_var: Overwriting "pstmt" in "pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ldap_configuration`(hostname, port) VALUES(?,?)")" leaks the resource that "pstmt" refers to.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-07-02 16:05:09 +02:00
Wei Zhou ba9ae0c663 [UI] add view instances in template/iso details page 2014-07-01 11:39:38 +02:00
Wei Zhou 39cc82dbe8 [UI] hide listHosts for stopped vm 2014-07-01 11:39:30 +02:00
Wei Zhou 6fd419ad9d [UI] filter out already connected networks when add network to vm 2014-07-01 11:39:25 +02:00
Wei Zhou 11f5f926b9 [UI] show isVolatile explanation text 2014-07-01 11:39:21 +02:00
Daan Hoogland 51f145b564 datamigration for vlan uris 2014-06-30 15:15:11 +02:00
Olivier Lemasle caa102c23d CLOUDSTACK-7006: Restore template ID in ROOT volume usages
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-30 15:10:17 +02:00
Daan Hoogland 8d0f49addd CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
(cherry picked from commit 17850c7aff)

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2014-06-25 17:16:08 +02:00
Daan Hoogland 5673c036c0 CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f)

Conflicts:
	utils/test/com/cloud/utils/net/NetUtilsTest.java
2014-06-25 17:12:33 +02:00
Daan Hoogland c05a007536 CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
(cherry picked from commit 018b471ad3)
2014-06-25 16:58:10 +02:00