From cbb315a143fc0b718284dc09c4bc2ec13614c216 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 16 Jul 2024 09:41:30 +0200 Subject: [PATCH] Related: RHEL-46905 - fix licensing and remove testing folder Signed-off-by: Josef Ridky --- net-snmp.spec | 7 +- tests/integration-tests/Makefile | 36 ----- tests/integration-tests/PURPOSE | 3 - tests/integration-tests/net-snmp-tests.py | 175 ---------------------- tests/integration-tests/runtest.sh | 51 ------- tests/integration-tests/snmpd.conf | 7 - tests/tests.yml | 14 -- 7 files changed, 5 insertions(+), 288 deletions(-) delete mode 100644 tests/integration-tests/Makefile delete mode 100644 tests/integration-tests/PURPOSE delete mode 100755 tests/integration-tests/net-snmp-tests.py delete mode 100755 tests/integration-tests/runtest.sh delete mode 100644 tests/integration-tests/snmpd.conf delete mode 100644 tests/tests.yml diff --git a/net-snmp.spec b/net-snmp.spec index e2859b8..84d0e90 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -10,10 +10,10 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: 5.9.4 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 -License: Net-SNMP and OpenSSL +License: MIT-CMU and BSD-3-Clause and MIT and OpenSSL URL: http://net-snmp.sourceforge.net/ Source0: https://downloads.sourceforge.net/project/net-snmp/net-snmp/%{version}/net-snmp-%{version}.tar.gz Source1: net-snmp.redhat.conf @@ -515,6 +515,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test %{_libdir}/libnetsnmptrapd*.so.%{soname}* %changelog +* Tue Jul 16 2024 Josef Ridky - 1:5.9.4-12 +- update license tag and remove tests folder + * Wed Jul 10 2024 Josef Ridky - 1:5.9.4-11 - Fix licensing issue in source code (RHEL-46905) diff --git a/tests/integration-tests/Makefile b/tests/integration-tests/Makefile deleted file mode 100644 index 2f27fbf..0000000 --- a/tests/integration-tests/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/net-snmp -# Description: Test if net-snmp working ok -# Author: Susant Sahani -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -export TEST=/CoreOS/net-snmp -export TESTVERSION=1.0 -BUILT_FILES= -FILES=$(METADATA) runtest.sh Makefile PURPOSE -.PHONY: all install download clean -run: $(FILES) build - ./runtest.sh -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh -clean: - rm -f *~ $(BUILT_FILES) -include /usr/share/rhts/lib/rhts-make.include -$(METADATA): Makefile - @echo "Owner: Susant Sahani" > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test snmpd" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: net-snmp" >> $(METADATA) - @echo "Requires: net=snmp" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -Fedora 28" >> $(METADATA) - rhts-lint $(METADATA) diff --git a/tests/integration-tests/PURPOSE b/tests/integration-tests/PURPOSE deleted file mode 100644 index e82b745..0000000 --- a/tests/integration-tests/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/net-snmp -Description: tests for net-snmp -Author: Susant Sahani diff --git a/tests/integration-tests/net-snmp-tests.py b/tests/integration-tests/net-snmp-tests.py deleted file mode 100755 index 4cb19eb..0000000 --- a/tests/integration-tests/net-snmp-tests.py +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/env python3 -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~ -# Description: Tests for snmpd -# -# Author: Susant Sahani -# Copyright (c) 2018 Red Hat, Inc. -# ~~~ - -import errno -import os -import sys -import time -import unittest -import subprocess -import signal -import shutil -import psutil -import socket -import platform -import re -from pyroute2 import IPRoute -from psutil import virtual_memory -from collections import OrderedDict - -HOST='192.168.111.50' - -def setUpModule(): - """Initialize the environment, and perform sanity checks on it.""" - - if shutil.which('snmpd') is None: - raise OSError(errno.ENOENT, 'snmpd not found') - - if shutil.which('snmpwalk') is None: - raise OSError(errno.ENOENT, 'snmpwalk not found') - -def tearDownModule(): - pass - -class GenericUtilities(): - """Provide a set of utility functions start stop daemons. write config files etc """ - - def StartSnmpd(self): - """Start snmpd""" - subprocess.check_output(['systemctl', 'start', 'snmpd']) - - def StopSnmpd(self): - """Stop snmpd""" - subprocess.check_output(['systemctl', 'stop', 'snmpd']) - - def SetupVethInterface(self): - """Setup veth interface""" - - ip = IPRoute() - - ip.link('add', ifname='veth-test', peer='veth-peer', kind='veth') - idx_veth_test = ip.link_lookup(ifname='veth-test')[0] - idx_veth_peer = ip.link_lookup(ifname='veth-peer')[0] - - ip.link('set', index=idx_veth_test, address='12:11:12:13:14:18') - ip.link('set', index=idx_veth_peer, address='22:21:22:23:24:29') - ip.link('set', index=idx_veth_test, state='up') - ip.link('set', index=idx_veth_peer, state='up') - ip.addr('add', index=idx_veth_test, address='192.168.111.50') - ip.addr('add', index=idx_veth_peer, address='192.168.111.51') - - ip.close() - - def TearDownVethInterface(self): - ip = IPRoute() - - ip.link('del', index=ip.link_lookup(ifname='veth-test')[0]) - ip.close() - -class SnmpdTests(unittest.TestCase, GenericUtilities): - - def setUp(self): - self.SetupVethInterface() - time.sleep(1) - self.StartSnmpd() - - def tearDown(self): - self.StopSnmpd() - self.TearDownVethInterface() - - def test_UCD_SNMP_MIB_memory(self): - ''' UCD-SNMP-MIB::memory ''' - - subprocess.check_output(['snmpwalk', '-v2c', '-c' , 'public', HOST, 'UCD-SNMP-MIB::memory']) - - meminfo=OrderedDict() - with open('/proc/meminfo') as f: - for line in f: - meminfo[line.split(':')[0]] = line.split(':')[1].strip() - - output=subprocess.check_output(['snmpwalk', '-v2c', '-c' , 'public', HOST, 'UCD-SNMP-MIB::memTotalReal.0']).rstrip().decode('utf-8') - self.assertRegex(output, meminfo['MemTotal']) - - def test_SNMP_hrSWRunPath(self): - """ process id """ - output=subprocess.check_output(['snmpwalk', '-v2c', '-c' , 'public', HOST, 'HOST-RESOURCES-MIB::hrSWRunPath.1']).rstrip().decode('utf-8') - self.assertRegex(output, 'systemd') - - def test_SNMP_IF_MIB_network_interface(self): - """ verify network interface (1.3.6.1.2.1.2.2.1) SNMP variables """ - - ip = IPRoute() - - subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.2.2.1']) - - # 1.3.6.1.2.1.2.2.1.1 IF-MIB::ifIndex - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.2.2.1.1']).rstrip().decode('utf-8') - self.assertRegex(output, 'IF-MIB::ifIndex.1 = INTEGER: 1') - - # 1.3.6.1.2.1.2.2.1.1 IF-MIB::ifDescr - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.2.2.1.2']).rstrip().decode('utf-8') - for link in ip.get_links(): - self.assertRegex(output, link.get_attr('IFLA_IFNAME')) - - # IP-MIB::ipAdEntAddr 1.3.6.1.2.1.4.20.1.1 - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.4.20.1.1']).rstrip().decode('utf-8') - for addr in ip.get_addr(): - if addr.get_attr('IFA_ADDRESS'): - if addr.get_attr('IFA_ADDRESS') != '::1' and addr.get_attr('Ifamily') == 2: - self.assertRegex(output, addr.get_attr('IFA_ADDRESS')) - - # IF-MIB::ifPhysAddress. 1.3.6.1.2.1.2.2.1.6 - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.2.2.1.6']).rstrip().decode('utf-8') - for link in ip.get_links(): - if link.get_attr('IFLA_ADDRESS') and link.get_attr('IFLA_ADDRESS') != '00:00:00:00:00:00': - snmp_mac = re.sub(r'\b0+(\d)', r'\1', link.get_attr('IFLA_ADDRESS')).lstrip('0') - self.assertRegex(output, snmp_mac) - - ip.close() - - def test_SNMP_MIB_2_System(self): - """ verify RFC 1213 System (1.3.6.1.2.1.1) SNMP variables""" - - subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1']).rstrip().decode('utf-8') - - # 1.3.6.1.2.1.1.1 - sysDescr - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.1']).rstrip().decode('utf-8') - self.assertRegex(output, platform.machine()) - self.assertRegex(output, platform.node()) - self.assertRegex(output, platform.processor()) - self.assertRegex(output, platform.release()) - self.assertRegex(output, platform.version()) - - # 1.3.6.1.2.1.1.2 - sysObjectID - subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.2']) - - # 1.3.6.1.2.1.1.3 - sysUpTime - subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.3']) - - # 1.3.6.1.2.1.1.4 - sysContact - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.4']).rstrip().decode('utf-8') - self.assertRegex(output, 'fedora-ci ') - - # 1.3.6.1.2.1.1.5 - sysName - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.5']).rstrip().decode('utf-8') - self.assertRegex(output, socket.gethostname()) - - # 1.3.6.1.2.1.1.6 - sysLocation - output=subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST, '1.3.6.1.2.1.1.6']).rstrip().decode('utf-8') - self.assertRegex(output, 'Pune, IN') - - def test_basic_snmpwalk(self): - """ verify snmpwalk getting success snmpwalk -v2c -c public localhost """ - - subprocess.check_output(['snmpwalk', '-v2c', '-c', 'public', HOST]) - - -if __name__ == '__main__': - unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, - verbosity=3)) diff --git a/tests/integration-tests/runtest.sh b/tests/integration-tests/runtest.sh deleted file mode 100755 index c97eabd..0000000 --- a/tests/integration-tests/runtest.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~ -# runtest.sh of net-snmp -# Description: net-snmp tests -# -# Author: Susant Sahani -# Copyright (c) 2018 Red Hat, Inc. -# ~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE_NET_SNMP="net-snmp" -PACKAGE_NET_SNMP_UTILS="net-snmp-utils" - -NET_SNMP_CONF_FILE="/etc/snmp/snmpd.conf" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE_NET_SNMP - rlAssertRpm $PACKAGE_NET_SNMP_UTILS - - rlRun "systemctl stop firewalld" 0,5 - rlRun "setenforce 0" 0,1 - - rlRun "[ -e /sys/class/net/veth-test ] && ip link del veth-test" 0,1 - rlRun "cp net-snmp-tests.py /usr/bin/" - - rlFileBackup "$NET_SNMP_CONF_FILE" - rlRun "cp snmpd.conf $NET_SNMP_CONF_FILE" - - rlPhaseEnd - - rlPhaseStartTest - rlLog "Starting net-snmp tests ..." - rlRun "/usr/bin/python3 /usr/bin/net-snmp-tests.py" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "rm /usr/bin/net-snmp-tests.py $NET_SNMP_CONFIG_FILE" - rlRun "systemctl daemon-reload" - rlRun "[ -e /sys/class/net/veth-test ] && ip link del veth-test" 0,1 - rlFileRestore - rlRun "setenforce 1" 0,1 - rlLog "net-snmp tests done" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd - -rlGetTestState diff --git a/tests/integration-tests/snmpd.conf b/tests/integration-tests/snmpd.conf deleted file mode 100644 index 59e7c36..0000000 --- a/tests/integration-tests/snmpd.conf +++ /dev/null @@ -1,7 +0,0 @@ -agentAddress udp:192.168.111.50:161 - -syslocation Pune, IN -syscontact fedora-ci - -dontLogTCPWrappersConnects yes -rocommunity public diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index f600628..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,14 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - tests: - - integration-tests - required_packages: - - python3 - - systemd - - iproute - - python3-pyroute2 - - net-snmp - - net-snmp-utils