You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/23 12:21:30 UTC
[01/19] git commit: updated refs/heads/4.9 to 20986ba
Repository: cloudstack
Updated Branches:
refs/heads/4.9 a0e36b73a -> 20986ba51
CLOUDSTACK-9649: In the management server log there is an error
related to 0.0.0.0 IP address
Added guest ip of VR as control ip for a Basic zone with VMware.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15eab829
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15eab829
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15eab829
Branch: refs/heads/4.9
Commit: 15eab829c737dc9ec97721b9bab94c271d0a390d
Parents: f231c8c
Author: Sudhansu <su...@accelerite.com>
Authored: Fri Dec 2 15:49:08 2016 +0530
Committer: Sudhansu <su...@accelerite.com>
Committed: Sat Dec 3 10:25:53 2016 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 30 +++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15eab829/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 3332393..e877f02 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1208,10 +1208,9 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
if (!Boolean.parseBoolean(serviceMonitoringFlag) || router.getVpcId() != null) {
continue;
}
+ String controlIP = getRouterControlIP(router);
- final String privateIP = router.getPrivateIpAddress();
-
- if (privateIP != null) {
+ if (controlIP != null && !controlIP.equals("0.0.0.0")) {
OpRouterMonitorServiceVO opRouterMonitorServiceVO = _opRouterMonitorServiceDao.findById(router.getId());
GetRouterAlertsCommand command = null;
@@ -1225,7 +1224,7 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
command = new GetRouterAlertsCommand(opRouterMonitorServiceVO.getLastAlertTimestamp());
}
- command.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());
+ command.setAccessDetail(NetworkElementCommand.ROUTER_IP, controlIP);
try {
final Answer origAnswer = _agentMgr.easySend(router.getHostId(), command);
@@ -1280,6 +1279,29 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
}
}
+ private String getRouterControlIP(DomainRouterVO router){
+ final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
+ String controlIP = null;
+
+ if(router.getHypervisorType() == HypervisorType.VMware && dcVo.getNetworkType() == NetworkType.Basic ){
+
+ final List<NicVO> nics = _nicDao.listByVmId(router.getId());
+ for (final NicVO nic : nics) {
+ final NetworkVO nc = _networkDao.findById(nic.getNetworkId());
+ if (nc.getTrafficType() == TrafficType.Guest && nic.getIPv4Address() != null) {
+ controlIP = nic.getIPv4Address();
+ break;
+ }
+ }
+ s_logger.debug("Vmware with Basic network selected Guest NIC ip as control IP " + controlIP );
+ }else{
+ controlIP = _routerControlHelper.getRouterControlIp(router.getId());
+ }
+
+ s_logger.debug("IP of control NIC " + controlIP );
+ return controlIP;
+ }
+
@Override
public boolean finalizeVirtualMachineProfile(final VirtualMachineProfile profile, final DeployDestination dest, final ReservationContext context) {
[10/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9612: Fixed issue in restarting redundant network with cleanup
Rvr Network with cleanup which is updated from the isolated network is failed.
Corrected the column name string issue.
This closes #1781
(cherry picked from commit 0f742e17237fc84d5e86dae9a67c7ef6a0b6c80c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d678dfc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d678dfc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d678dfc
Branch: refs/heads/4.9
Commit: 7d678dfcaeaae7ea813132fc9a85572321032c3d
Parents: 60c4fce
Author: Jayapalu <Ja...@apache.org>
Authored: Thu Nov 24 16:17:09 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:12:12 2016 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d678dfc/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 5b8ded7..ee5c6b5 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -104,7 +104,7 @@ public class NetworkVO implements Network {
State state;
@Column(name = "redundant")
- boolean isRedundant;
+ boolean redundant;
@Column(name = "dns1")
String dns1;
@@ -205,7 +205,7 @@ public class NetworkVO implements Network {
this.networkOfferingId = networkOfferingId;
this.dataCenterId = dataCenterId;
this.physicalNetworkId = physicalNetworkId;
- this.isRedundant = isRedundant;
+ this.redundant = isRedundant;
if (state == null) {
this.state = State.Allocated;
} else {
@@ -301,7 +301,7 @@ public class NetworkVO implements Network {
@Override
public boolean isRedundant() {
- return this.isRedundant;
+ return this.redundant;
}
// don't use this directly when possible, use Network state machine instead
@@ -632,7 +632,7 @@ public class NetworkVO implements Network {
}
public void setIsReduntant(boolean reduntant) {
- this.isRedundant = reduntant;
+ this.redundant = reduntant;
}
}
[19/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1854 from shapeblue/4.9-multiplex-testing
4.9 multiplex testingThis merges several PRs in this PR, this is for speeding up test efforts.
* pr/1854:
CLOUDSTACK-9688: Fix VR smoke test failure in vpc_vpn
CLOUDSTACK-9688: Fix failing test_volumes on centos7/kvm
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
CLOUDSTACK-9612: Fixed issue in restarting redundant network with cleanup Rvr Network with cleanup which is updated from the isolated network is failed. Corrected the column name string issue.
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
CLOUDSTACK-9673 Exception occured while creating the CPVM in the VmWare Setup over standard vSwitches
CLOUDSTACK-9617: Fixed enabling remote access after PF or LB configured on vpn tcp ports
CLOUDSTACK-9615: Fixed applying ingress rules without ports
CLOUDSTACK-9639: Unable to create shared network with vLan isolation
CLOUDSTACK-9597: Should not fetch resource count for removed entity
CLOUDSTACK-9649: In the management server log there is an error related to 0.0.0.0 IP address
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20986ba5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20986ba5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20986ba5
Branch: refs/heads/4.9
Commit: 20986ba51215b75c67b0c4035d55a27c3de313d1
Parents: a0e36b7 b25bb10
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Dec 23 17:49:39 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 23 17:49:39 2016 +0530
----------------------------------------------------------------------
.../configuration/dao/ResourceCountDaoImpl.java | 16 +++++-
.../src/com/cloud/network/dao/NetworkVO.java | 8 +--
.../vmware/resource/VmwareResource.java | 16 +++---
.../configuration/ConfigurationManagerImpl.java | 10 ++--
.../network/firewall/FirewallManagerImpl.java | 8 ++-
.../VirtualNetworkApplianceManagerImpl.java | 30 +++++++++--
.../debian/config/opt/cloud/bin/configure.py | 8 +--
test/integration/smoke/test_volumes.py | 5 ++
test/integration/smoke/test_vpc_vpn.py | 6 +--
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 54 ++++++++++++++++++++
.../vmware/mo/HypervisorHostHelper.java | 7 ++-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 9 +++-
12 files changed, 142 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[03/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9639: Unable to create shared network with vLan isolation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25efc1ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25efc1ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25efc1ac
Branch: refs/heads/4.9
Commit: 25efc1acd6ee5b14244b5000643f388b5414c300
Parents: f03015b
Author: Nitin Kumar Maharana <ni...@accelerite.com>
Authored: Wed Dec 7 13:29:30 2016 +0530
Committer: Nitin Kumar Maharana <ni...@accelerite.com>
Committed: Fri Dec 9 12:55:31 2016 +0530
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25efc1ac/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 f8a1fac..c70d7a1 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3052,12 +3052,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// Check if the new VLAN's subnet conflicts with the guest network
// in
// the specified zone (guestCidr is null for basic zone)
+ // when adding shared network with same cidr of zone guest cidr,
+ // if the specified vlan is not present in zone, physical network, allow to create the network as the isolation is based on VLAN.
final String guestNetworkCidr = zone.getGuestNetworkCidr();
- if (guestNetworkCidr != null) {
- if (NetUtils.isNetworksOverlap(newCidr, guestNetworkCidr)) {
- throw new InvalidParameterValueException("The new IP range you have specified has overlapped with the guest network in zone: " + zone.getName()
- + ". Please specify a different gateway/netmask.");
- }
+ if (guestNetworkCidr != null && NetUtils.isNetworksOverlap(newCidr, guestNetworkCidr) && _zoneDao.findVnet(zoneId, physicalNetworkId, vlanId).isEmpty() != true) {
+ throw new InvalidParameterValueException("The new IP range you have specified has overlapped with the guest network in zone: " + zone.getName()
+ + "along with existing Vlan also. Please specify a different gateway/netmask");
}
// Check if there are any errors with the IP range
[06/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9673 Exception occured while creating the CPVM in the VmWare Setup over standard vSwitches
Issue
====
Exception occured while creating the CPVM in the VmWare Setup using standard vswitches.
StartCommand failed due to Exception: com.vmware.vim25.AlreadyExists
message: [] com.vmware.vim25.AlreadyExistsFaultMsg: The specified key, name, or identifier already exists
Fix
===
Ensure synchronization while attempting to create port group such that simultaneous attempts are not made with same port group name on same ESXi host.
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32e9e29a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32e9e29a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32e9e29a
Branch: refs/heads/4.9
Commit: 32e9e29a17a04fc844f75e25f611b860528835f1
Parents: a0e36b7
Author: Sateesh Chodapuneedi <sa...@accelerite.com>
Authored: Wed Dec 14 00:10:42 2016 +0530
Committer: Sateesh Chodapuneedi <sa...@accelerite.com>
Committed: Thu Dec 22 01:35:10 2016 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 16 +++---
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 54 ++++++++++++++++++++
.../vmware/mo/HypervisorHostHelper.java | 7 ++-
3 files changed, 65 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e9e29a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 830a75b..ad4ae26 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1125,11 +1125,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
* so we assume that it's VLAN for now
*/
if (VirtualSwitchType.StandardVirtualSwitch == vSwitchType) {
- synchronized (vmMo.getRunningHost().getMor().getValue().intern()) {
- networkInfo =
- HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null,
- _opsTimeout, true, BroadcastDomainType.Vlan, null);
- }
+ networkInfo = HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(),
+ "cloud.public", vmMo.getRunningHost(), vlanId, null, null,
+ _opsTimeout, true, BroadcastDomainType.Vlan, null);
} else {
networkInfo =
HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null, null,
@@ -2852,11 +2850,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.info("Prepare network on " + switchType + " " + switchName + " with name prefix: " + namePrefix);
if (VirtualSwitchType.StandardVirtualSwitch == switchType) {
- synchronized(hostMo.getMor().getValue().intern()) {
- networkInfo = HypervisorHostHelper.prepareNetwork(switchName, namePrefix, hostMo, getVlanInfo(nicTo, vlanToken), nicTo.getNetworkRateMbps(),
- nicTo.getNetworkRateMulticastMbps(), _opsTimeout,
- !namePrefix.startsWith("cloud.private"), nicTo.getBroadcastType(), nicTo.getUuid());
- }
+ networkInfo = HypervisorHostHelper.prepareNetwork(switchName, namePrefix, hostMo,
+ getVlanInfo(nicTo, vlanToken), nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(),
+ _opsTimeout, !namePrefix.startsWith("cloud.private"), nicTo.getBroadcastType(), nicTo.getUuid());
}
else {
String vlanId = getVlanInfo(nicTo, vlanToken);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e9e29a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
index d8fa7f3..c008e6b 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -1110,4 +1110,58 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
}
return networkName;
}
+
+ public void createPortGroup(HostVirtualSwitch vSwitch, String portGroupName, Integer vlanId,
+ HostNetworkSecurityPolicy secPolicy, HostNetworkTrafficShapingPolicy shapingPolicy, long timeOutMs)
+ throws Exception {
+ assert (portGroupName != null);
+
+ // Prepare lock to avoid simultaneous execution of the synchronized block for
+ // duplicate port groups on the ESXi host it's being created on.
+ String hostPortGroup = _mor.getValue() + "-" + portGroupName;
+ synchronized (hostPortGroup.intern()) {
+ // Check if port group exists already
+ if (hasPortGroup(vSwitch, portGroupName)) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Found port group " + portGroupName + " in vSwitch " + vSwitch.getName()
+ + ". Not attempting to create port group as it already exists.");
+ }
+ return;
+ } else {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Port group " + portGroupName + " doesn't exist in vSwitch " + vSwitch.getName()
+ + ". Attempting to create port group in this vSwitch.");
+ }
+ }
+ // Create port group if not exists already
+ createPortGroup(vSwitch, portGroupName, vlanId, secPolicy, shapingPolicy);
+
+ // Wait for port group to turn up ready on vCenter upto timeout of timeOutMs milli seconds
+ waitForPortGroup(portGroupName, timeOutMs);
+ }
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Successfully created port group " + portGroupName + " in vSwitch " + vSwitch.getName()
+ + " on host " + getHostName());
+ }
+ }
+
+ public ManagedObjectReference waitForPortGroup(String networkName, long timeOutMs) throws Exception {
+ ManagedObjectReference morNetwork = null;
+ // if portGroup is just created, getNetwork may fail to retrieve it, we
+ // need to retry
+ long startTick = System.currentTimeMillis();
+ while (System.currentTimeMillis() - startTick <= timeOutMs) {
+ morNetwork = getNetworkMor(networkName);
+ if (morNetwork != null) {
+ break;
+ }
+
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Waiting for network " + networkName + " to be ready");
+ }
+ Thread.sleep(1000);
+ }
+ return morNetwork;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e9e29a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index fb63b12..71c007d 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -1082,8 +1082,11 @@ public class HypervisorHostHelper {
}
} else {
if (!hostMo.hasPortGroup(vSwitch, networkName)) {
- hostMo.createPortGroup(vSwitch, networkName, vid, secPolicy, shapingPolicy);
- bWaitPortGroupReady = true;
+ hostMo.createPortGroup(vSwitch, networkName, vid, secPolicy, shapingPolicy, timeOutMs);
+ // Setting flag "bWaitPortGroupReady" to false.
+ // This flag indicates whether we need to wait for portgroup on vCenter.
+ // Above createPortGroup() method itself ensures creation of portgroup as well as wait for portgroup.
+ bWaitPortGroupReady = false;
} else {
HostPortGroupSpec spec = hostMo.getPortGroupSpec(networkName);
if (!isSpecMatch(spec, vid, shapingPolicy)) {
[12/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1804 from Accelerite/CLOUDSTACK-9639
CLOUDSTACK-9639: Unable to create shared network with vLan isolationDescription:
=========
Create shared network fails with Error.
While creating a shared network it fails to create with Error "The new IP range you have specified has overlapped with the guest network in the zone: XYZ. Please specify a different gateway/netmask"
Steps to Reproduce:
===============
1. Create an isolated network with a subnet eg: 10.1.1.0/24
2. Create a shared network with the same subnet but different VLAN, we should observe this issue.
Expected Behaviour:
===============
It shouldn't restrict the creation of the guest network with the same subnet as long as they are segmented by VLAN.
ACTUAL BEHAVIOR:
===============
It doesn't allow the creation of shared guest networks if there is any isolated guest network using the same subnet although it allows using the same subnet in multiple shared networks.
Cause:
=====
The issue is happening because, when Shared network is getting created we are checking if there is any guest network already implemented with the same CIDR and throwing the error without checking if they are having same VLAN also. Creating the same CIDR shared network with different VLAN should be allowed.
Fix:
===
When creating a shared network, if there is any existing guest network with the same CIDR, we check if they are having the same VLAN, if they are in same VLAN, then we don't allow creating it. If they are in the same CIDR with different VLAN then we allowing to create the network.
* pr/1804:
CLOUDSTACK-9639: Unable to create shared network with vLan isolation
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7b0345e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7b0345e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7b0345e
Branch: refs/heads/4.9
Commit: c7b0345ed28e3173f485e4c1394784b350851666
Parents: b0535d7 25efc1a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 13:29:59 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:29:59 2016 +0530
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[17/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9688: Fix failing test_volumes on centos7/kvm
Due to OS/hypervisor/environmental configuration, detaching a disk/device
using libvirt can be successful without updating the domain configuration (xml).
This leads to reattachment failure as the device is blocked until the next
reboot. This fixes a specific environment case by performing stop/start on
the VM only in case of KVM, which will recreate a fresh domain config (xml)
as KVM VMs have transient domain configs (xmls don't persist).
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdbe847d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdbe847d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdbe847d
Branch: refs/heads/4.9
Commit: cdbe847d29cb077f18913c981459d6b923dc458a
Parents: 52f224f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 15:20:54 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 15:23:00 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_volumes.py | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdbe847d/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 4dcf263..28087b1 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -378,6 +378,11 @@ class TestVolumes(cloudstackTestCase):
#Clean up, terminate the created volumes
if self.attached:
self.virtual_machine.detach_volume(self.apiClient, self.volume)
+
+ if self.virtual_machine.hypervisor == "KVM":
+ self.virtual_machine.stop(self.apiClient)
+ self.virtual_machine.start(self.apiClient)
+
cleanup_resources(self.apiClient, self.cleanup)
return
[09/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1782 from jayapalu/CLOUDSTACK-9617
CLOUDSTACK-9617: Fixed enabling remote access after PF configured on Enabling Remote access Vpn Fails when there is a portforwarding rule of the reserved ports ( 1701 , 500 , 4500) under TCP protocol on Source nat IP
* pr/1782:
CLOUDSTACK-9617: Fixed enabling remote access after PF or LB configured on vpn tcp ports
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60c4fce6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60c4fce6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60c4fce6
Branch: refs/heads/4.9
Commit: 60c4fce69092f5afca9e88089fca80a694282d26
Parents: 2088f0a d2ca30a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 13:09:19 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:09:19 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/firewall/FirewallManagerImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[18/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9688: Fix VR smoke test failure in vpc_vpn
The test_vpc_vpn uses a cidr that overlaps with the base test environment's
CIDR causing intermittent failure. This changes the cidr to not overlap
with underlying infra and avoid future failures.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b25bb10c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b25bb10c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b25bb10c
Branch: refs/heads/4.9
Commit: b25bb10c5905506f37d5ddf9576aa40247a25d18
Parents: cdbe847
Author: Murali Reddy <mu...@shapeblue.com>
Authored: Fri Dec 23 14:46:36 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 23 14:46:36 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vpc_vpn.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b25bb10c/test/integration/smoke/test_vpc_vpn.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py
index 966f40d..ddf7693 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -168,7 +168,7 @@ class Services:
"vpc2": {
"name": "TestVPC",
"displaytext": "VPC2",
- "cidr": '10.2.0.0/16'
+ "cidr": '10.3.0.0/16'
},
"network_1": {
"name": "Test Network",
@@ -180,13 +180,13 @@ class Services:
"name": "Test Network",
"displaytext": "Test Network",
"netmask": '255.255.255.0',
- "gateway": "10.2.1.1"
+ "gateway": "10.3.1.1"
},
"vpn": {
"vpn_user": "root",
"vpn_pass": "Md1s#dc",
"vpn_pass_fail": "abc!123", # too short
- "iprange": "10.2.2.1-10.2.2.10",
+ "iprange": "10.3.2.1-10.3.2.10",
"fordisplay": "true"
},
"vpncustomergateway": {
[02/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9597: Should not fetch resource count for removed entity
Signed-off-by: Marc-Aur�le Brothier <m...@brothier.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8a4a19c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8a4a19c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8a4a19c
Branch: refs/heads/4.9
Commit: e8a4a19cc934e54c9a650eb42341c0cebfde60d9
Parents: bef2236
Author: Marc-Aur�le Brothier <m...@brothier.org>
Authored: Tue Nov 15 09:39:11 2016 +0100
Committer: Marc-Aur�le Brothier <m...@brothier.org>
Committed: Tue Dec 6 07:37:29 2016 +0100
----------------------------------------------------------------------
.../configuration/dao/ResourceCountDaoImpl.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a4a19c/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index 879515a..f7cd3cb 100644
--- a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
+++ b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
@@ -21,8 +21,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import com.cloud.domain.DomainVO;
+import com.cloud.user.AccountVO;
+import com.cloud.utils.db.JoinBuilder;
import org.springframework.stereotype.Component;
import com.cloud.configuration.Resource;
@@ -59,11 +63,21 @@ public class ResourceCountDaoImpl extends GenericDaoBase<ResourceCountVO, Long>
TypeSearch.done();
AccountSearch = createSearchBuilder();
+ DomainSearch = createSearchBuilder();
+ }
+
+ @PostConstruct
+ protected void configure() {
AccountSearch.and("accountId", AccountSearch.entity().getAccountId(), SearchCriteria.Op.NNULL);
+ SearchBuilder<AccountVO> joinAccount = _accountDao.createSearchBuilder();
+ joinAccount.and("notremoved", joinAccount.entity().getRemoved(), SearchCriteria.Op.NULL);
+ AccountSearch.join("account", joinAccount, AccountSearch.entity().getAccountId(), joinAccount.entity().getId(), JoinBuilder.JoinType.INNER);
AccountSearch.done();
- DomainSearch = createSearchBuilder();
DomainSearch.and("domainId", DomainSearch.entity().getDomainId(), SearchCriteria.Op.NNULL);
+ SearchBuilder<DomainVO> joinDomain = _domainDao.createSearchBuilder();
+ joinDomain.and("notremoved", joinDomain.entity().getRemoved(), SearchCriteria.Op.NULL);
+ DomainSearch.join("domain", joinDomain, DomainSearch.entity().getDomainId(), joinDomain.entity().getId(), JoinBuilder.JoinType.INNER);
DomainSearch.done();
}
[08/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1783 from jayapalu/CLOUDSTACK-9615
CLOUDSTACK-9615: Fixd applying ingress rules without portsWhen ingress rule is applied without ports (port start and port end params are not passed) then API/UI is showing rule got applied but in the VR, iptables rule not got applied.
Fixed this issue in the VR script.
* pr/1783:
CLOUDSTACK-9615: Fixed applying ingress rules without ports
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2088f0ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2088f0ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2088f0ad
Branch: refs/heads/4.9
Commit: 2088f0ad73ee30919d7b2153e74a295ff0a9911a
Parents: a0e36b7 fed58ee
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 12:37:13 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 12:37:13 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[14/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1764 from exoscale/fix/CLOUDSTACK-9597
CLOUDSTACK-9597: Should not fetch resource count for removed entityFetch the number of resourceCount by domain and account excluding the removed ones.
Signed-off-by: Marc-Aurle Brothier <m...@brothier.org>
* pr/1764:
CLOUDSTACK-9597: Should not fetch resource count for removed entity
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0a42f012
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0a42f012
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0a42f012
Branch: refs/heads/4.9
Commit: 0a42f0127eae1f38e349c69d73a0430d94bae3e4
Parents: 746998d e8a4a19
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 13:31:11 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:31:11 2016 +0530
----------------------------------------------------------------------
.../configuration/dao/ResourceCountDaoImpl.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[15/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1828 from sateesh-chodapuneedi/pr-cloudstack-9676
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot when there are child VM snapshotsJira
===
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot when there are child VM snapshots
Issue
====
Start instance fails after reverting to a VM snapshot, when there is 1 or more child VM snapshots in the snapshot tree of the VM.
Per the code, the method hasSnapshot() is supposed to detect the presence of any snapshot for the VM. But we are checking for only current snapshot instead of checking presence of any snapshot in the snapshot tree.
The failure to detect all snapshots means ACP reconfigures the VM in wrong way assuming there are no snapshots for the VM.
This results in start failure.
Fix
===
Ensure correct detection of VM snapshots in the VM snapshot tree
* pr/1828:
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23df5be2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23df5be2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23df5be2
Branch: refs/heads/4.9
Commit: 23df5be29e7af2a3a3b0f6c7862933e9addf77b8
Parents: 0a42f01 674bb06
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 15:11:36 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 15:11:36 2016 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1827 from sateesh-chodapuneedi/pr-cloudstack-9673
CLOUDSTACK-9673 : Exception occured while creating the CPVM in VMware setup over standard vSwitchesJira
===
CLOUDSTACK-9673 : Exception occured while creating the CPVM in VMware setup over standard vSwitches
Issue
====
Exception occured while creating the CPVM in the VmWare Setup using standard vswitches.
```
StartCommand failed due to Exception: com.vmware.vim25.AlreadyExists
message: [] com.vmware.vim25.AlreadyExistsFaultMsg: The specified key, name, or identifier already exists
```
Fix
===
Ensure synchronization while attempting to create port group such that simultaneous attempts are not made with same port group name on same ESXi host.
Testing
======
Successfully ran manual tests (deploy user instance) on top of latest master commit `17653a86fad67447a4f13e455e336694ad5c1735`.This code change is involved in virtual network creation over VMware standard vSwitches. Existing functional tests covers this functionality.
* pr/1827:
CLOUDSTACK-9673 Exception occured while creating the CPVM in the VmWare Setup over standard vSwitches
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52f224f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52f224f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52f224f6
Branch: refs/heads/4.9
Commit: 52f224f61df65cea8389959f4accba8b7bb4583c
Parents: 23df5be 32e9e29
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 15:12:16 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 15:12:16 2016 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 16 +++---
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 54 ++++++++++++++++++++
.../vmware/mo/HypervisorHostHelper.java | 7 ++-
3 files changed, 65 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[13/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
Merge pull request #1811 from sudhansu7/CLOUDSTACK-9649
CLOUDSTACK-9649: In the management server log there is an error
ISSUE
============
In the management server log there is an error
2016-10-01 00:07:31,670 ERROR [c.c.h.v.r.VmwareResource] (DirectAgent-417:ctx-e8c89b3f strmg-esx-01, cmd: GetRouterAlertsCommand) (logid:7beb3819) Command failed due to Exception: java.io.IOException
Message: There was a problem while connecting to 0.0.0.0:3922
In case of basic zone and VMWare ESXi host, the NIC 2 always gets 0.0.0.0 as IP address. Looks like we are generating an error for connecting through this invalid IP.
2016-10-01 04:37:31,680 DEBUG [c.c.a.m.AgentManagerImpl] (RouterStatusMonitor-1:ctx-8880f9c8) (logid:946838b8) Details from executing class com.cloud.agent.api.routing.GetRouterAlertsCommand: Command failed due to Exception: java.io.IOException
Message: There was a problem while connecting to 0.0.0.0:3922
2016-10-01 04:37:31,680 WARN [c.c.n.r.VirtualNetworkApplianceManagerImpl] (RouterStatusMonitor-1:ctx-8880f9c8) (logid:946838b8) Unable to get alerts from router r-4-VM Command failed due to Exception: java.io.IOException
Message: There was a problem while connecting to 0.0.0.0:3922
2016-10-01 04:37:31,682 DEBUG [c.c.n.ExternalDeviceUsageManagerImpl] (ExternalNetworkMonitor-1:ctx-913c7bae) (logid:1b926a60) External devices stats collector is running...
Root Cause:
As Link local is not used in basic zone mode (vmware). 0.0.0.0 is just shown as a placeholder address. In getRouterAlerts before sending GetRouterAlertsCommand added check for ip and skip the command if ip is '0.0.0.0'.
* pr/1811:
CLOUDSTACK-9649: In the management server log there is an error related to 0.0.0.0 IP address
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/746998d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/746998d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/746998d1
Branch: refs/heads/4.9
Commit: 746998d162d4adbc4ab13a6933d3cd1f678b0609
Parents: c7b0345 15eab82
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 13:30:42 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:30:42 2016 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 30 +++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[11/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
Issue
====
Start instance fails after reverting to a VM snapshot, when there is 1 or more child VM snapshots in the snapshot tree of the VM.
Per the code that detects the presence of a snapshot, we are checking for only current snapshot instead of checking presence of any snapshot in the snapshot tree.
The failure to detect all snapshots means ACP reconfigures the VM in wrong way assuming there are no snapshots for the VM.
This results in start failure.
Fix
===
Ensure correct detection of VM snapshots in the VM snapshot tree
This closes #1828
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
(cherry picked from commit 673bb25b5936d1c54e9210781280e9ddc507c830)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0535d77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0535d77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0535d77
Branch: refs/heads/4.9
Commit: b0535d770d108ae219149b5a115c8953d89691d9
Parents: 7d678df
Author: Sateesh Chodapuneedi <sa...@accelerite.com>
Authored: Wed Dec 14 01:52:15 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:29:07 2016 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0535d77/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 8b9d4e7..22c0b5a 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -661,7 +661,14 @@ public class VirtualMachineMO extends BaseMO {
public boolean hasSnapshot() throws Exception {
VirtualMachineSnapshotInfo info = getSnapshotInfo();
if (info != null) {
- return info.getCurrentSnapshot() != null;
+ ManagedObjectReference currentSnapshot = info.getCurrentSnapshot();
+ if (currentSnapshot != null) {
+ return true;
+ }
+ List<VirtualMachineSnapshotTree> rootSnapshotList = info.getRootSnapshotList();
+ if (rootSnapshotList != null && rootSnapshotList.size() > 0) {
+ return true;
+ }
}
return false;
}
[04/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9615: Fixed applying ingress rules without ports
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fed58eeb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fed58eeb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fed58eeb
Branch: refs/heads/4.9
Commit: fed58eebdd04cf656ada7037d5c43214c1f23b61
Parents: 7da95172
Author: Jayapalu <Ja...@apache.org>
Authored: Thu Dec 8 16:27:16 2016 +0530
Committer: Jayapalu <Ja...@apache.org>
Committed: Mon Dec 12 11:11:02 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fed58eeb/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index dd62f1a..5a2a9ed 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -122,10 +122,10 @@ class CsAcl(CsDataBag):
rnge = ''
if "first_port" in self.rule.keys() and \
self.rule['first_port'] == self.rule['last_port']:
- rnge = self.rule['first_port']
+ rnge = " --dport %s " %self.rule['first_port']
if "first_port" in self.rule.keys() and \
self.rule['first_port'] != self.rule['last_port']:
- rnge = "%s:%s" % (rule['first_port'], rule['last_port'])
+ rnge = " --dport %s:%s" % (rule['first_port'], rule['last_port'])
if self.direction == 'ingress':
if rule['protocol'] == "icmp":
self.fw.append(["mangle", "front",
@@ -140,7 +140,7 @@ class CsAcl(CsDataBag):
" -s %s " % cidr +
" -p %s " % rule['protocol'] +
" -m %s " % rule['protocol'] +
- " --dport %s -j RETURN" % rnge])
+ " %s -j RETURN" % rnge])
logging.debug("Current ACL IP direction is ==> %s", self.direction)
if self.direction == 'egress':
@@ -174,7 +174,7 @@ class CsAcl(CsDataBag):
fwr += " -s %s " % cidr + \
" -p %s " % rule['protocol'] + \
" -m %s " % rule['protocol'] + \
- " --dport %s" % rnge
+ " %s" % rnge
elif rule['protocol'] == "all":
fwr += " -s %s " % cidr
[07/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
Issue
====
Start instance fails after reverting to a VM snapshot, when there is 1 or more child VM snapshots in the snapshot tree of the VM.
Per the code that detects the presence of a snapshot, we are checking for only current snapshot instead of checking presence of any snapshot in the snapshot tree.
The failure to detect all snapshots means ACP reconfigures the VM in wrong way assuming there are no snapshots for the VM.
This results in start failure.
Fix
===
Ensure correct detection of VM snapshots in the VM snapshot tree
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/674bb064
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/674bb064
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/674bb064
Branch: refs/heads/4.9
Commit: 674bb064a343ea755c2f7dd3e173f8e0de6d2d85
Parents: a0e36b7
Author: Sateesh Chodapuneedi <sa...@accelerite.com>
Authored: Wed Dec 14 01:52:15 2016 +0530
Committer: Sateesh Chodapuneedi <sa...@accelerite.com>
Committed: Thu Dec 22 01:41:33 2016 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/674bb064/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 8b9d4e7..22c0b5a 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -661,7 +661,14 @@ public class VirtualMachineMO extends BaseMO {
public boolean hasSnapshot() throws Exception {
VirtualMachineSnapshotInfo info = getSnapshotInfo();
if (info != null) {
- return info.getCurrentSnapshot() != null;
+ ManagedObjectReference currentSnapshot = info.getCurrentSnapshot();
+ if (currentSnapshot != null) {
+ return true;
+ }
+ List<VirtualMachineSnapshotTree> rootSnapshotList = info.getRootSnapshotList();
+ if (rootSnapshotList != null && rootSnapshotList.size() > 0) {
+ return true;
+ }
}
return false;
}
[05/19] git commit: updated refs/heads/4.9 to 20986ba
Posted by bh...@apache.org.
CLOUDSTACK-9617: Fixed enabling remote access after PF or LB configured on vpn tcp ports
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2ca30a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2ca30a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2ca30a1
Branch: refs/heads/4.9
Commit: d2ca30a1330bdd5931b8a059a8db7a4cf1327d80
Parents: 7da95172
Author: Jayapalu <Ja...@apache.org>
Authored: Mon Dec 12 11:57:12 2016 +0530
Committer: Jayapalu <Ja...@apache.org>
Committed: Mon Dec 12 11:59:33 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/firewall/FirewallManagerImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2ca30a1/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index b7e0d14..d633a8b 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -429,7 +429,13 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
boolean allowStaticNat =
(rule.getPurpose() == Purpose.StaticNat && newRule.getPurpose() == Purpose.StaticNat && !newRule.getProtocol().equalsIgnoreCase(rule.getProtocol()));
- if (!(allowPf || allowStaticNat || oneOfRulesIsFirewall)) {
+ boolean allowVpnPf =
+ (rule.getPurpose() == Purpose.PortForwarding && newRule.getPurpose() == Purpose.Vpn && !newRule.getProtocol().equalsIgnoreCase(rule.getProtocol()));
+
+ boolean allowVpnLb =
+ (rule.getPurpose() == Purpose.LoadBalancing && newRule.getPurpose() == Purpose.Vpn && !newRule.getProtocol().equalsIgnoreCase(rule.getProtocol()));
+
+ if (!(allowPf || allowStaticNat || oneOfRulesIsFirewall || allowVpnPf || allowVpnLb)) {
throw new NetworkRuleConflictException("The range specified, " + newRule.getSourcePortStart() + "-" + newRule.getSourcePortEnd() +
", conflicts with rule " + rule.getId() + " which has " + rule.getSourcePortStart() + "-" + rule.getSourcePortEnd());
}