You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/03/12 23:19:00 UTC
[1/5] git commit: updated refs/heads/4.3 to 6a6ec64
Repository: cloudstack
Updated Branches:
refs/heads/4.3 f3668453f -> 6a6ec6480
CLOUDSTACK-5986: Fix dnsmasq lease for VPC
(cherry picked from commit a253ff24682a7d405bfa8428a0833423bf19f9b9)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92b9951d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92b9951d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92b9951d
Branch: refs/heads/4.3
Commit: 92b9951df3050c8934b882b0b4c70828ac01f9af
Parents: f366845
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Mar 11 16:13:30 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Mar 12 11:02:28 2014 -0700
----------------------------------------------------------------------
.../patches/debian/config/etc/init.d/cloud-early-config | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92b9951d/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 77e0f17..9152df2 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1042,6 +1042,16 @@ EOF
sed -r -i s/^[#]?domain=.*$/domain=$DOMAIN/ /etc/dnsmasq.conf
#answer all local domain queries
sed -i -e "s/^[#]*local=.*$/local=\/$DOMAIN\//" /etc/dnsmasq.conf
+
+ command -v dhcp_release > /dev/null 2>&1
+ no_dhcp_release=$?
+ if [ $no_dhcp_release -eq 0 ]
+ then
+ echo 1 > /var/cache/cloud/dnsmasq_managed_lease
+ sed -i -e "/^leasefile-ro/d" /etc/dnsmasq.conf
+ else
+ echo 0 > /var/cache/cloud/dnsmasq_managed_lease
+ fi
}
[5/5] git commit: updated refs/heads/4.3 to 6a6ec64
Posted by an...@apache.org.
CLOUDSTACK-6232 allow expansion of ip on isolated networks as well
(cherry picked from commit edf97ac86c94741ae8964b640bdfc0234929c1e4)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a6ec648
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a6ec648
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a6ec648
Branch: refs/heads/4.3
Commit: 6a6ec648099553a42f830dcd566eab2452428908
Parents: 4161650
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 12 19:36:11 2014 +0100
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Mar 12 14:05:10 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6ec648/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 2e2c39f..662eaae 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2643,9 +2643,10 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
networkId = network.getId();
zoneId = network.getDataCenterId();
}
- } else if (network.getGuestType() == null || network.getGuestType() == Network.GuestType.Isolated) {
- throw new InvalidParameterValueException("Can't create direct vlan for network id=" + networkId
- + " with type: " + network.getGuestType());
+ } else if (network.getGuestType() == null ||
+ (network.getGuestType() == Network.GuestType.Isolated
+ && _ntwkOffServiceMapDao.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(), Service.SourceNat))) {
+ throw new InvalidParameterValueException("Can't create direct vlan for network id=" + networkId + " with type: " + network.getGuestType());
}
}
[3/5] git commit: updated refs/heads/4.3 to 6a6ec64
Posted by an...@apache.org.
[CLOUDSTACK-6232] bridging allowed in isolated networks
(cherry picked from commit f78e7ae51f55da17ed5ba239f99457ee8bc7c4d8)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9af90e31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9af90e31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9af90e31
Branch: refs/heads/4.3
Commit: 9af90e319d3efe38c86712e3206984670f3625d7
Parents: 3443517
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 5 20:16:55 2014 +0100
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Mar 12 11:03:22 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9af90e31/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index c3bf72a..ac04473 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -40,6 +40,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
@@ -53,7 +55,6 @@ import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
-import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.configuration.Config;
@@ -1237,7 +1238,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// Vlan is created in 1 cases - works in Advance zone only:
// 1) GuestType is Shared
- boolean createVlan = (startIP != null && endIP != null && zone.getNetworkType() == NetworkType.Advanced && (ntwkOff.getGuestType() == Network.GuestType.Shared));
+ boolean createVlan = (startIP != null && endIP != null && zone.getNetworkType() == NetworkType.Advanced
+ && ((ntwkOff.getGuestType() == Network.GuestType.Shared)
+ || (ntwkOff.getGuestType() == GuestType.Isolated &&
+ !areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
if (!createVlan) {
// Only support advance shared network in IPv6, which means createVlan is a must
@@ -4003,7 +4007,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
@Inject
public void setNetworkGurus(List<NetworkGuru> networkGurus) {
- this._networkGurus = networkGurus;
+ _networkGurus = networkGurus;
+
}
}
[4/5] git commit: updated refs/heads/4.3 to 6a6ec64
Posted by an...@apache.org.
check-style: tabs to spaces(cherry picked from commit 0379dbb489b2502b8cf89583afd1a1f3baec93a3)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4161650c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4161650c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4161650c
Branch: refs/heads/4.3
Commit: 4161650c6bed38a5d4cd235ec62bbd2b899a4f57
Parents: 9af90e3
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 12 18:09:36 2014 +0100
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Mar 12 11:17:41 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4161650c/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index ac04473..df58e11 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1240,8 +1240,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// 1) GuestType is Shared
boolean createVlan = (startIP != null && endIP != null && zone.getNetworkType() == NetworkType.Advanced
&& ((ntwkOff.getGuestType() == Network.GuestType.Shared)
- || (ntwkOff.getGuestType() == GuestType.Isolated &&
- !areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
+ || (ntwkOff.getGuestType() == GuestType.Isolated &&
+ !areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))));
if (!createVlan) {
// Only support advance shared network in IPv6, which means createVlan is a must
[2/5] git commit: updated refs/heads/4.3 to 6a6ec64
Posted by an...@apache.org.
CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars
(cherry picked from commit 454cac448d83b973d8cd337cf214b17e31828b93)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34435173
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34435173
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34435173
Branch: refs/heads/4.3
Commit: 34435173a789eb5a1385672fa10cda6332aa9ad8
Parents: 92b9951
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 12 15:50:43 2014 +0100
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Wed Mar 12 11:02:56 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/NetworkACLItemVO.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34435173/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
index 46f84c9..f4b65b5 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
@@ -61,7 +61,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
@Enumerated(value=EnumType.STRING)
TrafficType trafficType;
- @Column(name="cidr")
+ @Column(name = "cidr", length = 2048)
String sourceCidrs;
@Column(name="uuid")
@@ -75,7 +75,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
Action action;
public NetworkACLItemVO() {
- this.uuid = UUID.randomUUID().toString();
+ uuid = UUID.randomUUID().toString();
}
public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol,
@@ -85,11 +85,11 @@ public class NetworkACLItemVO implements NetworkACLItem {
this.sourcePortEnd = portEnd;
this.protocol = protocol;
this.aclId = aclId;
- this.state = State.Staged;
+ state = State.Staged;
this.icmpCode = icmpCode;
this.icmpType = icmpType;
setSourceCidrList(sourceCidrs);
- this.uuid = UUID.randomUUID().toString();
+ uuid = UUID.randomUUID().toString();
this.trafficType = trafficType;
this.action = action;
this.number = number;
@@ -181,7 +181,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
@Override
public String getUuid() {
- return this.uuid;
+ return uuid;
}
@Override