feat: improved the dynamic MIB loading

.github/workflows/agreements.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Alpha Release
-        uses: cla-assistant/github-action@v2.3.1-beta
+        uses: cla-assistant/github-action@v2.1.3-beta
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
@@ -37,7 +37,7 @@ jobs:
       - name: "COC Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby accept the Terms') || github.event_name == 'pull_request_target'
         # Alpha Release
-        uses: cla-assistant/github-action@v2.3.1-beta
+        uses: cla-assistant/github-action@v2.1.3-beta
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

.github/workflows/build-test-release.yml

@@ -131,10 +131,10 @@ jobs:
         uses: snyk/actions/python-3.8@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: snyk.sarif
+      # - name: Upload result to GitHub Code Scanning
+      #   uses: github/codeql-action/upload-sarif@v1
+      #   with:
+      #     sarif_file: snyk.sarif
   build:
     name: Build Release
     needs:
@@ -210,10 +210,10 @@ jobs:
         with:
           image: ${{ fromJSON(steps.docker_meta.outputs.json).tags[0] }}
           args: --file=Dockerfile
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: snyk.sarif
+      # - name: Upload result to GitHub Code Scanning
+      #   uses: github/codeql-action/upload-sarif@v1
+      #   with:
+      #     sarif_file: snyk.sarif
 
       - uses: actions/download-artifact@v2
         with:

lookups/mibs_list.csv

@@ -18,5 +18,3 @@ HPR-IP-MIB
 PYSNMP-MIB
 PYSNMP-SOURCE-MIB
 PYSNMP-USM-MIB
-VMSTORE-MIB
-VERITAS-APPLIANCE-MONITORING-MIB

pyproject.toml

@@ -28,6 +28,7 @@ requests = "^2.25.1"
 PyYAML = "^5.4.1"
 Flask = "^1.1.2"
 Flask-AutoIndex = "^0.6.6"
+types-PyYAML = "^5.4.3"
 
 [tool.poetry.dev-dependencies]
 mongomock = "^3.22.1"
@@ -41,3 +42,7 @@ sc4snmp-mib-server = "splunk_connect_for_snmp_mib_server.snmp_mib_server:main"
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.pytest.ini_options]
+log_cli = true
+log_cli_level = "INFO"
+

splunk_connect_for_snmp_mib_server/mongo.py

@@ -13,14 +13,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #   ########################################################################
-import pymongo
-import os
 import logging
+import os
+
+import pymongo
 
 logger = logging.getLogger(__name__)
 
 
-class MibsRepository:
+class MongoRepository:
     def __init__(self, mongo_config):
         self._client = pymongo.MongoClient(
             os.environ["MONGO_SERVICE_SERVICE_HOST"],
@@ -32,6 +33,11 @@ def __init__(self, mongo_config):
                 os.environ["MONGO_PASS"],
                 mechanism="SCRAM-SHA-1",
             )
+
+
+class MibsRepository(MongoRepository):
+    def __init__(self, mongo_config):
+        super().__init__(mongo_config)
         self._mibs = self._client[mongo_config["database"]][mongo_config["collection"]]
 
     def upload_files(self, mib_files_dir):
@@ -48,31 +54,25 @@ def upload_files(self, mib_files_dir):
                     )
 
     def search_oid(self, oid):
-        data = self._mibs.find_one({"content": {"$regex": oid}})
+        data = self._mibs.find({"content": {"$regex": oid}})
         if data:
-            return data["filename"]
+            mib_list = []
+            for item in data:
+                mib_list.append(item["filename"])
+            return mib_list
         else:
             return None
 
     def delete_mib(self, filename):
         self._mibs.delete_many({"filename": {"$regex": filename}})
 
     def clear(self):
-        self._mibs.remove()
+        self._mibs.delete_many({})
 
 
-class OidsRepository:
+class OidsRepository(MongoRepository):
     def __init__(self, mongo_config):
-        self._client = pymongo.MongoClient(
-            os.environ["MONGO_SERVICE_SERVICE_HOST"],
-            int(os.environ["MONGO_SERVICE_SERVICE_PORT"]),
-        )
-        if os.environ.get("MONGO_USER"):
-            self._client.admin.authenticate(
-                os.environ["MONGO_USER"],
-                os.environ["MONGO_PASS"],
-                mechanism="SCRAM-SHA-1",
-            )
+        super().__init__(mongo_config)
         self._oids = self._client[mongo_config["database"]][mongo_config["collection"]]
 
     def contains_oid(self, oid):

splunk_connect_for_snmp_mib_server/snmp_mib_server.py

@@ -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__)
 
@@ -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",
@@ -60,7 +61,7 @@ def main():
     logger.info("Completed Argument parsing")
 
     with open(config_file, "r") as yamlfile:
-        server_config = yaml.load(yamlfile, Loader=yaml.FullLoader)
+        server_config = yaml.safe_load(yamlfile)
 
     upload_mibs(server_config)
     mib_server = MibServer(args, server_config)