Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
fix: reformatted to pass the lint checks
Browse files Browse the repository at this point in the history
  • Loading branch information
lingy1028 committed Jul 21, 2021
1 parent 8dab52a commit 7e16d0a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
1 change: 1 addition & 0 deletions splunk_connect_for_snmp_mib_server/mongo.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

logger = logging.getLogger(__name__)


class MongoRepository:
def __init__(self, mongo_config):
self._client = pymongo.MongoClient(
Expand Down
7 changes: 4 additions & 3 deletions splunk_connect_for_snmp_mib_server/snmp_mib_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# limitations under the License.
# ########################################################################
import argparse
import logging

import yaml
from splunk_connect_for_snmp_mib_server.mongo import MibsRepository
from splunk_connect_for_snmp_mib_server.mib_server import MibServer
import logging
from splunk_connect_for_snmp_mib_server.mongo import MibsRepository

logger = logging.getLogger(__name__)

Expand All @@ -35,7 +36,7 @@ def upload_mibs(server_config):


def main():
logger.info(f"Startup Config")
logger.info("Startup Config")
parser = argparse.ArgumentParser()
parser.add_argument(
"-l",
Expand Down
22 changes: 11 additions & 11 deletions splunk_connect_for_snmp_mib_server/translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ########################################################################
from pysnmp.smi import builder, view, compiler, rfc1902
import os
import json
import csv
import json
import logging

from splunk_connect_for_snmp_mib_server.mongo import OidsRepository, MibsRepository
import os

from pysmi import debug as pysmi_debug
from pysnmp.smi import builder, compiler, rfc1902, view
from splunk_connect_for_snmp_mib_server.mongo import (
MibsRepository,
OidsRepository,
)

pysmi_debug.setLogger(pysmi_debug.Debug("compiler"))

Expand Down Expand Up @@ -172,8 +174,7 @@ def find_mib_file(self, oid, remove_index=False):
logger.debug(f"mib_name: {mib_name}")
# load the mib module
self.load_extra_mib(mib_name, oid)



# Load additional mib module
def load_extra_mib(self, mib_module, oid):
try:
Expand Down Expand Up @@ -223,7 +224,7 @@ def mib_translator(self, var_bind):
except Exception as e:
logger.error(f"Error happened in translation: {e}")
if "not OBJECT-TYPE" in str(e):
logger.info("[-] Trying to lazy load MIBs")
logger.info("[-] Trying to lazy load MIBs")
self.find_mib_file(name)
try:
translated_var_bind = rfc1902.ObjectType(
Expand Down Expand Up @@ -286,7 +287,7 @@ def format_trap_event(self, var_binds):
custom_translated_value = self.custom_translator(value)

offset += 1
original_oid = '{oid}="{value}"'.format(offset=offset, oid=oid, value=value)
original_oid = '{oid}="{value}"'.format(oid=oid, value=value)
oid_type_string = 'oid-type{offset}="{oid_type}"'.format(
offset=offset, oid_type=name_type
)
Expand All @@ -302,7 +303,6 @@ def format_trap_event(self, var_binds):
if custom_translated_oid:
custom_translated_mib_string = (
'{custom_translated_oid}="{custom_translated_value}"'.format(
offset=offset,
custom_translated_oid=custom_translated_oid,
custom_translated_value=custom_translated_value,
)
Expand Down Expand Up @@ -330,7 +330,7 @@ def format_trap_event(self, var_binds):
trap_event_string += "\n"

trap_event_string = trap_event_string.rstrip("\n") # remove trailing newline
logger.debug(f"--- Trap Event String ---")
logger.debug("--- Trap Event String ---")
logger.debug(trap_event_string)
return trap_event_string

Expand Down
21 changes: 13 additions & 8 deletions tests/test_translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ########################################################################
import json
import logging
import os
from unittest import TestCase, mock

import mongomock
import yaml

from splunk_connect_for_snmp_mib_server.translator import Translator
from pysnmp.hlapi import (
CommunityData,
ContextData,
SnmpEngine,
UdpTransportTarget,
getCmd,
)
from pysnmp.smi.rfc1902 import ObjectIdentity, ObjectType
from splunk_connect_for_snmp_mib_server.snmp_mib_server import upload_mibs
import os
import logging
import json
from pysnmp.hlapi import *
from splunk_connect_for_snmp_mib_server.translator import Translator

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -146,7 +151,7 @@ def test_format_trap_non_existing_oid(self):
value_type = input_var_binds_list[i]["val_type"]
oid = input_var_binds_list[i]["oid"]
value = input_var_binds_list[i]["val"]
current = f'oid-type{i + 1}="{oid_type}" value{i + 1}-type="{value_type}" {oid}="{value}" value{i + 1}="{value}"'
current = f'oid-type{i+1}="{oid_type}" value{i+1}-type="{value_type}" {oid}="{value}" value{i+1}="{value}"'
# these two additional spaces are not an error
untranslated += f"{current} "
if i < len(input_var_binds_list) - 1:
Expand Down

0 comments on commit 7e16d0a

Please sign in to comment.