Add UDP encap flag

[vpp.git] / test / test_acl_plugin_macip.py

diff --git a/test/test_acl_plugin_macip.py b/test/test_acl_plugin_macip.py
index f35db55..951e86a 100644 (file)
--- a/test/test_acl_plugin_macip.py
+++ b/test/test_acl_plugin_macip.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 """ACL plugin - MACIP tests
 """
+import binascii
 import random
 import re
 import unittest
@@ -16,6 +17,7 @@ from framework import VppTestCase, VppTestRunner, running_extended_tests
 from vpp_lo_interface import VppLoInterface
 from vpp_papi_provider import L2_VTR_OP
 from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
+from vpp_papi_provider import L2_PORT_TYPE
 
 
 class MethodHolder(VppTestCase):
@@ -90,7 +92,8 @@ class MethodHolder(VppTestCase):
 
             # Create BD with MAC learning enabled and put interfaces to this BD
             cls.vapi.sw_interface_set_l2_bridge(
-                cls.loop0.sw_if_index, bd_id=cls.bd_id, bvi=1)
+                cls.loop0.sw_if_index, bd_id=cls.bd_id,
+                port_type=L2_PORT_TYPE.BVI)
             cls.vapi.sw_interface_set_l2_bridge(
                 cls.pg0.sw_if_index, bd_id=cls.bd_id)
             cls.vapi.sw_interface_set_l2_bridge(
@@ -142,7 +145,7 @@ class MethodHolder(VppTestCase):
             cls.subifs[3].remote_hosts = cls.loop0.remote_hosts[175:]
 
         except Exception:
-            super(TestMACIP, cls).tearDownClass()
+            super(MethodHolder, cls).tearDownClass()
             raise
 
     def setUp(self):
@@ -183,8 +186,8 @@ class MethodHolder(VppTestCase):
                         rule = "DENY  "
                     print "    IP6" if r.is_ipv6 else "    IP4", \
                           rule, \
-                          r.src_mac.encode('hex'), \
-                          r.src_mac_mask.encode('hex'),\
+                          binascii.hexlify(r.src_mac), \
+                          binascii.hexlify(r.src_mac_mask),\
                           unpack('<16B', r.src_ip_addr), \
                           r.src_ip_prefix_len
         return acls
@@ -573,8 +576,8 @@ class MethodHolder(VppTestCase):
         # TODO : verify
         # for acl in acls:
         #     for r in acl.r:
-        #         print r.src_mac.encode('hex'), \
-        #               r.src_mac_mask.encode('hex'),\
+        #         print binascii.hexlify(r.src_mac), \
+        #               binascii.hexlify(r.src_mac_mask),\
         #               unpack('<16B', r.src_ip_addr), \
         #               r.src_ip_prefix_len
         #