From 522f49e2e228fa762457f0f17e694fb140d1ff01 Mon Sep 17 00:00:00 2001
From: Thijs <snijder@astron.nl>
Date: Wed, 16 Feb 2022 10:30:17 +0100
Subject: [PATCH] removed old testing file and moved files around
---
tangostationcontrol/__init__.py | 0
.../{examples/snmp => clients}/snmp_client.py | 0
.../examples/snmp/{snmp.py => snmp_device.py} | 0
.../test/clients/test_snmp_client.py | 81 +------------------
4 files changed, 4 insertions(+), 77 deletions(-)
create mode 100644 tangostationcontrol/__init__.py
rename tangostationcontrol/tangostationcontrol/{examples/snmp => clients}/snmp_client.py (100%)
rename tangostationcontrol/tangostationcontrol/examples/snmp/{snmp.py => snmp_device.py} (100%)
diff --git a/tangostationcontrol/__init__.py b/tangostationcontrol/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tangostationcontrol/tangostationcontrol/examples/snmp/snmp_client.py b/tangostationcontrol/tangostationcontrol/clients/snmp_client.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/examples/snmp/snmp_client.py
rename to tangostationcontrol/tangostationcontrol/clients/snmp_client.py
diff --git a/tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py b/tangostationcontrol/tangostationcontrol/examples/snmp/snmp_device.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py
rename to tangostationcontrol/tangostationcontrol/examples/snmp/snmp_device.py
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_snmp_client.py b/tangostationcontrol/tangostationcontrol/test/clients/test_snmp_client.py
index c02a47f07..8736d3e84 100644
--- a/tangostationcontrol/tangostationcontrol/test/clients/test_snmp_client.py
+++ b/tangostationcontrol/tangostationcontrol/test/clients/test_snmp_client.py
@@ -1,82 +1,9 @@
-from pysnmp.hlapi import *
import pysnmp.hlapi as pysnmp
-from pysnmp.smi.rfc1902 import ObjectIdentity
+import numpy
-# https://pysnmp.readthedocs.io/en/latest/docs/pysnmp-hlapi-tutorial.html
+from unittest import mock
-def testing():
- # g = getCmd(
- # SnmpEngine(), #Create engine
- # CommunityData('public'), #create access
- # UdpTransportTarget(('demo.snmplabs.com', 161)), #specifies MIB ... I think
- #
- # x=ObjectIdentity('SNMPv2-MIB', 'system'))
-
- engine = SnmpEngine()
- community = CommunityData('public')
- trasport = UdpTransportTarget(('localhost', 161))
- ctx_data = ContextData()
-
- # string
- sysDescr_obj = ObjectType(ObjectIdentity('SNMPv2-MIB','sysDescr', 0))
- sysName_obj = ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysName', 0))
-
- # timeticks
- sysUpTime_obj = ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysUpTime', 0))
- #hrSystemUptime_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'hrSystemUptime', 0))
-
-
- # OID
- sysObjectID_obj = ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysObjectID', 0))
-
- # integer
- sysServices_obj = ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysServices', 0))
- tcpRtoAlgorithm_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'tcpRtoAlgorithm', 0))
- snmpEnableAuthenTraps = ObjectType(ObjectIdentity('SNMPv2-MIB', 'snmpEnableAuthenTraps', 0))
- #hrMemorySize_obj = ObjectType(ObjectIdentity('HOST-RESOURCES-MIB', ' hrMemorySize', 0).addAsn1MibSource("files//D:/pycharm/temp/mibs/@mib@"))
-
-
- # Gauge
- tcpCurrEstab_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'tcpCurrEstab', 0))
-
- # counter32
- tcpActiveOpens_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'tcpActiveOpens', 0))
- snmpInPkts_obj = ObjectType(ObjectIdentity('SNMPv2-MIB', 'snmpInPkts', 0))
-
- #ip-address
- ipAdEntAddr_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'ipAdEntAddr', (127,0,0,1)))
- ipAdEntIfIndex_obj = ObjectType(ObjectIdentity('RFC1213-MIB', 'ipAdEntIfIndex', (10, 87, 6, 14)))
-
- #hrMemorySize_obj = ObjectType(ObjectIdentity('1.3.6.1.2.1.2.2.1.1.10'))
-
- all_objs = ( sysDescr_obj, sysName_obj, sysUpTime_obj, sysObjectID_obj, sysServices_obj, tcpRtoAlgorithm_obj,
- tcpActiveOpens_obj, tcpCurrEstab_obj, snmpInPkts_obj, snmpEnableAuthenTraps, ipAdEntAddr_obj,
- ipAdEntIfIndex_obj)
-
- # objectIdentity = ObjectIdentity('1.3.6.1.2.1.1.1.0')
- # objectIdentity.getMibSymbol()
-
-
-
-
- # get_sysDescr = getCmd(engine, community, trasport, ctx_data, sysDescr_obj)
- # get_sysUpTime = getCmd(engine, community, trasport, ctx_data, sysUpTime_obj)
-
-
- get_test = getCmd(engine, community, trasport, ctx_data, *all_objs)
-
- # errorIndication, errorStatus, errorIndex, varBinds = next(get_sysDescr)
- #
- # for varBind in varBinds:
- # print(' = '.join([x.prettyPrint() for x in varBind]))
- # for x in varBind:
- # print(type(x))
-
- errorIndication, errorStatus, errorIndex, varBinds = next(get_test)
-
-
- for varBind in varBinds:
- #print(' = '.join([x.prettyPrint() for x in varBind]))
- print(f"name: {varBind[0].prettyPrint()}, \tvalue: {varBind[1]}, \ttype: {type(varBind[1])}")
+from tangostationcontrol.clients.opcua_client import OPCUAConnection
+from tangostationcontrol.test import base
\ No newline at end of file
--
GitLab