opendev
/
glean
Code Issues Proposed changes

_network_info: Clean up TYPE=Ethernet handling 

This handling for "TYPE=Ethernet" came in with the suse split in
I20bffabd333ea290d8712ec2a467f2b2d5678f3a.

I think this is a case of over-fitting the test data incorrectly.  If
"TYPE=Ethernet" is not specified, it is assumed (e.g. [1]).  For
whatever reason this was not put in some of the test fixtures, which
have been copied over-and-over.  When the referenced change moved to
more "generic" handling it was written to fit this pattern, but really
we can/should specify the type.

This is a cleanup to help make combining ipv6 information easier in
the future.  This should have no operational effect, since this was
the default anyway.

[1] 6a68008e44/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c (L6446)

Change-Id: I09a79359bdc13973f67f0503eee9fa9fd7586ead
This commit is contained in:
Ian Wienand 2022-05-26 10:59:53 +10:00
parent cecc4b6658
commit 7ef87bd12b
13 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glean/cmd.py
View File

@ -119,17 +119,15 @@ def _network_config(args):
footer = "\n".join(["ONBOOT=yes",
"NM_CONTROLLED=%s" %
("yes" if args.use_nm else "no"),
"TYPE=Ethernet"]) + "\n"
"TYPE=Ethernet"]) + '\n'
network_config = {
# RedHat does not use TYPE=Ethernet in the static configurations
"static": "\n".join([header,
"IPADDR={ip_address}",
"NETMASK={netmask}",
footer.replace("TYPE=Ethernet\n", "")])
footer])
}
# RedHat does not use TYPE=Ethernet in the dhcp configurations
network_config["dhcp"] = "\n".join([header, footer])
network_config["none"] = "\n".join([header, footer])

2
glean/tests/fixtures/test/liberty.centos.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/liberty.fedora.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/liberty.redhat.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/liberty.rocky.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/rax-iad.centos.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=146.20.110.113
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=146.20.110.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.210.32.174
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/route-eth1
ADDRESS0=10.176.0.0
NETMASK0=255.240.0.0

2
glean/tests/fixtures/test/rax-iad.fedora.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=146.20.110.113
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=146.20.110.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.210.32.174
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/route-eth1
ADDRESS0=10.176.0.0
NETMASK0=255.240.0.0

2
glean/tests/fixtures/test/rax-iad.redhat.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=146.20.110.113
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=146.20.110.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.210.32.174
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/route-eth1
ADDRESS0=10.176.0.0
NETMASK0=255.240.0.0

2
glean/tests/fixtures/test/rax-iad.rocky.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=146.20.110.113
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=146.20.110.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.210.32.174
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/route-eth1
ADDRESS0=10.176.0.0
NETMASK0=255.240.0.0

2
glean/tests/fixtures/test/rax.centos.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/rax.fedora.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/rax.redhat.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3

2
glean/tests/fixtures/test/rax.rocky.network.out vendored
View File

@ -10,6 +10,7 @@ IPADDR=23.253.229.154
NETMASK=255.255.255.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
DEFROUTE=yes
GATEWAY=23.253.229.1
### Write /etc/sysconfig/network-scripts/ifcfg-eth1
@ -21,6 +22,7 @@ IPADDR=10.208.169.118
NETMASK=255.255.224.0
ONBOOT=yes
%NM_CONTROLLED%
TYPE=Ethernet
### Write /etc/sysconfig/network-scripts/ifcfg-eth3
# Automatically generated, do not edit
DEVICE=eth3