| Message ID | 20240603183121.2305013-2-amorenoz@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a8763466669d21b570b26160d0a5e0a2ee529d22 |
| Headers | show |
| Series | [net-next,1/2] selftests: openvswitch: fix action formatting | expand |
Adrian Moreno <amorenoz@redhat.com> writes: > Netlink flags, although they don't have payload at the netlink level, > are represented as having a "True" value in pyroute2. > > Without it, trying to add a flow with a flag-type action (e.g: pop_vlan) > fails with the following traceback: > > Traceback (most recent call last): > File "[...]/ovs-dpctl.py", line 2498, in <module> > sys.exit(main(sys.argv)) > ^^^^^^^^^^^^^^ > File "[...]/ovs-dpctl.py", line 2487, in main > ovsflow.add_flow(rep["dpifindex"], flow) > File "[...]/ovs-dpctl.py", line 2136, in add_flow > reply = self.nlm_request( > ^^^^^^^^^^^^^^^^^ > File "[...]/pyroute2/netlink/nlsocket.py", line 822, in nlm_request > return tuple(self._genlm_request(*argv, **kwarg)) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "[...]/pyroute2/netlink/generic/__init__.py", line 126, in > nlm_request > return tuple(super().nlm_request(*argv, **kwarg)) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "[...]/pyroute2/netlink/nlsocket.py", line 1124, in nlm_request > self.put(msg, msg_type, msg_flags, msg_seq=msg_seq) > File "[...]/pyroute2/netlink/nlsocket.py", line 389, in put > self.sendto_gate(msg, addr) > File "[...]/pyroute2/netlink/nlsocket.py", line 1056, in sendto_gate > msg.encode() > File "[...]/pyroute2/netlink/__init__.py", line 1245, in encode > offset = self.encode_nlas(offset) > ^^^^^^^^^^^^^^^^^^^^^^^^ > File "[...]/pyroute2/netlink/__init__.py", line 1560, in encode_nlas > nla_instance.setvalue(cell[1]) > File "[...]/pyroute2/netlink/__init__.py", line 1265, in setvalue > nlv.setvalue(nla_tuple[1]) > ~~~~~~~~~^^^ > IndexError: list index out of range > > Signed-off-by: Adrian Moreno <amorenoz@redhat.com> > --- Acked-by: Aaron Conole <aconole@redhat.com> I don't know which pyroute2 version I had used when I tested this previously, but even on my current system I get this error now. Thanks for the fix. > tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > index b76907ac0092..a2395c3f37a1 100644 > --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > @@ -537,7 +537,7 @@ class ovsactions(nla): > for flat_act in parse_flat_map: > if parse_starts_block(actstr, flat_act[0], False): > actstr = actstr[len(flat_act[0]):] > - self["attrs"].append([flat_act[1]]) > + self["attrs"].append([flat_act[1], True]) > actstr = actstr[strspn(actstr, ", ") :] > parsed = True
On Mon, Jun 03, 2024 at 03:02:46PM GMT, Aaron Conole wrote: > Adrian Moreno <amorenoz@redhat.com> writes: > > > Netlink flags, although they don't have payload at the netlink level, > > are represented as having a "True" value in pyroute2. > > > > Without it, trying to add a flow with a flag-type action (e.g: pop_vlan) > > fails with the following traceback: > > > > Traceback (most recent call last): > > File "[...]/ovs-dpctl.py", line 2498, in <module> > > sys.exit(main(sys.argv)) > > ^^^^^^^^^^^^^^ > > File "[...]/ovs-dpctl.py", line 2487, in main > > ovsflow.add_flow(rep["dpifindex"], flow) > > File "[...]/ovs-dpctl.py", line 2136, in add_flow > > reply = self.nlm_request( > > ^^^^^^^^^^^^^^^^^ > > File "[...]/pyroute2/netlink/nlsocket.py", line 822, in nlm_request > > return tuple(self._genlm_request(*argv, **kwarg)) > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > File "[...]/pyroute2/netlink/generic/__init__.py", line 126, in > > nlm_request > > return tuple(super().nlm_request(*argv, **kwarg)) > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > File "[...]/pyroute2/netlink/nlsocket.py", line 1124, in nlm_request > > self.put(msg, msg_type, msg_flags, msg_seq=msg_seq) > > File "[...]/pyroute2/netlink/nlsocket.py", line 389, in put > > self.sendto_gate(msg, addr) > > File "[...]/pyroute2/netlink/nlsocket.py", line 1056, in sendto_gate > > msg.encode() > > File "[...]/pyroute2/netlink/__init__.py", line 1245, in encode > > offset = self.encode_nlas(offset) > > ^^^^^^^^^^^^^^^^^^^^^^^^ > > File "[...]/pyroute2/netlink/__init__.py", line 1560, in encode_nlas > > nla_instance.setvalue(cell[1]) > > File "[...]/pyroute2/netlink/__init__.py", line 1265, in setvalue > > nlv.setvalue(nla_tuple[1]) > > ~~~~~~~~~^^^ > > IndexError: list index out of range > > > > Signed-off-by: Adrian Moreno <amorenoz@redhat.com> > > --- > > Acked-by: Aaron Conole <aconole@redhat.com> > > I don't know which pyroute2 version I had used when I tested this > previously, but even on my current system I get this error now. Thanks > for the fix. > Thanks Aaron. I'll resend as v2 with your ack as a stand-alone patch since the other patch of this series will be fixed by your soon-to-come series. > > tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > > index b76907ac0092..a2395c3f37a1 100644 > > --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > > +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py > > @@ -537,7 +537,7 @@ class ovsactions(nla): > > for flat_act in parse_flat_map: > > if parse_starts_block(actstr, flat_act[0], False): > > actstr = actstr[len(flat_act[0]):] > > - self["attrs"].append([flat_act[1]]) > > + self["attrs"].append([flat_act[1], True]) > > actstr = actstr[strspn(actstr, ", ") :] > > parsed = True >
Adrián Moreno <amorenoz@redhat.com> writes: > On Mon, Jun 03, 2024 at 03:02:46PM GMT, Aaron Conole wrote: >> Adrian Moreno <amorenoz@redhat.com> writes: >> >> > Netlink flags, although they don't have payload at the netlink level, >> > are represented as having a "True" value in pyroute2. >> > >> > Without it, trying to add a flow with a flag-type action (e.g: pop_vlan) >> > fails with the following traceback: >> > >> > Traceback (most recent call last): >> > File "[...]/ovs-dpctl.py", line 2498, in <module> >> > sys.exit(main(sys.argv)) >> > ^^^^^^^^^^^^^^ >> > File "[...]/ovs-dpctl.py", line 2487, in main >> > ovsflow.add_flow(rep["dpifindex"], flow) >> > File "[...]/ovs-dpctl.py", line 2136, in add_flow >> > reply = self.nlm_request( >> > ^^^^^^^^^^^^^^^^^ >> > File "[...]/pyroute2/netlink/nlsocket.py", line 822, in nlm_request >> > return tuple(self._genlm_request(*argv, **kwarg)) >> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> > File "[...]/pyroute2/netlink/generic/__init__.py", line 126, in >> > nlm_request >> > return tuple(super().nlm_request(*argv, **kwarg)) >> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> > File "[...]/pyroute2/netlink/nlsocket.py", line 1124, in nlm_request >> > self.put(msg, msg_type, msg_flags, msg_seq=msg_seq) >> > File "[...]/pyroute2/netlink/nlsocket.py", line 389, in put >> > self.sendto_gate(msg, addr) >> > File "[...]/pyroute2/netlink/nlsocket.py", line 1056, in sendto_gate >> > msg.encode() >> > File "[...]/pyroute2/netlink/__init__.py", line 1245, in encode >> > offset = self.encode_nlas(offset) >> > ^^^^^^^^^^^^^^^^^^^^^^^^ >> > File "[...]/pyroute2/netlink/__init__.py", line 1560, in encode_nlas >> > nla_instance.setvalue(cell[1]) >> > File "[...]/pyroute2/netlink/__init__.py", line 1265, in setvalue >> > nlv.setvalue(nla_tuple[1]) >> > ~~~~~~~~~^^^ >> > IndexError: list index out of range >> > >> > Signed-off-by: Adrian Moreno <amorenoz@redhat.com> >> > --- >> >> Acked-by: Aaron Conole <aconole@redhat.com> >> >> I don't know which pyroute2 version I had used when I tested this >> previously, but even on my current system I get this error now. Thanks >> for the fix. >> > > Thanks Aaron. I'll resend as v2 with your ack as a stand-alone patch > since the other patch of this series will be fixed by your soon-to-come > series. Thanks! >> > tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> > index b76907ac0092..a2395c3f37a1 100644 >> > --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> > +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py >> > @@ -537,7 +537,7 @@ class ovsactions(nla): >> > for flat_act in parse_flat_map: >> > if parse_starts_block(actstr, flat_act[0], False): >> > actstr = actstr[len(flat_act[0]):] >> > - self["attrs"].append([flat_act[1]]) >> > + self["attrs"].append([flat_act[1], True]) >> > actstr = actstr[strspn(actstr, ", ") :] >> > parsed = True >>
diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index b76907ac0092..a2395c3f37a1 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -537,7 +537,7 @@ class ovsactions(nla): for flat_act in parse_flat_map: if parse_starts_block(actstr, flat_act[0], False): actstr = actstr[len(flat_act[0]):] - self["attrs"].append([flat_act[1]]) + self["attrs"].append([flat_act[1], True]) actstr = actstr[strspn(actstr, ", ") :] parsed = True
Netlink flags, although they don't have payload at the netlink level, are represented as having a "True" value in pyroute2. Without it, trying to add a flow with a flag-type action (e.g: pop_vlan) fails with the following traceback: Traceback (most recent call last): File "[...]/ovs-dpctl.py", line 2498, in <module> sys.exit(main(sys.argv)) ^^^^^^^^^^^^^^ File "[...]/ovs-dpctl.py", line 2487, in main ovsflow.add_flow(rep["dpifindex"], flow) File "[...]/ovs-dpctl.py", line 2136, in add_flow reply = self.nlm_request( ^^^^^^^^^^^^^^^^^ File "[...]/pyroute2/netlink/nlsocket.py", line 822, in nlm_request return tuple(self._genlm_request(*argv, **kwarg)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "[...]/pyroute2/netlink/generic/__init__.py", line 126, in nlm_request return tuple(super().nlm_request(*argv, **kwarg)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "[...]/pyroute2/netlink/nlsocket.py", line 1124, in nlm_request self.put(msg, msg_type, msg_flags, msg_seq=msg_seq) File "[...]/pyroute2/netlink/nlsocket.py", line 389, in put self.sendto_gate(msg, addr) File "[...]/pyroute2/netlink/nlsocket.py", line 1056, in sendto_gate msg.encode() File "[...]/pyroute2/netlink/__init__.py", line 1245, in encode offset = self.encode_nlas(offset) ^^^^^^^^^^^^^^^^^^^^^^^^ File "[...]/pyroute2/netlink/__init__.py", line 1560, in encode_nlas nla_instance.setvalue(cell[1]) File "[...]/pyroute2/netlink/__init__.py", line 1265, in setvalue nlv.setvalue(nla_tuple[1]) ~~~~~~~~~^^^ IndexError: list index out of range Signed-off-by: Adrian Moreno <amorenoz@redhat.com> --- tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)