| Message ID | 1571320302-7755-1-git-send-email-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,ovn] ovn.at: Fix vtep autotest. | expand |
On Thu, Oct 17, 2019 at 03:51:42PM +0200, Dumitru Ceara wrote: > With the removal of the OVS subtree the vtep autotest stopped working > because the vtep.ovsschema couldn't be found anymore. The failure was > however hidden by the "|| return 1" when failing to create the vtep DB. > > Fix the path to the vtep schema and make potential failures visible. > > CC: Numan Siddique <numans@ovn.org> > Fixes: 84bf7d8435b8 ("Remove ovs subtree") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> I wonder how the "|| return 1" got there in the first place. Acked-by: Ben Pfaff <blp@ovn.org>
On Fri, Oct 18, 2019 at 10:57 PM Ben Pfaff <blp@ovn.org> wrote: > On Thu, Oct 17, 2019 at 03:51:42PM +0200, Dumitru Ceara wrote: > > With the removal of the OVS subtree the vtep autotest stopped working > > because the vtep.ovsschema couldn't be found anymore. The failure was > > however hidden by the "|| return 1" when failing to create the vtep DB. > > > > Fix the path to the vtep schema and make potential failures visible. > > > > CC: Numan Siddique <numans@ovn.org> > > Fixes: 84bf7d8435b8 ("Remove ovs subtree") > > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > > I wonder how the "|| return 1" got there in the first place. > > Acked-by: Ben Pfaff <blp@ovn.org> > Thanks. I applied this patch to master. Numan > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Fri, Oct 18, 2019 at 8:01 PM Numan Siddique <numan.siddique@gmail.com> wrote: > > > > On Fri, Oct 18, 2019 at 10:57 PM Ben Pfaff <blp@ovn.org> wrote: >> >> On Thu, Oct 17, 2019 at 03:51:42PM +0200, Dumitru Ceara wrote: >> > With the removal of the OVS subtree the vtep autotest stopped working >> > because the vtep.ovsschema couldn't be found anymore. The failure was >> > however hidden by the "|| return 1" when failing to create the vtep DB. >> > >> > Fix the path to the vtep schema and make potential failures visible. >> > >> > CC: Numan Siddique <numans@ovn.org> >> > Fixes: 84bf7d8435b8 ("Remove ovs subtree") >> > Signed-off-by: Dumitru Ceara <dceara@redhat.com> >> >> I wonder how the "|| return 1" got there in the first place. >> >> Acked-by: Ben Pfaff <blp@ovn.org> > > > Thanks. I applied this patch to master. > > Numan Thanks Ben and Numan!
diff --git a/tests/ovn.at b/tests/ovn.at index d141367..315c35d 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3551,7 +3551,7 @@ ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 o sim_add vtep as vtep -ovsdb-tool create "$ovs_base"/vtep/vtep.db "$abs_top_srcdir"/vtep/vtep.ovsschema || return 1 +ovsdb-tool create "$ovs_base"/vtep/vtep.db "$ovs_srcdir"/vtep/vtep.ovsschema ovs-appctl -t ovsdb-server ovsdb-server/add-db "$ovs_base"/vtep/vtep.db ovs-vsctl add-br br-phys @@ -3559,8 +3559,8 @@ net_attach n1 br-phys mac=`ovs-vsctl get Interface br-phys mac_in_use | sed s/\"//g` arp_table="$arp_table $sandbox,br-phys,192.168.0.3,$mac" -ovs-appctl netdev-dummy/ip4addr br-phys 192.168.0.3/24 >/dev/null || return 1 -ovs-appctl ovs/route/add 192.168.0.3/24 br-phys >/dev/null || return 1 +ovs-appctl netdev-dummy/ip4addr br-phys 192.168.0.3/24 >/dev/null +ovs-appctl ovs/route/add 192.168.0.3/24 br-phys >/dev/null ovs-vsctl add-br br-vtep net_attach n2 br-vtep
With the removal of the OVS subtree the vtep autotest stopped working because the vtep.ovsschema couldn't be found anymore. The failure was however hidden by the "|| return 1" when failing to create the vtep DB. Fix the path to the vtep schema and make potential failures visible. CC: Numan Siddique <numans@ovn.org> Fixes: 84bf7d8435b8 ("Remove ovs subtree") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- tests/ovn.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)