X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_l2.py;h=3ee0d35384e7664cbbce6f1c1af9fe2adb0d5030;hb=bc764c8bc;hp=a6b43efe14c07041f6864c2409a0a581fa4fe77a;hpb=93cc3ee3b3a9c9224a1446625882205f3282a949;p=vpp.git diff --git a/test/vpp_l2.py b/test/vpp_l2.py index a6b43efe14c..3ee0d35384e 100644 --- a/test/vpp_l2.py +++ b/test/vpp_l2.py @@ -3,11 +3,15 @@ """ -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 +from vpp_sub_interface import L2_VTR_OP +try: + text_type = unicode +except NameError: + text_type = str class L2_PORT_TYPE: @@ -23,6 +27,7 @@ class BRIDGE_FLAGS: FLOOD = 4 UU_FLOOD = 8 ARP_TERM = 16 + ARP_UFWD = 32 def find_bridge_domain(test, bd_id): @@ -40,28 +45,20 @@ 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) - vip = VppIpAddress(ip) - - if vip.version == 4: - n = 4 - else: - n = 16 - 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 mac == str(arp.entry.mac) and \ + ip == str(arp.entry.ip): 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 @@ -70,7 +67,7 @@ class VppBridgeDomain(VppObject): def __init__(self, test, bd_id, flood=1, uu_flood=1, forward=1, - learn=1, arp_term=1): + learn=1, arp_term=1, arp_ufwd=0): self._test = test self.bd_id = bd_id self.flood = flood @@ -78,27 +75,25 @@ class VppBridgeDomain(VppObject): self.forward = forward self.learn = learn self.arp_term = arp_term + self.arp_ufwd = arp_ufwd 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, + arp_ufwd=self.arp_ufwd, + 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) - def __str__(self): - return self.object_id() - def object_id(self): return "bridge-domain-%d" % (self.bd_id) @@ -114,27 +109,20 @@ 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, self.bd.bd_id, self.itf.sw_if_index) - def __str__(self): - return self.object_id() - def object_id(self): return "BD-Port-%s-%s" % (self.bd, self.itf) @@ -144,35 +132,32 @@ class VppBridgeDomainArpEntry(VppObject): def __init__(self, test, bd, mac, ip): self._test = test self.bd = bd - self.mac = VppMacAddress(mac) - self.ip = VppIpAddress(ip) + self.mac = mac + self.ip = 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(is_add=1, + entry={ + 'bd_id': self.bd.bd_id, + 'ip': self.ip, + 'mac': self.mac}) 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(is_add=0, + entry={ + 'bd_id': self.bd.bd_id, + 'ip': self.ip, + 'mac': self.mac}) def query_vpp_config(self): return find_bridge_domain_arp_entry(self._test, self.bd.bd_id, - self.mac.address, - self.ip.address) - - def __str__(self): - return self.object_id() + self.mac, + self.ip) def object_id(self): - return "BD-Arp-Entry-%s-%s-%s" % (self.bd, self.mac, self.ip.address) + return "BD-Arp-Entry-%s-%s-%s" % (self.bd, self.mac, self.ip) class VppL2FibEntry(VppObject): @@ -181,7 +166,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 +177,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 +188,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,11 +196,34 @@ 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): - return self.object_id() - 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 object_id(self): + return "L2-vtr-%s-%d" % (str(self.itf), self.op)