Refactor setting optional arguments for iosxr netconf platform (#1658)

napalm-automation · Jun 2, 2022 · 9d1da4d · 9d1da4d
1 parent 3543f32
commit 9d1da4d
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/napalm/iosxr_netconf/iosxr_netconf.py b/napalm/iosxr_netconf/iosxr_netconf.py
@@ -66,14 +66,11 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
         self.pending_changes = False
         self.replace = False
         self.locked = False
-        if optional_args is None:
-            optional_args = {}
-
-        self.netmiko_optional_args = optional_args
-        self.port = optional_args.get("port", 830)
-        self.lock_on_connect = optional_args.get("config_lock", False)
-        self.key_file = optional_args.get("key_file", None)
-        self.config_encoding = optional_args.get("config_encoding", "cli")
+        self.optional_args = optional_args if optional_args else {}
+        self.port = self.optional_args.pop("port", 830)
+        self.lock_on_connect = self.optional_args.pop("config_lock", False)
+        self.key_file = self.optional_args.pop("key_file", None)
+        self.config_encoding = self.optional_args.pop("config_encoding", "cli")
         if self.config_encoding not in C.CONFIG_ENCODINGS:
             raise ValueError(f"config encoding must be one of {C.CONFIG_ENCODINGS}")
 
@@ -92,7 +89,7 @@ def open(self):
                 key_filename=self.key_file,
                 timeout=self.timeout,
                 device_params={"name": "iosxr"},
-                **self.netmiko_optional_args,
+                **self.optional_args,
             )
             if self.lock_on_connect:
                 self._lock()