| Message ID | 1476793526-5303-3-git-send-email-yamamoto@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Oct 18, 2016 at 09:25:26PM +0900, YAMAMOTO Takashi wrote: > The list of supported iface types hardcoded in the test > is wrong on NetBSD. (or any userland-only ports I guess) > Instead of adding another case for NetBSD following WIN32, > just get the list from ovsdb. > > Signed-off-by: YAMAMOTO Takashi <yamamoto@ovn.org> Good idea. Acked-by: Ben Pfaff <blp@ovn.org>
On Wed, Oct 19, 2016 at 1:48 AM, Ben Pfaff <blp@ovn.org> wrote: > On Tue, Oct 18, 2016 at 09:25:26PM +0900, YAMAMOTO Takashi wrote: > > The list of supported iface types hardcoded in the test > > is wrong on NetBSD. (or any userland-only ports I guess) > > Instead of adding another case for NetBSD following WIN32, > > just get the list from ovsdb. > > > > Signed-off-by: YAMAMOTO Takashi <yamamoto@ovn.org> > > Good idea. > > Acked-by: Ben Pfaff <blp@ovn.org> > thank you. pushed to master.
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index b1211a5..60a6760 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -193,13 +193,7 @@ OVS_WAIT_UNTIL([check_datapath_type bar]) ovs-vsctl set Bridge br-int datapath-type=\"\" OVS_WAIT_UNTIL([check_datapath_type ""]) -# The following will need to be updated as OVS starts to support more -# interface types. -if test "$IS_WIN32" = "yes"; then - expected_iface_types="dummy,dummy-internal,dummy-pmd,geneve,gre,internal,lisp,patch,stt,system,vxlan" -else - expected_iface_types="dummy,dummy-internal,dummy-pmd,geneve,gre,internal,lisp,patch,stt,system,tap,vxlan" -fi +expected_iface_types=$(ovs-vsctl get Open_vSwitch . iface_types|sed 's/[[]][[ ]]//g') chassis_iface_types=$(ovn-sbctl get Chassis ${sysid} external_ids:iface-types | sed -e 's/\"//g') echo "chassis_iface_types = ${chassis_iface_types}" AT_CHECK([test "${expected_iface_types}" = "${chassis_iface_types}"])
The list of supported iface types hardcoded in the test is wrong on NetBSD. (or any userland-only ports I guess) Instead of adding another case for NetBSD following WIN32, just get the list from ovsdb. Signed-off-by: YAMAMOTO Takashi <yamamoto@ovn.org> --- tests/ovn-controller.at | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)