Skip to content
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

Backport | Dashify network utils script #1003

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Backport | Dashify network utils script #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 33 additions & 19 deletions virt-v2v/cold/scripts/rhel/run/network_config_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ log() {
extract_mac_ip() {
S_HW=""
S_IP=""
if [[ "$1" =~ ^([0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}):ip:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}) ]]; then
S_HW="${BASH_REMATCH[1]}"
S_IP="${BASH_REMATCH[2]}"
if echo "$1" | grep -qE '^([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5}):ip:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})$'; then
S_HW=$(echo "$1" | sed -nE 's/^([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5}):ip:.*$/\1/p')
S_IP=$(echo "$1" | sed -nE 's/^.*:ip:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})$/\1/p')
fi
}

# Create udev rules based on the macToip mapping + ifcfg network scripts
udev_from_ifcfg() {
# Check if the network scripts directory exists
if [[ ! -d "$NETWORK_SCRIPTS_DIR" ]]; then
if [ ! -d "$NETWORK_SCRIPTS_DIR" ]; then
echo "Warning: Directory $NETWORK_SCRIPTS_DIR does not exist."
return 0
fi
Expand All @@ -46,24 +46,32 @@ udev_from_ifcfg() {
while IFS= read -r line; do
# Extract S_HW and S_IP
extract_mac_ip "$line"

# If S_HW and S_IP were extracted, proceed
[[ -z "$S_HW" || -z "$S_IP" ]] && continue

# Source the matching file, if found
# If S_HW and S_IP were not extracted, skip the line
if [ -z "$S_HW" ] || [ -z "$S_IP" ]; then
continue
fi

# Find the matching network script file
IFCFG=$(grep -l "IPADDR=$S_IP" "$NETWORK_SCRIPTS_DIR"/*)
[[ -z "$IFCFG" ]] && continue
source "$IFCFG"
if [ -z "$IFCFG" ]; then
continue
fi

echo "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"$S_HW\",NAME=\"$DEVICE\""
# Source the matching file, if found
DEVICE=$(grep '^DEVICE=' "$IFCFG" | cut -d'=' -f2)
if [ -z "$DEVICE" ]; then
continue
fi

echo "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"$S_HW\",NAME=\"$DEVICE\""
done < "$V2V_MAP_FILE"
}

# Create udev rules based on the macToip mapping + network manager connections
udev_from_nm() {
# Check if the network connections directory exists
if [[ ! -d "$NETWORK_CONNECTIONS_DIR" ]]; then
# Check if the network connections directory exists
if [ ! -d "$NETWORK_CONNECTIONS_DIR" ]; then
echo "Warning: Directory $NETWORK_CONNECTIONS_DIR does not exist."
return 0
fi
Expand All @@ -73,16 +81,22 @@ udev_from_nm() {
# Extract S_HW and S_IP
extract_mac_ip "$line"

# If S_HW and S_IP were extracted, proceed
[[ -z "$S_HW" || -z "$S_IP" ]] && continue
# If S_HW and S_IP were not extracted, skip the line
if [ -z "$S_HW" ] || [ -z "$S_IP" ]; then
continue
fi

# Find the matching NetworkManager connection file
NM_FILE=$(grep -El "address[0-9]*=$S_IP" "$NETWORK_CONNECTIONS_DIR"/*)
[[ -z "$NM_FILE" ]] && continue
if [ -z "$NM_FILE" ]; then
continue
fi

# Extract the DEVICE (interface name) from the matching file
DEVICE=$(grep -oP '^interface-name=\K.*' "$NM_FILE")
[[ -z "$DEVICE" ]] && continue
DEVICE=$(grep '^interface-name=' "$NM_FILE" | cut -d'=' -f2)
if [ -z "$DEVICE" ]; then
continue
fi

echo "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"$S_HW\",NAME=\"$DEVICE\""
done < "$V2V_MAP_FILE"
Expand All @@ -93,7 +107,7 @@ check_dupe_hws() {
input=$(cat)

# Extract MAC addresses, convert to uppercase, sort them, and find duplicates
dupes=$(grep -io -E "[0-9A-F:]{17}" <<< "$input" | tr 'a-f' 'A-F' | sort | uniq -d)
dupes=$(echo "$input" | grep -ioE "[0-9A-F:]{17}" | tr 'a-f' 'A-F' | sort | uniq -d)

# If duplicates are found, print an error and exit
if [ -n "$dupes" ]; then
Expand Down
12 changes: 6 additions & 6 deletions virt-v2v/cold/scripts/rhel/run/network_config_util_test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"

# Temporary directory for testing
TEST_DIR=$(mktemp -d)
Expand All @@ -17,17 +17,17 @@ rm -rf "$NETWORK_SCRIPTS_DIR" "$NETWORK_CONNECTIONS_DIR"
mkdir -p "$NETWORK_SCRIPTS_DIR" "$NETWORK_CONNECTIONS_DIR"

# Create mock data
echo -e "aa:bb:cc:dd:ee:ff:ip:192.168.1.10\naa:bb:cc:dd:ee:fe:ip:192.168.1.11\naa:bb:cc:dd:ee:fd:ip:2001:0db8:85a3:0000:0000:8a2e:0370:7334\n" > "$V2V_MAP_FILE"
echo -e "DEVICE=eth0\nIPADDR=192.168.1.10" > "$NETWORK_SCRIPTS_DIR/ifcfg-eth0"
echo -e "[connection]\ninterface-name=eth3\naddress1=192.168.1.11/24" > "$NETWORK_CONNECTIONS_DIR/eth1 but with spaces.nmconnection"
printf "aa:bb:cc:dd:ee:ff:ip:192.168.1.10\naa:bb:cc:dd:ee:fe:ip:192.168.1.11\naa:bb:cc:dd:ee:fd:ip:2001:0db8:85a3:0000:0000:8a2e:0370:7334\n" > "$V2V_MAP_FILE"
printf "DEVICE=eth0\nIPADDR=192.168.1.10\n" > "$NETWORK_SCRIPTS_DIR/ifcfg-eth0"
printf "[connection]\ninterface-name=eth3\naddress1=192.168.1.11/24\n" > "$NETWORK_CONNECTIONS_DIR/eth1 but with spaces.nmconnection"

# Source the script under test
source ${SCRIPT_DIR}/network_config_util.sh
. ${SCRIPT_DIR}/network_config_util.sh

# Run the script
main

echo -e "\nTest output:"
printf "\nTest output:\n"
cat $UDEV_RULES_FILE

# Test 1: Verify the udev rules file was created
Expand Down
Loading