X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_vxlan_gpe_tunnel.py;h=2826c29c6b397d84cdcd67fd17d00e97c685aa3e;hb=853cc9f2ad3ee52cbdd891fb09d51c25678baed0;hp=cff5e456aeef4c63dd280fea3d7496ba2e97b5d1;hpb=ea96292985760b7fc3af54669e3eab35e7561a10;p=vpp.git diff --git a/test/vpp_vxlan_gpe_tunnel.py b/test/vpp_vxlan_gpe_tunnel.py index cff5e456aee..2826c29c6b3 100644 --- a/test/vpp_vxlan_gpe_tunnel.py +++ b/test/vpp_vxlan_gpe_tunnel.py @@ -2,7 +2,7 @@ from vpp_interface import VppInterface from vpp_papi import VppEnum -INDEX_INVALID = 0xffffffff +INDEX_INVALID = 0xFFFFFFFF DEFAULT_PORT = 4790 UNDEFINED_PORT = 0 @@ -19,11 +19,13 @@ def find_vxlan_gpe_tunnel(test, src, dst, s_port, d_port, vni): dst_port = d_port for t in ts: - if src == str(t.local) and \ - dst == str(t.remote) and \ - src_port == t.local_port and \ - dst_port == t.remote_port and \ - t.vni == vni: + if ( + src == str(t.local) + and dst == str(t.remote) + and src_port == t.local_port + and dst_port == t.remote_port + and t.vni == vni + ): return t.sw_if_index return INDEX_INVALID @@ -33,12 +35,20 @@ class VppVxlanGpeTunnel(VppInterface): VPP VXLAN GPE interface """ - def __init__(self, test, src_addr, dst_addr, vni, - src_port=UNDEFINED_PORT, dst_port=UNDEFINED_PORT, - mcast_sw_if_index=INDEX_INVALID, - encap_vrf_id=None, - decap_vrf_id=None, protocol=3): - """ Create VXLAN GPE Tunnel interface """ + def __init__( + self, + test, + src_addr, + dst_addr, + vni, + src_port=UNDEFINED_PORT, + dst_port=UNDEFINED_PORT, + mcast_sw_if_index=INDEX_INVALID, + encap_vrf_id=None, + decap_vrf_id=None, + protocol=3, + ): + """Create VXLAN GPE Tunnel interface""" super(VppVxlanGpeTunnel, self).__init__(test) self.src = src_addr self.dst = dst_addr @@ -52,32 +62,38 @@ class VppVxlanGpeTunnel(VppInterface): def add_vpp_config(self): reply = self.test.vapi.vxlan_gpe_add_del_tunnel_v2( - is_add=1, local=self.src, remote=self.dst, vni=self.vni, - local_port=self.src_port, remote_port=self.dst_port, + is_add=1, + local=self.src, + remote=self.dst, + vni=self.vni, + local_port=self.src_port, + remote_port=self.dst_port, mcast_sw_if_index=self.mcast_sw_if_index, encap_vrf_id=self.encap_vrf_id, decap_vrf_id=self.decap_vrf_id, - protocol=self.protocol) + protocol=self.protocol, + ) self.set_sw_if_index(reply.sw_if_index) self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): self.test.vapi.vxlan_gpe_add_del_tunnel_v2( - is_add=0, local=self.src, remote=self.dst, vni=self.vni, - local_port=self.src_port, remote_port=self.dst_port, + is_add=0, + local=self.src, + remote=self.dst, + vni=self.vni, + local_port=self.src_port, + remote_port=self.dst_port, mcast_sw_if_index=self.mcast_sw_if_index, encap_vrf_id=self.encap_vrf_id, decap_vrf_id=self.decap_vrf_id, - protocol=self.protocol) + protocol=self.protocol, + ) def query_vpp_config(self): - return (INDEX_INVALID != find_vxlan_gpe_tunnel(self._test, - self.src, - self.dst, - self.src_port, - self.dst_port, - self.vni)) + return INDEX_INVALID != find_vxlan_gpe_tunnel( + self._test, self.src, self.dst, self.src_port, self.dst_port, self.vni + ) def object_id(self): - return "vxlan-%d-%d-%s-%s" % (self.sw_if_index, self.vni, - self.src, self.dst) + return "vxlan-%d-%d-%s-%s" % (self.sw_if_index, self.vni, self.src, self.dst)