stats: enable/disable segments polls

[vpp.git] / test / test_dhcp6.py

diff --git a/test/test_dhcp6.py b/test/test_dhcp6.py
index 4c6b7d3..57eb113 100644 (file)
--- a/test/test_dhcp6.py
+++ b/test/test_dhcp6.py
@@ -1,4 +1,4 @@
-from socket import AF_INET6
+from socket import AF_INET6, inet_ntop, inet_pton
 
 from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \
     DHCP6OptStatusCode, DHCP6OptPref, DHCP6OptIA_PD, DHCP6OptIAPrefix, \
@@ -7,11 +7,13 @@ from scapy.layers.dhcp6 import DHCP6_Advertise, DHCP6OptClientId, \
     DHCP6OptIAAddress
 from scapy.layers.inet6 import IPv6, Ether, UDP
 from scapy.utils6 import in6_mactoifaceid
-from scapy.utils import inet_ntop, inet_pton
 
+from framework import tag_fixme_vpp_workers
 from framework import VppTestCase
+from framework import tag_run_solo
 from vpp_papi import VppEnum
 import util
+import os
 
 
 def ip6_normalize(ip6):
@@ -49,7 +51,7 @@ class TestDHCPv6DataPlane(VppTestCase):
     def test_dhcp_ia_na_send_solicit_receive_advertise(self):
         """ Verify DHCPv6 IA NA Solicit packet and Advertise event """
 
-        self.vapi.dhcp6_clients_enable_disable()
+        self.vapi.dhcp6_clients_enable_disable(enable=1)
 
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
@@ -57,6 +59,8 @@ class TestDHCPv6DataPlane(VppTestCase):
                    'preferred_time': 60,
                    'valid_time': 120}
         self.vapi.dhcp6_send_client_message(
+            server_index=0xffffffff,
+            mrc=1,
             msg_type=VppEnum.vl_api_dhcpv6_msg_type_t.DHCPV6_MSG_API_SOLICIT,
             sw_if_index=self.pg0.sw_if_index,
             T1=20,
@@ -89,7 +93,8 @@ class TestDHCPv6DataPlane(VppTestCase):
         self.assert_equal(address.preflft, 60)
         self.assert_equal(address.validlft, 120)
 
-        self.vapi.want_dhcp6_reply_events()
+        self.vapi.want_dhcp6_reply_events(enable_disable=1,
+                                          pid=os.getpid())
 
         try:
             ia_na_opts = DHCP6OptIAAddress(addr='7:8::2', preflft=60,
@@ -125,11 +130,12 @@ class TestDHCPv6DataPlane(VppTestCase):
 
         finally:
             self.vapi.want_dhcp6_reply_events(enable_disable=0)
+        self.vapi.dhcp6_clients_enable_disable(enable=0)
 
     def test_dhcp_pd_send_solicit_receive_advertise(self):
         """ Verify DHCPv6 PD Solicit packet and Advertise event """
 
-        self.vapi.dhcp6_clients_enable_disable()
+        self.vapi.dhcp6_clients_enable_disable(enable=1)
 
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
@@ -139,6 +145,8 @@ class TestDHCPv6DataPlane(VppTestCase):
                   'valid_time': 120}
         prefixes = [prefix]
         self.vapi.dhcp6_pd_send_client_message(
+            server_index=0xffffffff,
+            mrc=1,
             msg_type=VppEnum.vl_api_dhcpv6_msg_type_t.DHCPV6_MSG_API_SOLICIT,
             sw_if_index=self.pg0.sw_if_index,
             T1=20,
@@ -171,7 +179,8 @@ class TestDHCPv6DataPlane(VppTestCase):
         self.assert_equal(prefix.preflft, 60)
         self.assert_equal(prefix.validlft, 120)
 
-        self.vapi.want_dhcp6_pd_reply_events()
+        self.vapi.want_dhcp6_pd_reply_events(enable_disable=1,
+                                             pid=os.getpid())
 
         try:
             ia_pd_opts = DHCP6OptIAPrefix(prefix='7:8::', plen=56, preflft=60,
@@ -210,8 +219,10 @@ class TestDHCPv6DataPlane(VppTestCase):
 
         finally:
             self.vapi.want_dhcp6_pd_reply_events(enable_disable=0)
+        self.vapi.dhcp6_clients_enable_disable(enable=0)
 
 
+@tag_run_solo
 class TestDHCPv6IANAControlPlane(VppTestCase):
     """ DHCPv6 IA NA Control Plane Test Case """
 
@@ -243,10 +254,12 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        self.vapi.dhcp6_client_enable_disable(self.pg0.sw_if_index)
+        self.vapi.dhcp6_client_enable_disable(sw_if_index=self.pg0.sw_if_index,
+                                              enable=1)
 
     def tearDown(self):
-        self.vapi.dhcp6_client_enable_disable(self.pg0.sw_if_index, enable=0)
+        self.vapi.dhcp6_client_enable_disable(sw_if_index=self.pg0.sw_if_index,
+                                              enable=0)
 
         for i in self.interfaces:
             i.admin_down()
@@ -463,6 +476,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
         self.assertEqual(len(new_addresses), 0)
 
 
+@tag_fixme_vpp_workers
 class TestDHCPv6PDControlPlane(VppTestCase):
     """ DHCPv6 PD Control Plane Test Case """
 
@@ -497,7 +511,8 @@ class TestDHCPv6PDControlPlane(VppTestCase):
         self.prefix_group = 'my-pd-prefix-group'
 
         self.vapi.dhcp6_pd_client_enable_disable(
-            self.pg0.sw_if_index,
+            enable=1,
+            sw_if_index=self.pg0.sw_if_index,
             prefix_group=self.prefix_group)
 
     def tearDown(self):
@@ -629,15 +644,13 @@ class TestDHCPv6PDControlPlane(VppTestCase):
     def test_prefixes(self):
         """ Test handling of prefixes """
 
-        address_bin_1 = None
-        address_bin_2 = None
+        address1 = '::2:0:0:0:405/60'
+        address2 = '::76:0:0:0:406/62'
         try:
-            address_bin_1 = '\x00' * 6 + '\x00\x02' + '\x00' * 6 + '\x04\x05'
-            address_prefix_length_1 = 60
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin_1,
-                                                       address_prefix_length_1,
-                                                       self.prefix_group)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                address_with_prefix=address1,
+                prefix_group=self.prefix_group)
 
             ia_pd_opts = DHCP6OptIAPrefix(prefix='7:8::', plen=56, preflft=2,
                                           validlft=3)
@@ -656,12 +669,10 @@ class TestDHCPv6PDControlPlane(VppTestCase):
 
             self.sleep(1)
 
-            address_bin_2 = '\x00' * 6 + '\x00\x76' + '\x00' * 6 + '\x04\x06'
-            address_prefix_length_2 = 62
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin_2,
-                                                       address_prefix_length_2,
-                                                       self.prefix_group)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                address_with_prefix=address2,
+                prefix_group=self.prefix_group)
 
             self.sleep(1)
 
@@ -686,14 +697,16 @@ class TestDHCPv6PDControlPlane(VppTestCase):
             self.assertEqual(len(new_addresses), 0)
 
         finally:
-            if address_bin_1 is not None:
+            if address1 is not None:
                 self.vapi.ip6_add_del_address_using_prefix(
-                    self.pg1.sw_if_index, address_bin_1,
-                    address_prefix_length_1, self.prefix_group, is_add=0)
-            if address_bin_2 is not None:
+                    sw_if_index=self.pg1.sw_if_index,
+                    address_with_prefix=address1,
+                    prefix_group=self.prefix_group, is_add=0)
+            if address2 is not None:
                 self.vapi.ip6_add_del_address_using_prefix(
-                    self.pg1.sw_if_index, address_bin_2,
-                    address_prefix_length_2, self.prefix_group, is_add=0)
+                    sw_if_index=self.pg1.sw_if_index,
+                    address_with_prefix=address2,
+                    prefix_group=self.prefix_group, is_add=0)
 
     def test_sending_client_messages_solicit(self):
         """ VPP receives messages from DHCPv6 client """
@@ -730,13 +743,12 @@ class TestDHCPv6PDControlPlane(VppTestCase):
     def test_preferred_greater_than_valid_lifetime(self):
         """ Preferred lifetime is greater than valid lifetime """
 
+        address1 = '::2:0:0:0:405/60'
         try:
-            address_bin = '\x00' * 6 + '\x00\x02' + '\x00' * 6 + '\x04\x05'
-            address_prefix_length = 60
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin,
-                                                       address_prefix_length,
-                                                       self.prefix_group)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                address_with_prefix=address1,
+                prefix_group=self.prefix_group)
 
             self.wait_for_solicit()
             self.send_advertise()
@@ -754,22 +766,21 @@ class TestDHCPv6PDControlPlane(VppTestCase):
             self.assertEqual(len(new_addresses), 0)
 
         finally:
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin,
-                                                       address_prefix_length,
-                                                       self.prefix_group,
-                                                       is_add=0)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                address_with_prefix=address1,
+                prefix_group=self.prefix_group,
+                is_add=0)
 
     def test_T1_greater_than_T2(self):
         """ T1 is greater than T2 """
 
+        address1 = '::2:0:0:0:405/60'
         try:
-            address_bin = '\x00' * 6 + '\x00\x02' + '\x00' * 6 + '\x04\x05'
-            address_prefix_length = 60
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin,
-                                                       address_prefix_length,
-                                                       self.prefix_group)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                address_with_prefix=address1,
+                prefix_group=self.prefix_group)
 
             self.wait_for_solicit()
             self.send_advertise()
@@ -787,8 +798,8 @@ class TestDHCPv6PDControlPlane(VppTestCase):
             self.assertEqual(len(new_addresses), 0)
 
         finally:
-            self.vapi.ip6_add_del_address_using_prefix(self.pg1.sw_if_index,
-                                                       address_bin,
-                                                       address_prefix_length,
-                                                       self.prefix_group,
-                                                       is_add=0)
+            self.vapi.ip6_add_del_address_using_prefix(
+                sw_if_index=self.pg1.sw_if_index,
+                prefix_group=self.prefix_group,
+                address_with_prefix=address1,
+                is_add=False)