| Message ID | 20210702213554.2804370-2-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,1/2] ovs-sandbox: Make it slightly more tailored for OVN. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot | success | github build: passed |
On Fri, Jul 2, 2021 at 5:36 PM Ben Pfaff <blp@ovn.org> wrote: > > These were part of the OVS tutorial, which isn't relevant for OVN. > > Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Numan Siddique <numans@ovn.org> Numan > --- > tutorial/automake.mk | 6 ------ > tutorial/t-setup | 8 -------- > tutorial/t-stage0 | 9 --------- > tutorial/t-stage1 | 12 ------------ > tutorial/t-stage2 | 7 ------- > tutorial/t-stage3 | 8 -------- > tutorial/t-stage4 | 15 --------------- > 7 files changed, 65 deletions(-) > delete mode 100755 tutorial/t-setup > delete mode 100755 tutorial/t-stage0 > delete mode 100755 tutorial/t-stage1 > delete mode 100755 tutorial/t-stage2 > delete mode 100755 tutorial/t-stage3 > delete mode 100755 tutorial/t-stage4 > > diff --git a/tutorial/automake.mk b/tutorial/automake.mk > index 13b3bee055c9..046962c00003 100644 > --- a/tutorial/automake.mk > +++ b/tutorial/automake.mk > @@ -1,11 +1,5 @@ > EXTRA_DIST += \ > tutorial/ovs-sandbox \ > - tutorial/t-setup \ > - tutorial/t-stage0 \ > - tutorial/t-stage1 \ > - tutorial/t-stage2 \ > - tutorial/t-stage3 \ > - tutorial/t-stage4 \ > tutorial/ovn-setup.sh > sandbox: all > cd $(srcdir)/tutorial && MAKE=$(MAKE) HAVE_OPENSSL=$(HAVE_OPENSSL) \ > diff --git a/tutorial/t-setup b/tutorial/t-setup > deleted file mode 100755 > index 4925d8270264..000000000000 > --- a/tutorial/t-setup > +++ /dev/null > @@ -1,8 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-vsctl add-br br0 -- set Bridge br0 fail-mode=secure > - > -for i in 1 2 3 4; do > - ovs-vsctl add-port br0 p$i -- set Interface p$i ofport_request=$i > - ovs-ofctl mod-port br0 p$i up > -done > diff --git a/tutorial/t-stage0 b/tutorial/t-stage0 > deleted file mode 100755 > index 63db6f071bca..000000000000 > --- a/tutorial/t-stage0 > +++ /dev/null > @@ -1,9 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-ofctl add-flow br0 \ > - "table=0, dl_src=01:00:00:00:00:00/01:00:00:00:00:00, actions=drop" > - > -ovs-ofctl add-flow br0 \ > - "table=0, dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" > - > -ovs-ofctl add-flow br0 "table=0, priority=0, actions=resubmit(,1)" > diff --git a/tutorial/t-stage1 b/tutorial/t-stage1 > deleted file mode 100755 > index 97aed7e3efcd..000000000000 > --- a/tutorial/t-stage1 > +++ /dev/null > @@ -1,12 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-ofctl add-flow br0 "table=1, priority=0, actions=drop" > - > -ovs-ofctl add-flow br0 \ > - "table=1, priority=99, in_port=1, actions=resubmit(,2)" > - > -ovs-ofctl add-flows br0 - <<'EOF' > - table=1, priority=99, in_port=2, vlan_tci=0, actions=mod_vlan_vid:20, resubmit(,2) > - table=1, priority=99, in_port=3, vlan_tci=0, actions=mod_vlan_vid:30, resubmit(,2) > - table=1, priority=99, in_port=4, vlan_tci=0, actions=mod_vlan_vid:30, resubmit(,2) > -EOF > diff --git a/tutorial/t-stage2 b/tutorial/t-stage2 > deleted file mode 100755 > index f0d687e68f52..000000000000 > --- a/tutorial/t-stage2 > +++ /dev/null > @@ -1,7 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-ofctl add-flow br0 \ > - "table=2 actions=learn(table=10, NXM_OF_VLAN_TCI[0..11], \ > - NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], \ > - load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]), \ > - resubmit(,3)" > diff --git a/tutorial/t-stage3 b/tutorial/t-stage3 > deleted file mode 100755 > index eb4ab3c3f99a..000000000000 > --- a/tutorial/t-stage3 > +++ /dev/null > @@ -1,8 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-ofctl add-flow br0 \ > - "table=3 priority=50 actions=resubmit(,10), resubmit(,4)" > - > -ovs-ofctl add-flow br0 \ > - "table=3 priority=99 dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 \ > - actions=resubmit(,4)" > diff --git a/tutorial/t-stage4 b/tutorial/t-stage4 > deleted file mode 100755 > index 3f71b9228da3..000000000000 > --- a/tutorial/t-stage4 > +++ /dev/null > @@ -1,15 +0,0 @@ > -#! /bin/sh -ve > - > -ovs-ofctl add-flow br0 "table=4 reg0=1 actions=1" > - > -ovs-ofctl add-flows br0 - <<'EOF' > - table=4 reg0=2 actions=strip_vlan,2 > - table=4 reg0=3 actions=strip_vlan,3 > - table=4 reg0=4 actions=strip_vlan,4 > -EOF > - > -ovs-ofctl add-flows br0 - <<'EOF' > - table=4 reg0=0 priority=99 dl_vlan=20 actions=1,strip_vlan,2 > - table=4 reg0=0 priority=99 dl_vlan=30 actions=1,strip_vlan,3,4 > - table=4 reg0=0 priority=50 actions=1 > -EOF > -- > 2.31.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Tue, Jul 13, 2021 at 12:17:48PM -0400, Numan Siddique wrote: > On Fri, Jul 2, 2021 at 5:36 PM Ben Pfaff <blp@ovn.org> wrote: > > > > These were part of the OVS tutorial, which isn't relevant for OVN. > > > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > Acked-by: Numan Siddique <numans@ovn.org> Thanks for the reviews. I pushed these commits.
diff --git a/tutorial/automake.mk b/tutorial/automake.mk index 13b3bee055c9..046962c00003 100644 --- a/tutorial/automake.mk +++ b/tutorial/automake.mk @@ -1,11 +1,5 @@ EXTRA_DIST += \ tutorial/ovs-sandbox \ - tutorial/t-setup \ - tutorial/t-stage0 \ - tutorial/t-stage1 \ - tutorial/t-stage2 \ - tutorial/t-stage3 \ - tutorial/t-stage4 \ tutorial/ovn-setup.sh sandbox: all cd $(srcdir)/tutorial && MAKE=$(MAKE) HAVE_OPENSSL=$(HAVE_OPENSSL) \ diff --git a/tutorial/t-setup b/tutorial/t-setup deleted file mode 100755 index 4925d8270264..000000000000 --- a/tutorial/t-setup +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -ve - -ovs-vsctl add-br br0 -- set Bridge br0 fail-mode=secure - -for i in 1 2 3 4; do - ovs-vsctl add-port br0 p$i -- set Interface p$i ofport_request=$i - ovs-ofctl mod-port br0 p$i up -done diff --git a/tutorial/t-stage0 b/tutorial/t-stage0 deleted file mode 100755 index 63db6f071bca..000000000000 --- a/tutorial/t-stage0 +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh -ve - -ovs-ofctl add-flow br0 \ - "table=0, dl_src=01:00:00:00:00:00/01:00:00:00:00:00, actions=drop" - -ovs-ofctl add-flow br0 \ - "table=0, dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" - -ovs-ofctl add-flow br0 "table=0, priority=0, actions=resubmit(,1)" diff --git a/tutorial/t-stage1 b/tutorial/t-stage1 deleted file mode 100755 index 97aed7e3efcd..000000000000 --- a/tutorial/t-stage1 +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh -ve - -ovs-ofctl add-flow br0 "table=1, priority=0, actions=drop" - -ovs-ofctl add-flow br0 \ - "table=1, priority=99, in_port=1, actions=resubmit(,2)" - -ovs-ofctl add-flows br0 - <<'EOF' - table=1, priority=99, in_port=2, vlan_tci=0, actions=mod_vlan_vid:20, resubmit(,2) - table=1, priority=99, in_port=3, vlan_tci=0, actions=mod_vlan_vid:30, resubmit(,2) - table=1, priority=99, in_port=4, vlan_tci=0, actions=mod_vlan_vid:30, resubmit(,2) -EOF diff --git a/tutorial/t-stage2 b/tutorial/t-stage2 deleted file mode 100755 index f0d687e68f52..000000000000 --- a/tutorial/t-stage2 +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh -ve - -ovs-ofctl add-flow br0 \ - "table=2 actions=learn(table=10, NXM_OF_VLAN_TCI[0..11], \ - NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], \ - load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]), \ - resubmit(,3)" diff --git a/tutorial/t-stage3 b/tutorial/t-stage3 deleted file mode 100755 index eb4ab3c3f99a..000000000000 --- a/tutorial/t-stage3 +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -ve - -ovs-ofctl add-flow br0 \ - "table=3 priority=50 actions=resubmit(,10), resubmit(,4)" - -ovs-ofctl add-flow br0 \ - "table=3 priority=99 dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 \ - actions=resubmit(,4)" diff --git a/tutorial/t-stage4 b/tutorial/t-stage4 deleted file mode 100755 index 3f71b9228da3..000000000000 --- a/tutorial/t-stage4 +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh -ve - -ovs-ofctl add-flow br0 "table=4 reg0=1 actions=1" - -ovs-ofctl add-flows br0 - <<'EOF' - table=4 reg0=2 actions=strip_vlan,2 - table=4 reg0=3 actions=strip_vlan,3 - table=4 reg0=4 actions=strip_vlan,4 -EOF - -ovs-ofctl add-flows br0 - <<'EOF' - table=4 reg0=0 priority=99 dl_vlan=20 actions=1,strip_vlan,2 - table=4 reg0=0 priority=99 dl_vlan=30 actions=1,strip_vlan,3,4 - table=4 reg0=0 priority=50 actions=1 -EOF
These were part of the OVS tutorial, which isn't relevant for OVN. Signed-off-by: Ben Pfaff <blp@ovn.org> --- tutorial/automake.mk | 6 ------ tutorial/t-setup | 8 -------- tutorial/t-stage0 | 9 --------- tutorial/t-stage1 | 12 ------------ tutorial/t-stage2 | 7 ------- tutorial/t-stage3 | 8 -------- tutorial/t-stage4 | 15 --------------- 7 files changed, 65 deletions(-) delete mode 100755 tutorial/t-setup delete mode 100755 tutorial/t-stage0 delete mode 100755 tutorial/t-stage1 delete mode 100755 tutorial/t-stage2 delete mode 100755 tutorial/t-stage3 delete mode 100755 tutorial/t-stage4