gating: remove systemd networkd testing
As per RHBZ#1650342, systemd-networkd is not supported. Signed-off-by: Hangbin Liu <haliu@redhat.com>
This commit is contained in:
parent
094cf9615f
commit
41f4e7e705
@ -7,7 +7,7 @@
|
||||
|
||||
Name: lldpad
|
||||
Version: 1.1.0
|
||||
Release: 11.git%{checkout}%{?dist}
|
||||
Release: 12.git%{checkout}%{?dist}
|
||||
Summary: Intel LLDP Agent
|
||||
License: GPLv2
|
||||
URL: http://open-lldp.org/
|
||||
@ -83,6 +83,9 @@ rm -f %{buildroot}%{_libdir}/liblldp_clif.la
|
||||
%{_libdir}/liblldp_clif.so
|
||||
|
||||
%changelog
|
||||
* Tue Jul 30 2024 Hangbin Liu <haliu@redhat.com> - 1.1.0-12.git85e5583
|
||||
- Remove networkd tests from gating test
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-11.git85e5583
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
|
@ -1,8 +0,0 @@
|
||||
[Match]
|
||||
Name=lldpad
|
||||
|
||||
[Network]
|
||||
DHCP=no
|
||||
IPv6AcceptRA=false
|
||||
LLDP=yes
|
||||
EmitLLDP=yes
|
@ -78,32 +78,6 @@ class lldpadUtilities():
|
||||
for key in kwargs:
|
||||
self.assertRegex(contents, kwargs[key])
|
||||
|
||||
class lldpadTestsViaNetworkd(unittest.TestCase, lldpadUtilities):
|
||||
|
||||
def setUp(self):
|
||||
""" Setup """
|
||||
self.SetupVethInterface()
|
||||
self.Startlldpad()
|
||||
self.ConfigureLldpad()
|
||||
|
||||
def tearDown(self):
|
||||
self.TearDownVethInterface()
|
||||
|
||||
def test_systemd_networkd_lldp(self):
|
||||
""" Receive LLDP packets via networkd """
|
||||
|
||||
subprocess.check_output(['systemctl', 'restart', 'systemd-networkd'])
|
||||
time.sleep(30)
|
||||
|
||||
output=subprocess.check_output(['networkctl','lldp', 'lldpad']).rstrip().decode('utf-8')
|
||||
self.assertRegex(output, "lldpad")
|
||||
self.assertRegex(output, "02:01:02:03:04:09")
|
||||
|
||||
""" Verify LLDP Packets received by lldpad transmitted from networkd """
|
||||
output = subprocess.check_output(['lldptool', 'get-tlv', '-n', '-i', 'lldpad-peer']).rstrip().decode('utf-8')
|
||||
self.assertRegex(output, "Ifname: lldpad")
|
||||
self.assertRegex(output, "120")
|
||||
|
||||
class lldpadTests(unittest.TestCase, lldpadUtilities):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -16,7 +16,6 @@
|
||||
PACKAGE="lldpad"
|
||||
|
||||
SERVICE_UNITDIR="/run/systemd/system"
|
||||
NETWORK_UNITDIR="/run/systemd/network"
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
@ -24,9 +23,6 @@ rlJournalStart
|
||||
rlRun "systemctl stop firewalld" 0,5
|
||||
rlRun "setenforce 0" 0,1
|
||||
|
||||
rlRun "mkdir -p $NETWORK_UNITDIR"
|
||||
rlRun "cp lldp.network $NETWORK_UNITDIR/"
|
||||
|
||||
rlRun "cp tcpdumpd.service $SERVICE_UNITDIR"
|
||||
rlRun "systemctl daemon-reload"
|
||||
rlRun "cp lldpad-test.py /usr/bin/"
|
||||
@ -38,7 +34,7 @@ rlJournalStart
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "rm /usr/bin/lldpad-test.py $NETWORK_UNITDIR/lldp.network $SERVICE_UNITDIR/tcpdumpd.service"
|
||||
rlRun "rm /usr/bin/lldpad-test.py $SERVICE_UNITDIR/tcpdumpd.service"
|
||||
rlRun "systemctl daemon-reload"
|
||||
rlRun "setenforce 1" 0,1
|
||||
rlLog "lldpad tests done"
|
||||
|
Loading…
Reference in New Issue
Block a user