You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Yoshikazu Nojima <ma...@ynojima.net> on 2013/11/07 02:06:53 UTC
Review Request 15296: CLOUDSTACK-5067 Bugfix: two NICs connected to Public
network exist in VR
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15296/
-----------------------------------------------------------
Review request for cloudstack.
Bugs: CLOUDSTACK-5067
https://issues.apache.org/jira/browse/CLOUDSTACK-5067
Repository: cloudstack-git
Description
-------
This is a patch to fix the bug "CLOUDSTACK-5067 Bugfix: two NICs connected to Public network exist in VR".
It seems it is caused by wrong handling of IpAssocCommand.
IpAssocCommand is processed inappropriately in the method "LibvirtComputingResource#execute(IpAssocCommand)".
It hotplugs unnecessary vNIC by mistake.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2049
It is caused by isolation method notation mismatch in this line.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2047
It expects isolation method is expressed in broadcast uri style like "vlan://1234", "vlan://untagged", but "untagged" is passed.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2033
FYI: Notation change is conducted in this commit.
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java;h=74f02c0c639d125f435b3b3f278fe3985f09c7ca;hp=203587a06f63f23d487ae65dcf5c397cd2702166;hb=2614b00c;hpb=62b0ad03c871c7100433b39593a82d393879124e
Further, current code cannot retrieve VNI(VXLAN ID) from bridge name. This patch extends getVlanIdFromBridge to getBroadcastUriFromBridge to support vxlan.
Diffs
-----
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java e3f60f2
Diff: https://reviews.apache.org/r/15296/diff/
Testing
-------
I deployed VR, and confirmed it has one NIC connected to Public network.
Thanks,
Yoshikazu Nojima
Re: Review Request 15296: CLOUDSTACK-5067 Bugfix: two NICs connected to
Public network exist in VR
Posted by Marcus Sorensen <sh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15296/#review28353
-----------------------------------------------------------
Ship it!
Ship It!
- Marcus Sorensen
On Nov. 7, 2013, 1:11 a.m., Yoshikazu Nojima wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/15296/
> -----------------------------------------------------------
>
> (Updated Nov. 7, 2013, 1:11 a.m.)
>
>
> Review request for cloudstack, daan Hoogland, Marcus Sorensen, Hugo Trippaers, and Toshiaki Hatano.
>
>
> Bugs: CLOUDSTACK-5067
> https://issues.apache.org/jira/browse/CLOUDSTACK-5067
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> This is a patch to fix the bug "CLOUDSTACK-5067 Bugfix: two NICs connected to Public network exist in VR".
>
> It seems it is caused by wrong handling of IpAssocCommand.
>
> IpAssocCommand is processed inappropriately in the method "LibvirtComputingResource#execute(IpAssocCommand)".
>
> It hotplugs unnecessary vNIC by mistake.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2049
>
> It is caused by isolation method notation mismatch in this line.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2047
>
> It expects isolation method is expressed in broadcast uri style like "vlan://1234", "vlan://untagged", but "untagged" is passed.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2033
>
> FYI: Notation change is conducted in this commit.
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java;h=74f02c0c639d125f435b3b3f278fe3985f09c7ca;hp=203587a06f63f23d487ae65dcf5c397cd2702166;hb=2614b00c;hpb=62b0ad03c871c7100433b39593a82d393879124e
>
> Further, current code cannot retrieve VNI(VXLAN ID) from bridge name. This patch extends getVlanIdFromBridge to getBroadcastUriFromBridge to support vxlan.
>
>
> Diffs
> -----
>
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java e3f60f2
>
> Diff: https://reviews.apache.org/r/15296/diff/
>
>
> Testing
> -------
>
> I deployed VR, and confirmed it has one NIC connected to Public network.
>
>
> Thanks,
>
> Yoshikazu Nojima
>
>
Re: Review Request 15296: CLOUDSTACK-5067 Bugfix: two NICs connected to
Public network exist in VR
Posted by Hugo Trippaers <ht...@schubergphilis.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15296/#review28361
-----------------------------------------------------------
Ship it!
commit 494ccd821d711a2957531d1c33274ed293e4d925
Author: ynojima <ma...@ynojima.net>
Date: Wed Nov 6 11:02:56 2013 -0700
Bugfix: VR has double NICs connected to Public network
replace vlanid wih broadcast uri to support vxlan to identify whether id is VLAN ID or VNI
Signed-off-by: ynojima <ma...@ynojima.net>
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
- Hugo Trippaers
On Nov. 7, 2013, 1:11 a.m., Yoshikazu Nojima wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/15296/
> -----------------------------------------------------------
>
> (Updated Nov. 7, 2013, 1:11 a.m.)
>
>
> Review request for cloudstack, daan Hoogland, Marcus Sorensen, Hugo Trippaers, and Toshiaki Hatano.
>
>
> Bugs: CLOUDSTACK-5067
> https://issues.apache.org/jira/browse/CLOUDSTACK-5067
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> This is a patch to fix the bug "CLOUDSTACK-5067 Bugfix: two NICs connected to Public network exist in VR".
>
> It seems it is caused by wrong handling of IpAssocCommand.
>
> IpAssocCommand is processed inappropriately in the method "LibvirtComputingResource#execute(IpAssocCommand)".
>
> It hotplugs unnecessary vNIC by mistake.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2049
>
> It is caused by isolation method notation mismatch in this line.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2047
>
> It expects isolation method is expressed in broadcast uri style like "vlan://1234", "vlan://untagged", but "untagged" is passed.
> https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2033
>
> FYI: Notation change is conducted in this commit.
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java;h=74f02c0c639d125f435b3b3f278fe3985f09c7ca;hp=203587a06f63f23d487ae65dcf5c397cd2702166;hb=2614b00c;hpb=62b0ad03c871c7100433b39593a82d393879124e
>
> Further, current code cannot retrieve VNI(VXLAN ID) from bridge name. This patch extends getVlanIdFromBridge to getBroadcastUriFromBridge to support vxlan.
>
>
> Diffs
> -----
>
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java e3f60f2
>
> Diff: https://reviews.apache.org/r/15296/diff/
>
>
> Testing
> -------
>
> I deployed VR, and confirmed it has one NIC connected to Public network.
>
>
> Thanks,
>
> Yoshikazu Nojima
>
>
Re: Review Request 15296: CLOUDSTACK-5067 Bugfix: two NICs connected to
Public network exist in VR
Posted by Yoshikazu Nojima <ma...@ynojima.net>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/15296/
-----------------------------------------------------------
(Updated Nov. 7, 2013, 1:11 a.m.)
Review request for cloudstack, daan Hoogland, Marcus Sorensen, Hugo Trippaers, and Toshiaki Hatano.
Changes
-------
I add reviewers.
Bugs: CLOUDSTACK-5067
https://issues.apache.org/jira/browse/CLOUDSTACK-5067
Repository: cloudstack-git
Description
-------
This is a patch to fix the bug "CLOUDSTACK-5067 Bugfix: two NICs connected to Public network exist in VR".
It seems it is caused by wrong handling of IpAssocCommand.
IpAssocCommand is processed inappropriately in the method "LibvirtComputingResource#execute(IpAssocCommand)".
It hotplugs unnecessary vNIC by mistake.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2049
It is caused by isolation method notation mismatch in this line.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2047
It expects isolation method is expressed in broadcast uri style like "vlan://1234", "vlan://untagged", but "untagged" is passed.
https://github.com/apache/cloudstack/blob/master/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java#L2033
FYI: Notation change is conducted in this commit.
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java;h=74f02c0c639d125f435b3b3f278fe3985f09c7ca;hp=203587a06f63f23d487ae65dcf5c397cd2702166;hb=2614b00c;hpb=62b0ad03c871c7100433b39593a82d393879124e
Further, current code cannot retrieve VNI(VXLAN ID) from bridge name. This patch extends getVlanIdFromBridge to getBroadcastUriFromBridge to support vxlan.
Diffs
-----
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java e3f60f2
Diff: https://reviews.apache.org/r/15296/diff/
Testing
-------
I deployed VR, and confirmed it has one NIC connected to Public network.
Thanks,
Yoshikazu Nojima