feat: updated Windows commands to use netsh for IP address management and added new option to re-enable DHCP on an interface

Hordunlarmy · Hordunlarmy · commit 0fc52fb53761 · 2026-02-14T03:04:48.000+01:00
diff --git a/changelogs/2026-02-14_03-04-36.md b/changelogs/2026-02-14_03-04-36.md
@@ -0,0 +1,14 @@
+# Changelog
+
+## [Unreleased]
+
+### Changed
+- Updated Windows commands for adding and deleting IP addresses to use `netsh` instead of `powershell`.
+- Modified Windows command for renewing IP address to use `ipconfig` directly instead of `powershell`.
+- Changed Windows command for network interface status to use `Get-NetAdapter` and `Get-NetIPAddress` with `Format-List` for better output formatting.
+- Replaced `Resolve-DnsName` with `nslookup` in Windows command for DNS test.
+- Updated Windows command for connectivity test to use `ping` with `-n` and `-w` options.
+
+### Added
+- Added a new option to re-enable DHCP on an interface in the `reset-network.yaml` file.
+- Included a new argument `netmask` in the `alias-ip.yaml` file to allow users to specify the subnet mask when adding an IP alias.
diff --git a/repository/network/alias-ip.yaml b/repository/network/alias-ip.yaml
@@ -29,7 +29,7 @@ versions:
           arch: ip addr add {{ip_address}}/{{prefix}} dev {{interface}} label {{interface}}:{{label}}
           alpine: ip addr add {{ip_address}}/{{prefix}} dev {{interface}} label {{interface}}:{{label}}
           darwin: ifconfig {{interface}} alias {{ip_address}}/{{prefix}}
-          windows: powershell -Command "New-NetIPAddress -InterfaceAlias '{{interface}}' -IPAddress '{{ip_address}}' -PrefixLength {{prefix}} -SkipAsSource ([bool]1)"
+          windows: 'netsh interface ip add address "{{interface}}" {{ip_address}} {{netmask}}'
         command: ip addr add {{ip_address}}/{{prefix}} dev {{interface}} label {{interface}}:{{label}}
         skip_on_error: false
         args:
@@ -40,6 +40,10 @@ versions:
             prompt: "Enter the subnet prefix length (e.g., 24 for /24)"
             default: "24"
             required: false
+          - name: netmask
+            prompt: "Enter the subnet mask (e.g., 255.255.255.0)"
+            default: "255.255.255.0"
+            required: false
           - name: interface
             prompt: "Enter the network interface name (e.g., eth0, ens33, Ethernet)"
             default: "eth0"
@@ -56,7 +60,7 @@ versions:
           rhel: 'cat > /etc/sysconfig/network-scripts/ifcfg-{{interface}}:{{label}} << EOF\nDEVICE={{interface}}:{{label}}\nIPADDR={{ip_address}}\nNETMASK={{netmask}}\nONBOOT=yes\nEOF\necho "Alias IP config created at /etc/sysconfig/network-scripts/ifcfg-{{interface}}:{{label}}"'
           fedora: 'nmcli connection modify {{interface}} +ipv4.addresses "{{ip_address}}/{{prefix}}" && nmcli connection up {{interface}}'
           arch: 'echo -e "\n[Address]\nAddress={{ip_address}}/{{prefix}}\nLabel={{interface}}:{{label}}" >> /etc/systemd/network/{{interface}}.network && systemctl restart systemd-networkd'
-          windows: powershell -Command "New-NetIPAddress -InterfaceAlias '{{interface}}' -IPAddress '{{ip_address}}' -PrefixLength {{prefix}} -SkipAsSource ([bool]1); Write-Host 'Windows IP aliases are persistent by default'"
+          windows: 'netsh interface ip add address "{{interface}}" {{ip_address}} {{netmask}}; Write-Host "Windows IP aliases added via netsh are persistent by default"'
         command: 'echo -e "\nauto {{interface}}:{{label}}\niface {{interface}}:{{label}} inet static\n    address {{ip_address}}\n    netmask {{netmask}}" >> /etc/network/interfaces && echo "Alias IP added to /etc/network/interfaces"'
         skip_on_error: true
         args:
@@ -125,7 +129,7 @@ versions:
           arch: ip addr del {{ip_address}}/{{prefix}} dev {{interface}}
           alpine: ip addr del {{ip_address}}/{{prefix}} dev {{interface}}
           darwin: ifconfig {{interface}} -alias {{ip_address}}
-          windows: powershell -Command "Remove-NetIPAddress -InterfaceAlias '{{interface}}' -IPAddress '{{ip_address}}' -Confirm:([bool]0)"
+          windows: 'netsh interface ip delete address "{{interface}}" {{ip_address}}'
         command: ip addr del {{ip_address}}/{{prefix}} dev {{interface}}
         skip_on_error: false
         args:
@@ -148,7 +152,7 @@ versions:
           rhel: 'rm -f /etc/sysconfig/network-scripts/ifcfg-{{interface}}:{{label}} && echo "Removed alias config file"'
           fedora: 'nmcli connection modify {{interface}} -ipv4.addresses "{{ip_address}}/{{prefix}}" && nmcli connection up {{interface}}'
           arch: 'sed -i "/{{ip_address}}/,+2d" /etc/systemd/network/{{interface}}.network && systemctl restart systemd-networkd'
-          windows: powershell -Command "Remove-NetIPAddress -InterfaceAlias '{{interface}}' -IPAddress '{{ip_address}}' -Confirm:([bool]0); Write-Host 'Windows IP alias removed (persistent)'"
+          windows: 'netsh interface ip delete address "{{interface}}" {{ip_address}}; Write-Host "Windows IP alias removed (persistent)"'
         command: 'sed -i "/{{interface}}:{{label}}/,+3d" /etc/network/interfaces && echo "Removed alias from /etc/network/interfaces"'
         skip_on_error: true
         args:
diff --git a/repository/network/reset-network.yaml b/repository/network/reset-network.yaml
@@ -19,6 +19,24 @@ versions:
           windows: 'powershell -Command "Clear-DnsClientCache; Write-Host ''DNS cache flushed''"'
         command: systemd-resolve --flush-caches 2>/dev/null || resolvectl flush-caches 2>/dev/null; echo "DNS cache flushed"
         skip_on_error: true
+      - description: Re-enable DHCP on interface
+        platforms:
+          ubuntu: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          debian: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          centos: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          rhel: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          fedora: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          arch: dhclient {{interface}} 2>/dev/null || systemctl restart systemd-networkd; echo "DHCP re-enabled on {{interface}}"
+          alpine: udhcpc -i {{interface}} && echo "DHCP re-enabled on {{interface}}"
+          darwin: ipconfig set {{interface}} DHCP && echo "DHCP re-enabled on {{interface}}"
+          windows: 'netsh interface ip set address "{{interface}}" dhcp; Write-Host "DHCP re-enabled on {{interface}}"'
+        command: dhclient {{interface}} && echo "DHCP re-enabled on {{interface}}"
+        skip_on_error: true
+        args:
+          - name: interface
+            prompt: "Enter the network interface name (e.g., eth0, ens33, Ethernet, en0)"
+            default: "eth0"
+            required: true
       - description: Release and renew IP address
         platforms:
           ubuntu: dhclient -r {{interface}} && sleep 2 && dhclient {{interface}} && echo "IP address renewed"
@@ -29,7 +47,7 @@ versions:
           arch: dhclient -r {{interface}} 2>/dev/null && sleep 2 && dhclient {{interface}} 2>/dev/null || (systemctl restart systemd-networkd && echo "Network service restarted")
           alpine: udhcpc -R -i {{interface}} && echo "IP address renewed"
           darwin: ipconfig set {{interface}} DHCP && echo "IP address renewed"
-          windows: 'powershell -Command "ipconfig /release ''{{interface}}''; Start-Sleep -Seconds 2; ipconfig /renew ''{{interface}}''; Write-Host ''IP address renewed on {{interface}}''"'
+          windows: 'ipconfig /release "{{interface}}"; Start-Sleep -Seconds 2; ipconfig /renew "{{interface}}"; Write-Host "IP address renewed on {{interface}}"'
         command: dhclient -r {{interface}} && sleep 2 && dhclient {{interface}} && echo "IP address renewed"
         skip_on_error: true
         args:
@@ -78,7 +96,7 @@ versions:
           arch: echo "=== Interface Status ===" && ip -br addr show {{interface}} && echo "" && echo "=== DNS Test ===" && nslookup google.com 2>/dev/null | head -4 && echo "" && echo "=== Connectivity ===" && ping -c 2 -W 3 8.8.8.8 && echo "Network OK"
           alpine: echo "=== Interface Status ===" && ip -br addr show {{interface}} && echo "" && echo "=== Connectivity ===" && ping -c 2 -W 3 8.8.8.8 && echo "Network OK"
           darwin: echo "=== Interface Status ===" && ifconfig {{interface}} | head -5 && echo "" && echo "=== DNS Test ===" && nslookup google.com 2>/dev/null | head -4 && echo "" && echo "=== Connectivity ===" && ping -c 2 -W 3 8.8.8.8 && echo "Network OK"
-          windows: 'powershell -Command "$a = Get-NetAdapter ''{{interface}}''; Write-Host (''=== Interface Status ===''); Write-Host (''  Name: '' + $a.Name + ''  Status: '' + $a.Status + ''  Speed: '' + $a.LinkSpeed); Write-Host ''''; $ip = Get-NetIPAddress -InterfaceAlias ''{{interface}}'' -AddressFamily IPv4 -ErrorAction SilentlyContinue; Write-Host (''=== IP Configuration ===''); if ($ip) { Write-Host (''  IP: '' + $ip.IPAddress + ''/'' + $ip.PrefixLength) } else { Write-Host ''  No IPv4 address assigned'' }; Write-Host ''''; Write-Host (''=== DNS Test ===''); $dns = Resolve-DnsName google.com -ErrorAction SilentlyContinue; if ($dns) { Write-Host (''  google.com -> '' + ($dns | Select-Object -First 1).IPAddress) } else { Write-Host ''  DNS resolution failed'' }; Write-Host ''''; Write-Host (''=== Connectivity ===''); if (Test-Connection 8.8.8.8 -Count 2 -ErrorAction SilentlyContinue) { Write-Host ''  Network OK'' } else { Write-Host ''  Network FAILED - try restarting your computer'' }"'
+          windows: 'powershell -Command "Write-Host ''=== Interface Status ===''; Get-NetAdapter ''{{interface}}'' | Format-List Name, Status, LinkSpeed; Write-Host ''=== IP Configuration ===''; Get-NetIPAddress -InterfaceAlias ''{{interface}}'' -AddressFamily IPv4 -ErrorAction SilentlyContinue | Format-List IPAddress, PrefixLength; Write-Host ''=== DNS Test ===''; nslookup google.com 2>&1 | Select-Object -First 4; Write-Host ''''; Write-Host ''=== Connectivity ===''; ping -n 2 -w 3000 8.8.8.8 | Select-Object -Last 3"'
         command: echo "=== Interface Status ===" && ip -br addr show {{interface}} && echo "" && echo "=== DNS Test ===" && nslookup google.com 2>/dev/null | head -4 && echo "" && echo "=== Connectivity ===" && ping -c 2 -W 3 8.8.8.8 && echo "Network OK"
         skip_on_error: true
         args:
