diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-02-28 15:34:00 -0800 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-03-01 09:25:08 +0000 |
| commit | e8fece85e2b6190a1ebdc05c10cd79e43f385918 (patch) | |
| tree | 0f79255b4d45811521f295c7b47b1e75bbe2255d /test/test_dhcp6.py | |
| parent | 9e52ef6024a5f130ed542810a8b0ddb2b5fb08b7 (diff) | |
Tests: Refactor duplicated code.
Naveen suggested earlier today that we should refactor duplicate code.
This commit kicks off the effort.
Change-Id: I855b0f40d41d1f3a2e673f3b254b76b596409656
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_dhcp6.py')
| -rw-r--r-- | test/test_dhcp6.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/test_dhcp6.py b/test/test_dhcp6.py index 6c203868673..7510543af8e 100644 --- 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 """ @@ -88,7 +85,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) / @@ -165,7 +162,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) / @@ -317,7 +314,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) / @@ -569,7 +566,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) / |