From 881c0faaabee42656c34a9c20d410485b59cd6b9 Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Sun, 13 Mar 2022 16:48:52 +0000
Subject: [PATCH] Only pass 'schema' to the validator creation.

---
 validator/__init__.py     | 18 +++++++++---------
 validator/bondethernet.py |  2 +-
 validator/bridgedomain.py |  2 +-
 validator/interface.py    |  2 +-
 validator/loopback.py     |  2 +-
 vppcfg                    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/validator/__init__.py b/validator/__init__.py
index 139237f..5ef8e08 100644
--- a/validator/__init__.py
+++ b/validator/__init__.py
@@ -50,21 +50,21 @@ class NullHandler(logging.Handler):
 
 
 class Validator(object):
-    def __init__(self, args):
+    def __init__(self, schema):
         self.logger = logging.getLogger('vppcfg.validator')
         self.logger.addHandler(NullHandler())
 
-        self.args = args
+        self.schema = schema
 
     def validate(self, yaml):
         ret_rv = True
         ret_msgs = []
-        if self.args.schema:
+        if self.schema:
             try:
-                self.logger.info("Validating against schema %s" % self.args.schema)
+                self.logger.info("Validating against schema %s" % self.schema)
                 validators = DefaultValidators.copy()
                 validators[IPInterfaceWithPrefixLength.tag] = IPInterfaceWithPrefixLength
-                schema = yamale.make_schema(self.args.schema, validators=validators)
+                schema = yamale.make_schema(self.schema, validators=validators)
                 data = yamale.make_data(content=str(yaml))
                 yamale.validate(schema, data)
                 self.logger.debug("Schema correctly validated by yamale")
@@ -79,25 +79,25 @@ class Validator(object):
 
         self.logger.debug("Validating Semantics...")
 
-        rv, msgs = validate_bondethernets(self.args, yaml)
+        rv, msgs = validate_bondethernets(yaml)
         if msgs:
             ret_msgs.extend(msgs)
         if not rv:
             ret_rv = False
 
-        rv, msgs = validate_interfaces(self.args, yaml)
+        rv, msgs = validate_interfaces(yaml)
         if msgs:
             ret_msgs.extend(msgs)
         if not rv:
             ret_rv = False
 
-        rv, msgs = validate_loopbacks(self.args, yaml)
+        rv, msgs = validate_loopbacks(yaml)
         if msgs:
             ret_msgs.extend(msgs)
         if not rv:
             ret_rv = False
 
-        rv, msgs = validate_bridgedomains(self.args, yaml)
+        rv, msgs = validate_bridgedomains(yaml)
         if msgs:
             ret_msgs.extend(msgs)
         if not rv:
diff --git a/validator/bondethernet.py b/validator/bondethernet.py
index b3765e0..7370ade 100644
--- a/validator/bondethernet.py
+++ b/validator/bondethernet.py
@@ -16,7 +16,7 @@ def get_by_name(yaml, ifname):
     return None
 
 
-def validate_bondethernets(args, yaml):
+def validate_bondethernets(yaml):
     result = True
     msgs = []
     logger = logging.getLogger('vppcfg.validator')
diff --git a/validator/bridgedomain.py b/validator/bridgedomain.py
index 8ba891d..5ce6105 100644
--- a/validator/bridgedomain.py
+++ b/validator/bridgedomain.py
@@ -16,7 +16,7 @@ def get_by_name(yaml, ifname):
     return None
 
 
-def validate_bridgedomains(args, yaml):
+def validate_bridgedomains(yaml):
     result = True
     msgs = []
     logger = logging.getLogger('vppcfg.validator')
diff --git a/validator/interface.py b/validator/interface.py
index f5c2c76..faba4e2 100644
--- a/validator/interface.py
+++ b/validator/interface.py
@@ -259,7 +259,7 @@ def get_mtu(yaml, ifname):
     return 1500
 
 
-def validate_interfaces(args, yaml):
+def validate_interfaces(yaml):
     result = True
     msgs = []
     logger = logging.getLogger('vppcfg.validator')
diff --git a/validator/loopback.py b/validator/loopback.py
index 00b47a2..381e46b 100644
--- a/validator/loopback.py
+++ b/validator/loopback.py
@@ -14,7 +14,7 @@ def get_by_name(yaml, ifname):
     return None
 
 
-def validate_loopbacks(args, yaml):
+def validate_loopbacks(yaml):
     result = True
     msgs = []
     logger = logging.getLogger('vppcfg.validator')
diff --git a/vppcfg b/vppcfg
index b7b56e8..68721f6 100755
--- a/vppcfg
+++ b/vppcfg
@@ -34,7 +34,7 @@ def main():
         logging.error("Couldn't read config from %s" % args.config)
         sys.exit(-1)
 
-    v = Validator(args)
+    v = Validator(schema=args.schema)
     rv, msgs = v.validate(cfg)
     if not rv:
         for m in msgs: