Updated Branches: refs/heads/master c916d6a1f -> 843e14085
Summary: Allow public and private nic to be the same bridge Detail: There was a regression in functionality introduced by 915babd970a9b4f209deceb3c4973b7d1c9c0c12 where the public bridge could not also be the private bridge. This had several additional consequences, this patch should revert the behavior back while keeping the functionality enhancements introduced by that commit. BUG-ID : NONE Reviewed-by: Dave Cahill Reported-by: Dave Cahill via cloudstack-dev Signed-off-by: Marcus Sorensen <[email protected]> 1351574006 -0600 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/843e1408 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/843e1408 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/843e1408 Branch: refs/heads/master Commit: 843e14085807cd4e54246093f73b923e757f722d Parents: c916d6a Author: marcus <marcus@marcus-ubuntu.(none)> Authored: Mon Oct 29 23:13:26 2012 -0600 Committer: marcus <marcus@marcus-ubuntu.(none)> Committed: Mon Oct 29 23:13:26 2012 -0600 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/843e1408/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index be22c50..c783daa 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -788,7 +788,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements String pif = getPif(bridge); if(_publicBridgeName != null && bridge.equals(_publicBridgeName)){ _pifs.put("public", pif); - } else if (_guestBridgeName != null) { + } + if (_guestBridgeName != null && bridge.equals(_guestBridgeName)) { _pifs.put("private", pif); } _pifs.put(bridge, pif);
