From 31077660bf85f5b2bb43278318d20d4d4a93f9af Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Fri, 23 Sep 2022 11:54:23 +0200
Subject: [PATCH] L2SS-874 procesing reviews
---
.../SNMPv2-CONF.mib | 0
.../SNMPv2-SMI.mib | 0
.../SNMPv2-TC.mib | 0
.../TEST-MIB.mib | 0
.../test/clients/test_mib_loading.py | 16 +++++++++-------
5 files changed, 9 insertions(+), 7 deletions(-)
rename tangostationcontrol/tangostationcontrol/test/clients/{SNMP_mib_loading => snmp_mib_loading}/SNMPv2-CONF.mib (100%)
rename tangostationcontrol/tangostationcontrol/test/clients/{SNMP_mib_loading => snmp_mib_loading}/SNMPv2-SMI.mib (100%)
rename tangostationcontrol/tangostationcontrol/test/clients/{SNMP_mib_loading => snmp_mib_loading}/SNMPv2-TC.mib (100%)
rename tangostationcontrol/tangostationcontrol/test/clients/{SNMP_mib_loading => snmp_mib_loading}/TEST-MIB.mib (100%)
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-CONF.mib b/tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-CONF.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-CONF.mib
rename to tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-CONF.mib
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-SMI.mib b/tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-SMI.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-SMI.mib
rename to tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-SMI.mib
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-TC.mib b/tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-TC.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/SNMPv2-TC.mib
rename to tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/SNMPv2-TC.mib
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/TEST-MIB.mib b/tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/TEST-MIB.mib
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/test/clients/SNMP_mib_loading/TEST-MIB.mib
rename to tangostationcontrol/tangostationcontrol/test/clients/snmp_mib_loading/TEST-MIB.mib
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_mib_loading.py b/tangostationcontrol/tangostationcontrol/test/clients/test_mib_loading.py
index 5877315f6..0ea33e2a5 100644
--- a/tangostationcontrol/tangostationcontrol/test/clients/test_mib_loading.py
+++ b/tangostationcontrol/tangostationcontrol/test/clients/test_mib_loading.py
@@ -1,10 +1,12 @@
-from tangostationcontrol.test import base
-
-from tangostationcontrol.clients.snmp_client import mib_loader
from pysnmp.smi import view
import pysnmp.hlapi as pysnmp
from pysnmp.smi.rfc1902 import ObjectIdentity
+from tangostationcontrol.test import base
+
+from tangostationcontrol.clients.snmp_client import mib_loader
+
+
from os import path
@@ -14,17 +16,17 @@ class TestMibLoading(base.TestCase):
MIB = "TEST-MIB"
# mib file is in a folder that is in the same folder as this test
- REL_DIR = "SNMP_mib_loading/"
+ REL_DIR = "snmp_mib_loading"
- def test_content(self):
+ def test_retrieve_mib_content(self):
"""
- This file contains a 1 variable named: testNamedValue with oid "9.8.7.6.5.4.3.2.1" with named values: ("A", 1), ("B", 2), ("C", 3), ("D", 4)
+ This file contains a 1 variable named: testNamedValue with oid "1.3.99.1.99" with named values: ("test_name", 1), ("other_name", 2)
In order to confirm that the mib is indeed loaded correctly this test has to get the oids, the values and the named values
"""
- abs_dir = path.dirname(__file__) + "/" + self.REL_DIR
+ abs_dir = path.dirname(__file__) + "/" + self.REL_DIR + "/"
loader = mib_loader(abs_dir)
loader.load_pymib(self.MIB)
--
GitLab