X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_p2p_ethernet.py;h=b0d546e4d1f8251c212a5d5cd6722c777c922d61;hb=ea2450fa2d1e8ba0295ea9861a404796100dad1e;hp=d6d5c5071c4d7b255e5b5779d5dd841ab3e60a55;hpb=2ae2bc5380845d1480ec385749b7e8515e3b2185;p=vpp.git

diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py
index d6d5c5071c4..b0d546e4d1f 100644
--- a/test/test_p2p_ethernet.py
+++ b/test/test_p2p_ethernet.py
@@ -11,8 +11,9 @@ from scapy.layers.inet6 import IPv6
 
 from framework import VppTestCase, VppTestRunner
 from vpp_sub_interface import VppP2PSubint
-from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto
-from util import mactobinary
+from vpp_ip import DpoProto
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_papi import mac_pton
 
 
 class P2PEthernetAPI(VppTestCase):
@@ -32,12 +33,12 @@ class P2PEthernetAPI(VppTestCase):
             i.admin_up()
 
     def create_p2p_ethernet(self, parent_if, sub_id, remote_mac):
-        p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac))
+        p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac))
         self.p2p_sub_ifs.append(p2p)
 
     def delete_p2p_ethernet(self, parent_if, remote_mac):
-        self.vapi.delete_p2pethernet_subif(parent_if.sw_if_index,
-                                           mactobinary(remote_mac))
+        self.vapi.p2p_ethernet_del(parent_if.sw_if_index,
+                                   mac_pton(remote_mac))
 
     def test_api(self):
         """delete/create p2p subif"""
@@ -76,12 +77,14 @@ class P2PEthernetAPI(VppTestCase):
 
         for i in range(1, clients+1):
             try:
-                macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i))))
-                self.vapi.create_p2pethernet_subif(self.pg2.sw_if_index,
-                                                   mactobinary(macs[i-1]),
-                                                   i)
+                macs.append(':'.join(re.findall('..', '{:02x}'.format(
+                    mac+i))))
+                self.vapi.p2p_ethernet_add(self.pg2.sw_if_index,
+                                           mac_pton(macs[i-1]),
+                                           i)
             except Exception:
-                print "Failed to create subif %d %s" % (i, macs[i-1])
+                self.logger.info("Failed to create subif %d %s" % (
+                    i, macs[i-1]))
                 raise
 
         intfs = self.vapi.cli("show interface").split("\n")
@@ -142,7 +145,7 @@ class P2PEthernetIPV6(VppTestCase):
         super(P2PEthernetIPV6, self).tearDown()
 
     def create_p2p_ethernet(self, parent_if, sub_id, remote_mac):
-        p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac))
+        p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac))
         p2p.admin_up()
         p2p.config_ip6()
         p2p.disable_ipv6_ra()
@@ -151,8 +154,8 @@ class P2PEthernetIPV6(VppTestCase):
     def delete_p2p_ethernet(self, p2p):
         p2p.unconfig_ip6()
         p2p.admin_down()
-        self.vapi.delete_p2pethernet_subif(p2p.parent.sw_if_index,
-                                           p2p.p2p_remote_mac)
+        self.vapi.p2p_ethernet_del(p2p.parent.sw_if_index,
+                                   p2p.p2p_remote_mac)
 
     def create_stream(self, src_mac=None, dst_mac=None,
                       src_ip=None, dst_ip=None, size=None):
@@ -175,16 +178,6 @@ class P2PEthernetIPV6(VppTestCase):
             count = len(packets)
         return dst_if.get_capture(count)
 
-    def verify_counters(self, counter_id, expected_value):
-        counters = self.vapi.cli("sh errors").split('\n')
-        counter_value = -1
-        for i in range(1, len(counters)-1):
-            results = counters[i].split()
-            if results[1] == counter_id:
-                counter_value = int(results[0])
-                break
-        self.assertEqual(counter_value, expected_value)
-
     def test_no_p2p_subif(self):
         """standard routing without p2p subinterfaces"""
         self.logger.info("FFP_TEST_START_0001")
@@ -223,7 +216,7 @@ class P2PEthernetIPV6(VppTestCase):
                                dst_ip="9001::100"))
 
         self.send_packets(self.pg0, self.pg1, self.packets)
-        self.verify_counters('p2p-ethernet-input', 1)
+        self.assert_packet_counter_equal('p2p-ethernet-input', 1)
 
         route_9001.remove_vpp_config()
         self.logger.info("FFP_TEST_FINISH_0002")
@@ -396,18 +389,8 @@ class P2PEthernetIPV4(VppTestCase):
             count = len(packets)
         return dst_if.get_capture(count)
 
-    def verify_counters(self, counter_id, expected_value):
-        counters = self.vapi.cli("sh errors").split('\n')
-        counter_value = -1
-        for i in range(1, len(counters)-1):
-            results = counters[i].split()
-            if results[1] == counter_id:
-                counter_value = int(results[0])
-                break
-        self.assertEqual(counter_value, expected_value)
-
     def create_p2p_ethernet(self, parent_if, sub_id, remote_mac):
-        p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac))
+        p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac))
         p2p.admin_up()
         p2p.config_ip4()
         return p2p
@@ -415,8 +398,8 @@ class P2PEthernetIPV4(VppTestCase):
     def delete_p2p_ethernet(self, p2p):
         p2p.unconfig_ip4()
         p2p.admin_down()
-        self.vapi.delete_p2pethernet_subif(p2p.parent.sw_if_index,
-                                           p2p.p2p_remote_mac)
+        self.vapi.p2p_ethernet_del(p2p.parent.sw_if_index,
+                                   p2p.p2p_remote_mac)
 
     def test_ip4_rx_p2p_subif(self):
         """receive ipv4 packet via p2p subinterface"""
@@ -435,7 +418,7 @@ class P2PEthernetIPV4(VppTestCase):
 
         self.send_packets(self.pg0, self.pg1, self.packets)
 
-        self.verify_counters('p2p-ethernet-input', 1)
+        self.assert_packet_counter_equal('p2p-ethernet-input', 1)
 
         route_9000.remove_vpp_config()
         self.logger.info("FFP_TEST_FINISH_0002")