Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bhaisaab@apache.org
To: commits@cloudstack.apache.org
Date: Fri, 23 Dec 2016 12:21:19 -0000
Message-Id: <feb2356ee6b449fc9a100a877cc943a0@git.apache.org>
In-Reply-To: <9d45bf31c2614d8ab854d15a151bcbfb@git.apache.org>
References: <9d45bf31c2614d8ab854d15a151bcbfb@git.apache.org>
Subject: [12/20] git commit: updated refs/heads/master to a9f45df
archived-at: Fri, 23 Dec 2016 12:21:12 -0000

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 <rohit.yadav@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/master
Commit: c7b0345ed28e3173f485e4c1394784b350851666
Parents: b0535d7 25efc1a
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Thu Dec 22 13:29:59 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Dec 22 13:29:59 2016 +0530

----------------------------------------------------------------------
 .../com/cloud/configuration/ConfigurationManagerImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------