Skip to content

Commit

Permalink
update tests & docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@holmanb
holmanb committed Mar 22, 2024
1 parent 9ad46e2 commit 673bd97
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 66 deletions.
2 changes: 0 additions & 2 deletions doc/rtd/reference/network-config.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,13 @@ Example output:
BOOTPROTO=static
DEVICE=eth7
IPADDR=192.168.1.5/255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
# Created by cloud-init automatically, do not edit.
#
BOOTPROTO=dhcp
DEVICE=eth9
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down
1 change: 0 additions & 1 deletion tests/unittests/cmd/devel/test_net_convert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
#
BOOTPROTO=dhcp
DEVICE=eth0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down
8 changes: 0 additions & 8 deletions tests/unittests/distros/test_netconfig.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,6 @@ def test_apply_network_config_rh(self):
GATEWAY=192.168.1.254
IPADDR=192.168.1.5
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -733,7 +732,6 @@ def test_apply_network_config_rh(self):
"""\
BOOTPROTO=dhcp
DEVICE=eth1
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -764,7 +762,6 @@ def test_apply_network_config_ipv6_rh(self):
IPV6_AUTOCONF=no
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
IPV6_FORCE_ACCEPT_RA=no
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -774,7 +771,6 @@ def test_apply_network_config_ipv6_rh(self):
"""\
BOOTPROTO=dhcp
DEVICE=eth1
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -821,7 +817,6 @@ def test_vlan_render_unsupported(self):
HWADDR=00:16:3e:60:7c:df
IPADDR=192.10.1.2
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -833,7 +828,6 @@ def test_vlan_render_unsupported(self):
DEVICE=infra0
IPADDR=10.0.1.2
NETMASK=255.255.0.0
NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
USERCTL=no
Expand Down Expand Up @@ -869,7 +863,6 @@ def test_vlan_render(self):
DEVICE=eth0
IPADDR=192.10.1.2
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -881,7 +874,6 @@ def test_vlan_render(self):
DEVICE=eth0.1001
IPADDR=10.0.1.2
NETMASK=255.255.0.0
NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
USERCTL=no
Expand Down
39 changes: 0 additions & 39 deletions tests/unittests/net/network_configs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
BOOTPROTO=none
DEVICE=eth1
HWADDR=cf:d6:af:48:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -177,7 +176,6 @@
IPADDR=192.168.21.3
NETMASK=255.255.255.0
METRIC=10000
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand Down Expand Up @@ -332,7 +330,6 @@
BOOTPROTO=none
DEVICE=eth1
HWADDR=cf:d6:af:48:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -351,7 +348,6 @@
IPADDR=192.168.21.3
NETMASK=255.255.255.0
METRIC=10000
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand Down Expand Up @@ -594,7 +590,6 @@
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -738,7 +733,6 @@
DHCPV6C=yes
IPV6INIT=yes
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -829,7 +823,6 @@
IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -905,7 +898,6 @@
IPV6INIT=yes
IPV6_FORCE_ACCEPT_RA=no
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -969,7 +961,6 @@
IPV6_AUTOCONF=yes
IPV6INIT=yes
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1027,7 +1018,6 @@
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1084,7 +1074,6 @@
IPV6_AUTOCONF=yes
IPV6INIT=yes
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1170,7 +1159,6 @@
IPV6_FAILURE_FATAL=yes
IPV6_FORCE_ACCEPT_RA=yes
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1211,7 +1199,6 @@
"""\
BOOTPROTO=dhcp
DEVICE=iface0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1288,7 +1275,6 @@
BOOTPROTO=dhcp
DEVICE=iface0
ETHTOOL_OPTS="wol g"
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -1632,7 +1618,6 @@
DHCPV6C=yes
IPV6INIT=yes
MACADDR=aa:bb:cc:dd:ee:ff
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Bond
USERCTL=no"""
Expand All @@ -1642,7 +1627,6 @@
BOOTPROTO=dhcp
DEVICE=bond0.200
DHCLIENT_SET_DEFAULT_ROUTE=no
NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=bond0
USERCTL=no
Expand All @@ -1662,7 +1646,6 @@
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
MACADDR=bb:bb:bb:bb:bb:aa
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
PRIO=22
STP=no
Expand All @@ -1674,7 +1657,6 @@
BOOTPROTO=none
DEVICE=eth0
HWADDR=c0:d6:9f:2c:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -1693,7 +1675,6 @@
MTU=1500
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=eth0
USERCTL=no
Expand All @@ -1705,7 +1686,6 @@
DEVICE=eth1
HWADDR=aa:d6:9f:2c:e8:80
MASTER=bond0
NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
TYPE=Ethernet
Expand All @@ -1717,7 +1697,6 @@
DEVICE=eth2
HWADDR=c0:bb:9f:2c:e8:80
MASTER=bond0
NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
TYPE=Ethernet
Expand All @@ -1729,7 +1708,6 @@
BRIDGE=br0
DEVICE=eth3
HWADDR=66:bb:9f:2c:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -1740,7 +1718,6 @@
BRIDGE=br0
DEVICE=eth4
HWADDR=98:bb:9f:2c:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -1751,7 +1728,6 @@
DEVICE=eth5
DHCLIENT_SET_DEFAULT_ROUTE=no
HWADDR=98:bb:9f:2c:e8:8a
NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -1764,7 +1740,6 @@
IPADDR=192.168.200.7
MTU=9000
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=InfiniBand
USERCTL=no"""
Expand Down Expand Up @@ -2496,7 +2471,6 @@
MTU=9000
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Bond
USERCTL=no
Expand All @@ -2508,7 +2482,6 @@
DEVICE=bond0s0
HWADDR=aa:bb:cc:dd:e8:00
MASTER=bond0
NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
TYPE=Ethernet
Expand Down Expand Up @@ -2536,7 +2509,6 @@
DEVICE=bond0s1
HWADDR=aa:bb:cc:dd:e8:01
MASTER=bond0
NM_CONTROLLED=no
ONBOOT=yes
SLAVE=yes
TYPE=Ethernet
Expand Down Expand Up @@ -2685,7 +2657,6 @@
BOOTPROTO=none
DEVICE=en0
HWADDR=aa:bb:cc:dd:e8:00
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand All @@ -2706,7 +2677,6 @@
MTU=2222
NETMASK=255.255.255.0
NETMASK1=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
PHYSDEV=en0
USERCTL=no
Expand Down Expand Up @@ -2834,7 +2804,6 @@
DEVICE=br0
IPADDR=192.168.2.2
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=yes
PRIO=22
STP=no
Expand All @@ -2852,7 +2821,6 @@
IPV6INIT=yes
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -2868,7 +2836,6 @@
IPV6INIT=yes
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -3053,7 +3020,6 @@
HWADDR=52:54:00:12:34:00
IPADDR=192.168.1.2
NETMASK=255.255.255.0
NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
USERCTL=no
Expand All @@ -3065,7 +3031,6 @@
DEVICE=eth1
HWADDR=52:54:00:12:34:aa
MTU=1480
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand All @@ -3076,7 +3041,6 @@
BOOTPROTO=none
DEVICE=eth2
HWADDR=52:54:00:12:34:ff
NM_CONTROLLED=no
ONBOOT=no
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -3253,7 +3217,6 @@
HWADDR=11:22:33:44:55:66
IPADDR=192.168.1.20
NETMASK=255.255.0.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down Expand Up @@ -3325,7 +3288,6 @@
BOOTPROTO=none
DEVICE=eth0
HWADDR=cf:d6:af:48:e8:80
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no"""
Expand Down Expand Up @@ -3485,7 +3447,6 @@
IPV6_AUTOCONF=no
IPV6_FORCE_ACCEPT_RA=no
NETMASK=255.255.0.0
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no
Expand Down
Loading

0 comments on commit 673bd97

Please sign in to comment.