X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fvpp_l2.py;h=dc73e4238f38d162050e99ed0bfe14c94bb5f6a5;hb=2ac885c665309fc670cec96675ec1f510116fc13;hp=a6b43efe14c07041f6864c2409a0a581fa4fe77a;hpb=93cc3ee3b3a9c9224a1446625882205f3282a949;p=vpp.git diff --git a/test/vpp_l2.py b/test/vpp_l2.py index a6b43efe14c..dc73e4238f3 100644 --- a/test/vpp_l2.py +++ b/test/vpp_l2.py @@ -3,11 +3,10 @@ """ -from vpp_object import * -from util import mactobinary +from vpp_object import VppObject from vpp_ip import VppIpAddress -from vpp_mac import VppMacAddress from vpp_lo_interface import VppLoInterface +from vpp_papi import MACAddress class L2_PORT_TYPE: @@ -40,7 +39,7 @@ def find_bridge_domain_port(test, bd_id, sw_if_index): def find_bridge_domain_arp_entry(test, bd_id, mac, ip): - vmac = VppMacAddress(mac) + vmac = MACAddress(mac) vip = VppIpAddress(ip) if vip.version == 4: @@ -51,17 +50,17 @@ def find_bridge_domain_arp_entry(test, bd_id, mac, ip): arps = test.vapi.bd_ip_mac_dump(bd_id) for arp in arps: # do IP addr comparison too once .api is fixed... - if vmac.bytes == arp.mac_address and \ - vip.bytes == arp.ip_address[:n]: + if vmac.packed == arp.mac_address and \ + vip.bytes == arp.ip_address[:n]: return True return False def find_l2_fib_entry(test, bd_id, mac, sw_if_index): - vmac = VppMacAddress(mac) + vmac = MACAddress(mac) lfs = test.vapi.l2_fib_table_dump(bd_id) for lf in lfs: - if vmac.bytes == lf.mac and sw_if_index == lf.sw_if_index: + if vmac.packed == lf.mac and sw_if_index == lf.sw_if_index: return True return False @@ -80,18 +79,16 @@ class VppBridgeDomain(VppObject): self.arp_term = arp_term def add_vpp_config(self): - self._test.vapi.bridge_domain_add_del( - self.bd_id, - is_add=1, - flood=self.flood, - uu_flood=self.uu_flood, - forward=self.forward, - learn=self.learn, - arp_term=self.arp_term) + self._test.vapi.bridge_domain_add_del(bd_id=self.bd_id, + flood=self.flood, + uu_flood=self.uu_flood, + forward=self.forward, + learn=self.learn, + arp_term=self.arp_term, is_add=1) self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): - self._test.vapi.bridge_domain_add_del(self.bd_id, is_add=0) + self._test.vapi.bridge_domain_add_del(bd_id=self.bd_id, is_add=0) def query_vpp_config(self): return find_bridge_domain(self._test, self.bd_id) @@ -114,18 +111,14 @@ class VppBridgeDomainPort(VppObject): def add_vpp_config(self): self._test.vapi.sw_interface_set_l2_bridge( - self.itf.sw_if_index, - self.bd.bd_id, - port_type=self.port_type, - enable=1) + rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id, + port_type=self.port_type, enable=1) self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): self._test.vapi.sw_interface_set_l2_bridge( - self.itf.sw_if_index, - self.bd.bd_id, - port_type=self.port_type, - enable=0) + rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id, + port_type=self.port_type, enable=0) def query_vpp_config(self): return find_bridge_domain_port(self._test, @@ -144,28 +137,24 @@ class VppBridgeDomainArpEntry(VppObject): def __init__(self, test, bd, mac, ip): self._test = test self.bd = bd - self.mac = VppMacAddress(mac) + self.mac = MACAddress(mac) self.ip = VppIpAddress(ip) def add_vpp_config(self): - self._test.vapi.bd_ip_mac_add_del( - self.bd.bd_id, - self.mac.encode(), - self.ip.encode(), - is_add=1) + self._test.vapi.bd_ip_mac_add_del(bd_id=self.bd.bd_id, is_add=1, + ip=self.ip.encode(), + mac=self.mac.packed) self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): - self._test.vapi.bd_ip_mac_add_del( - self.bd.bd_id, - self.mac.encode(), - self.ip.encode(), - is_add=0) + self._test.vapi.bd_ip_mac_add_del(bd_id=self.bd.bd_id, is_add=0, + ip=self.ip.encode(), + mac=self.mac.packed) def query_vpp_config(self): return find_bridge_domain_arp_entry(self._test, self.bd.bd_id, - self.mac.address, + self.mac.packed, self.ip.address) def __str__(self): @@ -181,7 +170,7 @@ class VppL2FibEntry(VppObject): static_mac=0, filter_mac=0, bvi_mac=-1): self._test = test self.bd = bd - self.mac = VppMacAddress(mac) + self.mac = MACAddress(mac) self.itf = itf self.static_mac = static_mac self.filter_mac = filter_mac @@ -192,7 +181,7 @@ class VppL2FibEntry(VppObject): def add_vpp_config(self): self._test.vapi.l2fib_add_del( - self.mac.address, + self.mac.packed, self.bd.bd_id, self.itf.sw_if_index, is_add=1, @@ -203,7 +192,7 @@ class VppL2FibEntry(VppObject): def remove_vpp_config(self): self._test.vapi.l2fib_add_del( - self.mac.address, + self.mac.packed, self.bd.bd_id, self.itf.sw_if_index, is_add=0) @@ -211,7 +200,7 @@ class VppL2FibEntry(VppObject): def query_vpp_config(self): return find_l2_fib_entry(self._test, self.bd.bd_id, - self.mac.address, + self.mac.packed, self.itf.sw_if_index) def __str__(self): @@ -219,3 +208,32 @@ class VppL2FibEntry(VppObject): def object_id(self): return "L2-Fib-Entry-%s-%s-%s" % (self.bd, self.mac, self.itf) + + +class VppL2Vtr(VppObject): + + def __init__(self, test, itf, op): + self._test = test + self.itf = itf + self.op = op + + def add_vpp_config(self): + self.itf.set_vtr(self.op) + self._test.registry.register(self, self._test.logger) + + def remove_vpp_config(self): + self.itf.set_vtr(L2_VTR_OP.L2_DISABLED) + + def query_vpp_config(self): + ds = self._test.vapi.sw_interface_dump() + d = self.itf.get_interface_config_from_dump(ds) + + if d is not None: + return (d.vtr_op == self.op) + return False + + def __str__(self): + return self.object_id() + + def object_id(self): + return "L2-vtr-%s-%d" % (str(self.itf), self.op)