-#!/usr/bin/env python
+#!/usr/bin/env python3
import unittest
import socket
import struct
+import six
from framework import VppTestCase, VppTestRunner, running_extended_tests
from vpp_neighbor import VppNeighbor
from scapy.layers.dhcp6 import DHCP6, DHCP6_Solicit, DHCP6_RelayForward, \
DHCP6_RelayReply, DHCP6_Advertise, DHCP6OptRelayMsg, DHCP6OptIfaceId, \
DHCP6OptStatusCode, DHCP6OptVSS, DHCP6OptClientLinkLayerAddr, DHCP6_Request
-from socket import AF_INET, AF_INET6
-from scapy.utils import inet_pton, inet_ntop
+from socket import AF_INET, AF_INET6, inet_pton, inet_ntop
from scapy.utils6 import in6_ptop
from vpp_papi import mac_pton, VppEnum
from vpp_sub_interface import VppDot1QSubint
# The ID space is VPP internal - so no matching value
# scapy
#
- self.assertEqual(ord(data[0]), 1)
- self.assertEqual(ord(data[1]), 4)
- self.assertEqual(ord(data[2]), 0)
- self.assertEqual(ord(data[3]), 0)
- self.assertEqual(ord(data[4]), 0)
- self.assertEqual(ord(data[5]), intf._sw_if_index)
+ self.assertEqual(six.byte2int(data[0:1]), 1)
+ self.assertEqual(six.byte2int(data[1:2]), 4)
+ self.assertEqual(six.byte2int(data[2:3]), 0)
+ self.assertEqual(six.byte2int(data[3:4]), 0)
+ self.assertEqual(six.byte2int(data[4:5]), 0)
+ self.assertEqual(six.byte2int(data[5:6]),
+ intf._sw_if_index)
#
# next sub-option is the IP address of the client side
#
claddr = socket.inet_pton(AF_INET, ip_addr)
- self.assertEqual(ord(data[6]), 5)
- self.assertEqual(ord(data[7]), 4)
+ self.assertEqual(six.byte2int(data[6:7]), 5)
+ self.assertEqual(six.byte2int(data[7:8]), 4)
self.assertEqual(data[8], claddr[0])
self.assertEqual(data[9], claddr[1])
self.assertEqual(data[10], claddr[2])
# sub-option 151 encodes vss_type 1,
# the 3 byte oui and the 4 byte fib_id
self.assertEqual(id_len, 0)
- self.assertEqual(ord(data[12]), 151)
- self.assertEqual(ord(data[13]), 8)
- self.assertEqual(ord(data[14]), 1)
- self.assertEqual(ord(data[15]), 0)
- self.assertEqual(ord(data[16]), 0)
- self.assertEqual(ord(data[17]), oui)
- self.assertEqual(ord(data[18]), 0)
- self.assertEqual(ord(data[19]), 0)
- self.assertEqual(ord(data[20]), 0)
- self.assertEqual(ord(data[21]), fib_id)
+ self.assertEqual(six.byte2int(data[12:13]), 151)
+ self.assertEqual(six.byte2int(data[13:14]), 8)
+ self.assertEqual(six.byte2int(data[14:15]), 1)
+ self.assertEqual(six.byte2int(data[15:16]), 0)
+ self.assertEqual(six.byte2int(data[16:17]), 0)
+ self.assertEqual(six.byte2int(data[17:18]), oui)
+ self.assertEqual(six.byte2int(data[18:19]), 0)
+ self.assertEqual(six.byte2int(data[19:20]), 0)
+ self.assertEqual(six.byte2int(data[20:21]), 0)
+ self.assertEqual(six.byte2int(data[21:22]), fib_id)
# VSS control sub-option
- self.assertEqual(ord(data[22]), 152)
- self.assertEqual(ord(data[23]), 0)
+ self.assertEqual(six.byte2int(data[22:23]), 152)
+ self.assertEqual(six.byte2int(data[23:24]), 0)
if id_len > 0:
# sub-option 151 encode vss_type of 0
# followerd by vpn_id in ascii
self.assertEqual(oui, 0)
- self.assertEqual(ord(data[12]), 151)
- self.assertEqual(ord(data[13]), id_len + 1)
- self.assertEqual(ord(data[14]), 0)
- self.assertEqual(data[15:15 + id_len], vpn_id)
+ self.assertEqual(six.byte2int(data[12:13]), 151)
+ self.assertEqual(six.byte2int(data[13:14]), id_len + 1)
+ self.assertEqual(six.byte2int(data[14:15]), 0)
+ self.assertEqual(data[15:15 + id_len].decode('ascii'),
+ vpn_id)
# VSS control sub-option
- self.assertEqual(ord(data[15 + len(vpn_id)]), 152)
- self.assertEqual(ord(data[16 + len(vpn_id)]), 0)
+ self.assertEqual(six.byte2int(data[15 + len(vpn_id):
+ 16 + len(vpn_id)]),
+ 152)
+ self.assertEqual(six.byte2int(data[16 + len(vpn_id):
+ 17 + len(vpn_id)]),
+ 0)
found = 1
self.assertTrue(found)
self.verify_orig_dhcp_pkt(pkt, intf, dscp)
self.verify_dhcp_msg_type(pkt, "discover")
- self.verify_dhcp_has_option(pkt, "hostname", hostname)
+ self.verify_dhcp_has_option(pkt, "hostname",
+ hostname.encode('ascii'))
if client_id:
- self.verify_dhcp_has_option(pkt, "client_id", client_id)
+ client_id = '\x00' + client_id
+ self.verify_dhcp_has_option(pkt, "client_id",
+ client_id.encode('ascii'))
bootp = pkt[BOOTP]
self.assertEqual(bootp.ciaddr, "0.0.0.0")
self.assertEqual(bootp.giaddr, "0.0.0.0")
self.verify_orig_dhcp_pkt(pkt, intf, dscp, l2_bc=l2_bc)
self.verify_dhcp_msg_type(pkt, "request")
- self.verify_dhcp_has_option(pkt, "hostname", hostname)
+ self.verify_dhcp_has_option(pkt, "hostname",
+ hostname.encode('ascii'))
self.verify_dhcp_has_option(pkt, "requested_addr", ip)
bootp = pkt[BOOTP]
self.assertEqual(vss.type, 1)
# the OUI and FIB-id are really 3 and 4 bytes resp.
# but the tested range is small
- self.assertEqual(ord(vss.data[0]), 0)
- self.assertEqual(ord(vss.data[1]), 0)
- self.assertEqual(ord(vss.data[2]), oui)
- self.assertEqual(ord(vss.data[3]), 0)
- self.assertEqual(ord(vss.data[4]), 0)
- self.assertEqual(ord(vss.data[5]), 0)
- self.assertEqual(ord(vss.data[6]), fib_id)
+ self.assertEqual(six.byte2int(vss.data[0:1]), 0)
+ self.assertEqual(six.byte2int(vss.data[1:2]), 0)
+ self.assertEqual(six.byte2int(vss.data[2:3]), oui)
+ self.assertEqual(six.byte2int(vss.data[3:4]), 0)
+ self.assertEqual(six.byte2int(vss.data[4:5]), 0)
+ self.assertEqual(six.byte2int(vss.data[5:6]), 0)
+ self.assertEqual(six.byte2int(vss.data[6:7]), fib_id)
if id_len > 0:
self.assertEqual(oui, 0)
vss = pkt[DHCP6OptVSS]
self.assertEqual(vss.optlen, id_len + 1)
self.assertEqual(vss.type, 0)
- self.assertEqual(vss.data[0:id_len], vpn_id)
+ self.assertEqual(vss.data[0:id_len].decode('ascii'),
+ vpn_id)
# the relay message should be an encoded Solicit
msg = pkt[DHCP6OptRelayMsg]
sol = DHCP6_Solicit()
- self.assertEqual(msg.optlen, len(str(sol)))
- self.assertEqual(str(sol), (str(msg[1]))[:msg.optlen])
+ self.assertEqual(msg.optlen, len(sol))
+ self.assertEqual(sol, msg[1])
def verify_dhcp6_advert(self, pkt, intf, peer):
ether = pkt[Ether]
self.assertTrue(find_route(self, self.pg3.local_ip4, 24))
self.assertTrue(find_route(self, self.pg3.local_ip4, 32))
- # remove the left over ARP entry
- self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
- self.pg3.remote_mac,
- self.pg3.remote_ip4,
- is_add=0)
-
#
# remove the DHCP config
#
self.assertTrue(find_route(self, self.pg3.local_ip4, 24))
self.assertTrue(find_route(self, self.pg3.local_ip4, 32))
+ #
+ # read the DHCP client details from a dump
+ #
+ clients = self.vapi.dhcp_client_dump()
+
+ self.assertEqual(clients[0].client.sw_if_index,
+ self.pg3.sw_if_index)
+ self.assertEqual(clients[0].lease.sw_if_index,
+ self.pg3.sw_if_index)
+ self.assertEqual(clients[0].client.hostname, hostname)
+ self.assertEqual(clients[0].lease.hostname, hostname)
+ # 0 = DISCOVER, 1 = REQUEST, 2 = BOUND
+ self.assertEqual(clients[0].lease.state, 2)
+ self.assertEqual(clients[0].lease.mask_width, 24)
+ self.assertEqual(str(clients[0].lease.router_address),
+ self.pg3.remote_ip4)
+ self.assertEqual(str(clients[0].lease.host_address),
+ self.pg3.local_ip4)
+
#
# wait for the unicasted renewal
# the first attempt will be an ARP packet, since we have not yet
l2_bc=False,
broadcast=False)
+ # send an ACK with different data from the original offer *
+ self.pg3.generate_remote_hosts(4)
+ p_ack = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) /
+ IP(src=self.pg3.remote_ip4, dst=self.pg3.local_ip4) /
+ UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) /
+ BOOTP(op=1, yiaddr=self.pg3.remote_hosts[3].ip4,
+ chaddr=mac_pton(self.pg3.local_mac)) /
+ DHCP(options=[('message-type', 'ack'),
+ ('subnet_mask', "255.255.255.0"),
+ ('router', self.pg3.remote_hosts[1].ip4),
+ ('server_id', self.pg3.remote_hosts[2].ip4),
+ ('lease_time', 43200),
+ ('renewal_time', 2),
+ 'end']))
+
+ self.pg3.add_stream(p_ack)
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
#
# read the DHCP client details from a dump
#
self.pg3.sw_if_index)
self.assertEqual(clients[0].lease.sw_if_index,
self.pg3.sw_if_index)
- self.assertEqual(clients[0].client.hostname.rstrip('\0'),
- hostname)
- self.assertEqual(clients[0].lease.hostname.rstrip('\0'),
- hostname)
+ self.assertEqual(clients[0].client.hostname, hostname)
+ self.assertEqual(clients[0].lease.hostname, hostname)
# 0 = DISCOVER, 1 = REQUEST, 2 = BOUND
self.assertEqual(clients[0].lease.state, 2)
self.assertEqual(clients[0].lease.mask_width, 24)
self.assertEqual(str(clients[0].lease.router_address),
- self.pg3.remote_ip4)
+ self.pg3.remote_hosts[1].ip4)
self.assertEqual(str(clients[0].lease.host_address),
- self.pg3.local_ip4)
-
- # remove the left over ARP entry
- self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
- self.pg3.remote_mac,
- self.pg3.remote_ip4,
- is_add=0)
+ self.pg3.remote_hosts[3].ip4)
#
# remove the DHCP config
#
# Start the procedure again. Use requested lease time option.
+ # this time wait for the lease to expire and the client to
+ # self-destruct
#
hostname += "-2"
self.pg3.admin_down()
self.assertTrue(find_route(self, self.pg3.local_ip4, 32))
self.assertTrue(find_route(self, self.pg3.local_ip4, 24))
- # remove the left over ARP entry
- self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
- self.pg3.remote_mac,
- self.pg3.remote_ip4,
- is_add=0)
-
#
# the route should be gone after the lease expires
#
Code Review / vpp.git / blobdiff