Skip to content

Fix single ip test #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhughesoti merged 4 commits into from
Jul 17, 2023
Merged

Fix single ip test #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
865002e
Fix single ip test from detecting faux-device during validation as a …
jhughesoti Jun 28, 2023
723b9c9
Merge branch 'dev' into single_ip
jboddey Jul 12, 2023
a4dd87a
remove dhcp server capture file from scan
jhughesoti Jul 14, 2023
c4adfe0
Merge branch 'dev' into single_ip
jhughesoti Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion framework/python/src/net_orc/network_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
DEVICE_BRIDGE = 'tr-d'
CONF_DIR = 'local'
CONF_FILE = 'system.json'

TR_CONTAINER_MAC_PREFIX = '9a:02:57:1e:8f:'

class NetworkValidator:
"""Perform validation of network services."""
Expand Down Expand Up @@ -238,6 +238,10 @@ def _attach_device_to_network(self, device):
util.run_command('ip link add ' + bridge_intf + ' type veth peer name ' +
container_intf)

mac_addr = TR_CONTAINER_MAC_PREFIX + '10'

util.run_command('ip link set dev ' + container_intf + ' address ' + mac_addr)

# Add bridge interface to device bridge
util.run_command('ovs-vsctl add-port ' + DEVICE_BRIDGE + ' ' + bridge_intf)

Expand All @@ -258,6 +262,7 @@ def _attach_device_to_network(self, device):
util.run_command('ip netns exec ' + container_net_ns + ' ip link set dev ' +
container_intf + ' name veth0')


# Set interfaces up
util.run_command('ip link set dev ' + bridge_intf + ' up')
util.run_command('ip netns exec ' + container_net_ns +
Expand Down
13 changes: 7 additions & 6 deletions modules/test/conn/python/src/connection_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
LOG_NAME = 'test_connection'
LOGGER = None
OUI_FILE = '/usr/local/etc/oui.txt'
DHCP_SERVER_CAPTURE_FILE = '/runtime/network/dhcp-1.pcap'
STARTUP_CAPTURE_FILE = '/runtime/device/startup.pcap'
MONITOR_CAPTURE_FILE = '/runtime/device/monitor.pcap'
SLAAC_PREFIX = 'fd10:77be:4186'

TR_CONTAINER_MAC_PREFIX = '9a:02:57:1e:8f:'


class ConnectionModule(TestModule):
"""Connection Test module"""
Expand Down Expand Up @@ -191,18 +192,18 @@ def _connection_single_ip(self):
return result, 'No MAC address found.'

# Read all the pcap files containing DHCP packet information
packets = rdpcap(DHCP_SERVER_CAPTURE_FILE)
packets.append(rdpcap(STARTUP_CAPTURE_FILE))
packets = rdpcap(STARTUP_CAPTURE_FILE)
packets.append(rdpcap(MONITOR_CAPTURE_FILE))

# Extract MAC addresses from DHCP packets
mac_addresses = set()
LOGGER.info('Inspecting: ' + str(len(packets)) + ' packets')
for packet in packets:
# Option[1] = message-type, option 3 = DHCPREQUEST
if DHCP in packet and packet[DHCP].options[0][1] == 3:
mac_address = packet[Ether].src
mac_addresses.add(mac_address.upper())
if DHCP in packet and packet[DHCP].options[0][1] == 3:
mac_address = packet[Ether].src
if not mac_address.startswith(TR_CONTAINER_MAC_PREFIX):
mac_addresses.add(mac_address.upper())

# Check if the device mac address is in the list of DHCPREQUESTs
result = self._device_mac.upper() in mac_addresses
Expand Down