Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Typos. A bunch of typos I've been collecting.
[vpp.git] / test / test_dhcp6.py
diff --git a/test/test_dhcp6.py b/test/test_dhcp6.py
index fe06f98..dcf02fa 100644 (file)
--- a/test/test_dhcp6.py
+++ b/test/test_dhcp6.py
@@ -1,3 +1,5 @@
+from socket import AF_INET6
+
 from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \
     DHCP6OptStatusCode, DHCP6OptPref, DHCP6OptIA_PD, DHCP6OptIAPrefix, \
     DHCP6OptServerId, DHCP6_Solicit, DHCP6_Reply, DHCP6_Request, DHCP6_Renew, \
@@ -6,20 +8,15 @@ from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \
 from scapy.layers.inet6 import IPv6, Ether, UDP
 from scapy.utils6 import in6_mactoifaceid
 from scapy.utils import inet_ntop, inet_pton
-from socket import AF_INET6
+
 from framework import VppTestCase
+import util
 
 
 def ip6_normalize(ip6):
     return inet_ntop(AF_INET6, inet_pton(AF_INET6, ip6))
 
 
-def mk_ll_addr(mac):
-    euid = in6_mactoifaceid(mac)
-    addr = "fe80::" + euid
-    return addr
-
-
 class TestDHCPv6DataPlane(VppTestCase):
     """ DHCPv6 Data Plane Test Case """
 
@@ -45,7 +42,7 @@ class TestDHCPv6DataPlane(VppTestCase):
         super(TestDHCPv6DataPlane, self).tearDown()
 
     def test_dhcp_ia_na_send_solicit_receive_advertise(self):
-        """ Verify DHCPv6 IA NA Solicit packet and Advertise envent """
+        """ Verify DHCPv6 IA NA Solicit packet and Advertise event """
 
         self.vapi.dhcp6_clients_enable_disable()
 
@@ -55,14 +52,16 @@ class TestDHCPv6DataPlane(VppTestCase):
         address = {'address': address_bin,
                    'preferred_time': 60,
                    'valid_time': 120}
-        self.vapi.dhcp6_send_client_message(1, self.pg0.sw_if_index,
-                                            T1=20, T2=40, addresses=[address])
+        self.vapi.dhcp6_send_client_message(msg_type=1,
+                                            sw_if_index=self.pg0.sw_if_index,
+                                            T1=20, T2=40, addresses=[address],
+                                            n_addresses=len([address]))
         rx_list = self.pg0.get_capture(1)
         self.assertEqual(len(rx_list), 1)
         packet = rx_list[0]
 
-        self.assertTrue(packet.haslayer(IPv6))
-        self.assertTrue(packet[IPv6].haslayer(DHCP6_Solicit))
+        self.assertEqual(packet.haslayer(IPv6), 1)
+        self.assertEqual(packet[IPv6].haslayer(DHCP6_Solicit), 1)
 
         client_duid = packet[DHCP6OptClientId].duid
         trid = packet[DHCP6_Solicit].trid
@@ -88,7 +87,7 @@ class TestDHCPv6DataPlane(VppTestCase):
             ia_na_opts = DHCP6OptIAAddress(addr='7:8::2', preflft=60,
                                            validlft=120)
             p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
-                 IPv6(src=mk_ll_addr(self.pg0.remote_mac),
+                 IPv6(src=util.mk_ll_addr(self.pg0.remote_mac),
                       dst=self.pg0.local_ip6_ll) /
                  UDP(sport=547, dport=546) /
                  DHCP6_Advertise(trid=trid) /
@@ -120,7 +119,7 @@ class TestDHCPv6DataPlane(VppTestCase):
             self.vapi.want_dhcp6_reply_events(enable_disable=0)
 
     def test_dhcp_pd_send_solicit_receive_advertise(self):
-        """ Verify DHCPv6 PD Solicit packet and Advertise envent """
+        """ Verify DHCPv6 PD Solicit packet and Advertise event """
 
         self.vapi.dhcp6_clients_enable_disable()
 
@@ -137,8 +136,8 @@ class TestDHCPv6DataPlane(VppTestCase):
         self.assertEqual(len(rx_list), 1)
         packet = rx_list[0]
 
-        self.assertTrue(packet.haslayer(IPv6))
-        self.assertTrue(packet[IPv6].haslayer(DHCP6_Solicit))
+        self.assertEqual(packet.haslayer(IPv6), 1)
+        self.assertEqual(packet[IPv6].haslayer(DHCP6_Solicit), 1)
 
         client_duid = packet[DHCP6OptClientId].duid
         trid = packet[DHCP6_Solicit].trid
@@ -165,7 +164,7 @@ class TestDHCPv6DataPlane(VppTestCase):
             ia_pd_opts = DHCP6OptIAPrefix(prefix='7:8::', plen=56, preflft=60,
                                           validlft=120)
             p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
-                 IPv6(src=mk_ll_addr(self.pg0.remote_mac),
+                 IPv6(src=util.mk_ll_addr(self.pg0.remote_mac),
                       dst=self.pg0.local_ip6_ll) /
                  UDP(sport=547, dport=546) /
                  DHCP6_Advertise(trid=trid) /
@@ -256,7 +255,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
 
     def validate_packet(self, packet, msg_type, is_resend=False):
         try:
-            self.assertTrue(packet.haslayer(msg_type))
+            self.assertEqual(packet.haslayer(msg_type), 1)
             client_duid = packet[DHCP6OptClientId].duid
             if self.client_duid is None:
                 self.client_duid = client_duid
@@ -317,7 +316,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
         else:
             opt_ia_na = DHCP6OptIA_NA(iaid=1, T1=t1, T2=t2, ianaopts=ianaopts)
         p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
-             IPv6(src=mk_ll_addr(self.pg0.remote_mac),
+             IPv6(src=util.mk_ll_addr(self.pg0.remote_mac),
                   dst=self.pg0.local_ip6_ll) /
              UDP(sport=547, dport=546) /
              msg_type(trid=self.trid) /
@@ -411,7 +410,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
         self.send_advertise(ianaopts=noavail)
         self.wait_for_solicit(is_resend=True)
 
-    def test_preferred_greater_than_valit_lifetime(self):
+    def test_preferred_greater_than_valid_lifetime(self):
         """ Preferred lifetime is greater than valid lifetime """
 
         self.wait_for_solicit()
@@ -508,7 +507,7 @@ class TestDHCPv6PDControlPlane(VppTestCase):
 
     def validate_packet(self, packet, msg_type, is_resend=False):
         try:
-            self.assertTrue(packet.haslayer(msg_type))
+            self.assertEqual(packet.haslayer(msg_type), 1)
             client_duid = packet[DHCP6OptClientId].duid
             if self.client_duid is None:
                 self.client_duid = client_duid
@@ -569,7 +568,7 @@ class TestDHCPv6PDControlPlane(VppTestCase):
         else:
             opt_ia_pd = DHCP6OptIA_PD(iaid=1, T1=t1, T2=t2, iapdopt=iapdopt)
         p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
-             IPv6(src=mk_ll_addr(self.pg0.remote_mac),
+             IPv6(src=util.mk_ll_addr(self.pg0.remote_mac),
                   dst=self.pg0.local_ip6_ll) /
              UDP(sport=547, dport=546) /
              msg_type(trid=self.trid) /
@@ -706,7 +705,7 @@ class TestDHCPv6PDControlPlane(VppTestCase):
         self.send_advertise(iapdopt=noavail)
         self.wait_for_solicit(is_resend=True)
 
-    def test_preferred_greater_than_valit_lifetime(self):
+    def test_preferred_greater_than_valid_lifetime(self):
         """ Preferred lifetime is greater than valid lifetime """
 
         try:
Vector Packet Processing