From 940a70fff474014b782e884882a85e290ff98494 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 3 Apr 2024 12:31:42 -0400 Subject: tests: upgrade python packages Type: test Change-Id: I01500466f3d15c79e38028677ce7e5c75d427fdc Signed-off-by: Dave Wallace --- extras/deprecated/plugins/gbp/test_gbp.py | 30 +++++++++++----------- .../vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py | 6 ++--- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'extras') diff --git a/extras/deprecated/plugins/gbp/test_gbp.py b/extras/deprecated/plugins/gbp/test_gbp.py index 84dda76af19..6a4fe0dae42 100644 --- a/extras/deprecated/plugins/gbp/test_gbp.py +++ b/extras/deprecated/plugins/gbp/test_gbp.py @@ -391,9 +391,9 @@ class VppGbpEndpointGroup(VppObject): def encode(self) -> dict: return { - "uplink_sw_if_index": self.uplink.sw_if_index - if self.uplink - else INDEX_INVALID, + "uplink_sw_if_index": ( + self.uplink.sw_if_index if self.uplink else INDEX_INVALID + ), "bd_id": self.bd.bd.bd_id, "rd_id": self.rd.rd_id, "vnid": self.vnid, @@ -460,12 +460,12 @@ class VppGbpBridgeDomain(VppObject): return { "flags": self.flags, "bvi_sw_if_index": self.bvi.sw_if_index, - "uu_fwd_sw_if_index": self.uu_fwd.sw_if_index - if self.uu_fwd - else INDEX_INVALID, - "bm_flood_sw_if_index": self.bm_flood.sw_if_index - if self.bm_flood - else INDEX_INVALID, + "uu_fwd_sw_if_index": ( + self.uu_fwd.sw_if_index if self.uu_fwd else INDEX_INVALID + ), + "bm_flood_sw_if_index": ( + self.bm_flood.sw_if_index if self.bm_flood else INDEX_INVALID + ), "bd_id": self.bd.bd_id, "rd_id": self.rd.rd_id, } @@ -510,12 +510,12 @@ class VppGbpRouteDomain(VppObject): "scope": self.scope, "ip4_table_id": self.t4.table_id, "ip6_table_id": self.t6.table_id, - "ip4_uu_sw_if_index": self.ip4_uu.sw_if_index - if self.ip4_uu - else INDEX_INVALID, - "ip6_uu_sw_if_index": self.ip6_uu.sw_if_index - if self.ip6_uu - else INDEX_INVALID, + "ip4_uu_sw_if_index": ( + self.ip4_uu.sw_if_index if self.ip4_uu else INDEX_INVALID + ), + "ip6_uu_sw_if_index": ( + self.ip6_uu.sw_if_index if self.ip6_uu else INDEX_INVALID + ), } def add_vpp_config(self): diff --git a/extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py b/extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py index 1b6b4e731ca..2a373f8e56e 100644 --- a/extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py +++ b/extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py @@ -56,9 +56,9 @@ class VppVxlanGbpTunnel(VppInterface): "dst": self.dst, "mode": self.mode, "vni": self.vni, - "mcast_sw_if_index": self.mcast_itf.sw_if_index - if self.mcast_itf - else INDEX_INVALID, + "mcast_sw_if_index": ( + self.mcast_itf.sw_if_index if self.mcast_itf else INDEX_INVALID + ), "encap_table_id": self.encap_table_id, "instance": self.instance, } -- cgit 1.2.3-korg