From 17663744c10c4e9f2a6a27b270801b6480fe1b31 Mon Sep 17 00:00:00 2001 From: yzamir Date: Fri, 30 Aug 2024 08:33:55 +0300 Subject: [PATCH] Dashify network utils script Signed-off-by: yzamir --- .../scripts/rhel/run/network_config_util.sh | 52 ++++++++++++------- .../scripts/rhel/run/network_config_util_test | 12 ++--- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/virt-v2v/cold/scripts/rhel/run/network_config_util.sh b/virt-v2v/cold/scripts/rhel/run/network_config_util.sh index 8b2c23310..4049cc725 100644 --- a/virt-v2v/cold/scripts/rhel/run/network_config_util.sh +++ b/virt-v2v/cold/scripts/rhel/run/network_config_util.sh @@ -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 @@ -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 @@ -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" @@ -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 diff --git a/virt-v2v/cold/scripts/rhel/run/network_config_util_test b/virt-v2v/cold/scripts/rhel/run/network_config_util_test index 1ff41c2e2..f21ab6fb3 100644 --- a/virt-v2v/cold/scripts/rhel/run/network_config_util_test +++ b/virt-v2v/cold/scripts/rhel/run/network_config_util_test @@ -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) @@ -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