From a8e26bcf82a6305e509358e748b72219ca91dc55 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Thu, 23 Nov 2023 10:43:59 +0530
Subject: [PATCH 01/34] Fix for issue #1245

---
 lib/jnpr/junos/utils/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/utils/config.py b/lib/jnpr/junos/utils/config.py
index d53baf2b7..619595075 100644
--- a/lib/jnpr/junos/utils/config.py
+++ b/lib/jnpr/junos/utils/config.py
@@ -495,7 +495,7 @@ def _lset_from_rexp(rpc):
             elif re.search(r"^\s*\{", rpc) and re.search(r".*}\s*$", rpc):
                 kvargs["format"] = "json"
 
-        def try_load(rpc_contents, rpc_xattrs, ignore_warning=False):
+        def try_load(rpc_contents, rpc_xattrs, ignore_warning=ignore_warning):
             try:
                 got = self.rpc.load_config(
                     rpc_contents, ignore_warning=ignore_warning, **rpc_xattrs

From bfc58a910852be57a43ef90218aef0a45c3ad079 Mon Sep 17 00:00:00 2001
From: Alexandre L <alexandre+dev@13x.fr>
Date: Mon, 3 Jun 2024 18:41:55 +0200
Subject: [PATCH 02/34] Fix Python 3.12: `SyntaxWarning: invalid escape
 sequence '\s'` (closes #1312)

---
 lib/jnpr/junos/transport/tty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/transport/tty.py b/lib/jnpr/junos/transport/tty.py
index 0de9338d0..34ae5ff94 100644
--- a/lib/jnpr/junos/transport/tty.py
+++ b/lib/jnpr/junos/transport/tty.py
@@ -52,7 +52,7 @@ class Terminal(object):
         "(?P<badpasswd>ogin incorrect)",
         r"(?P<netconf_closed><!-- session end at .*-->\s*)",
         r"(?P<shell>%|#|(~\$)\s*$)",
-        '(?P<cli>[^\\-"]>\s*$)',
+        r'(?P<cli>[^\-"]>\s*$)',
         r"(?P<option>Enter your option:\s*$)",
         "(?P<hotkey>connection: <CTRL>Z)",
     ]

From 43f80c803498b22c9ae7b316bafaf197573402c1 Mon Sep 17 00:00:00 2001
From: Alexandre L <1735067+u1735067@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:56:25 +0200
Subject: [PATCH 03/34] Fix more SyntaxWarning, in tests

---
 tests/unit/factory/test_cmdtable.py  | 26 +++++++++++++-------------
 tests/unit/test_console.py           | 16 ++++++++--------
 tests/unit/test_rpcmeta.py           |  2 +-
 tests/unit/utils/test_start_shell.py |  4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/unit/factory/test_cmdtable.py b/tests/unit/factory/test_cmdtable.py
index 76ca90829..ae45b742f 100644
--- a/tests/unit/factory/test_cmdtable.py
+++ b/tests/unit/factory/test_cmdtable.py
@@ -351,7 +351,7 @@ def test_cmdtable_iter(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_title_in_view(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 ShowLuchipTable:
   command: show luchip {{ lu_instance }}
@@ -498,7 +498,7 @@ def test_unstructured_linkstats(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_field_eval(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 XMChipStatsTable:
   command: show xmchip {{ instance }} pt stats
@@ -675,7 +675,7 @@ def test_unstructured_ttpstatistics(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_unstructured_mtip_cge_regex(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 MtipCgeSummaryTable:
   command: show mtip-cge summary
@@ -877,7 +877,7 @@ def test_unstructured_icmpstats_nested(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_unstructured_ithrottle_key_args(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 IthrottleIDTable:
   command: show ithrottle id {{ id }}
   args:
@@ -921,7 +921,7 @@ def test_unstructured_ithrottle_key_args(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_pci_errs_multi_key_regex(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 ShowPciErrorsTable:
   command: show pci errors {{ pci_controller_number }}
@@ -1024,7 +1024,7 @@ def test_fpcmemory_multi_key_columns(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_item_regex_pq3_pci(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 PQ3PCITable:
   command: show pq3 pci
@@ -1147,7 +1147,7 @@ def test_item_regex_pq3_pci(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_regex_with_fields(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 SchedulerTable:
   command: show sched
@@ -1252,7 +1252,7 @@ def test_table_path_option(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_table_with_item_regex(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 DevicesLocalTable:
   command: show devices local
@@ -1354,7 +1354,7 @@ def test_table_with_item_regex(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_table_item_group_key_mismatch(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 DevicesLocalTable:
   command: show devices local
@@ -1390,7 +1390,7 @@ def test_table_item_group_key_mismatch(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_table_with_item_without_view(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 EthernetSwitchStatisticsIterTable:
   command: show chassis ethernet-switch statistics
@@ -1629,7 +1629,7 @@ def test_title_without_view(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_valueerror_with_no_target(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 ShowToePfePacketStatsTable:
   command: show toe pfe {{ pfe_instance }} {{ asic_type }} {{ asic_instance }} toe-inst {{ toe_instance }} packet-stats
@@ -1697,7 +1697,7 @@ def test_valueerror_with_no_target(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_item_with_fields_delimiter(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 ShowToePfePacketStatsTable:
   command: show toe pfe {{ pfe_instance }} {{ asic_type }} {{ asic_instance }} toe-inst {{ toe_instance }} packet-stats
@@ -2300,7 +2300,7 @@ def test_table_eval_with_filters(self, mock_execute):
     @patch("jnpr.junos.Device.execute")
     def test_new_line_in_data(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
-        yaml_data = """
+        yaml_data = r"""
 ---
 CChipLoStatsTable:
   command: show xmchip {{ chip_instance }} lo stats 0
diff --git a/tests/unit/test_console.py b/tests/unit/test_console.py
index de28e8cb3..074dfac25 100644
--- a/tests/unit/test_console.py
+++ b/tests/unit/test_console.py
@@ -40,15 +40,15 @@ def tearDownClass(cls):
     def setUp(self, mock_write, mock_expect, mock_open):
         tty_netconf.open = MagicMock()
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
             (
                 2,
-                re.search("(?P<passwd>assword:\s*$)", "password: "),
+                re.search(r"(?P<passwd>assword:\s*$)", "password: "),
                 six.b("\r\r\n password:"),
             ),
             (
                 3,
-                re.search("(?P<shell>%|#\s*$)", "junos % "),
+                re.search(r"(?P<shell>%|#\s*$)", "junos % "),
                 six.b("\r\r\nroot@device:~ # "),
             ),
         ]
@@ -87,10 +87,10 @@ def test_telnet_old_fact_warning(self, mock_warn):
     def test_login_bad_password(self, mock_write, mock_expect, mock_open):
         tty_netconf.open = MagicMock()
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
             (
                 2,
-                re.search("(?P<passwd>assword:\s*$)", "password: "),
+                re.search(r"(?P<passwd>assword:\s*$)", "password: "),
                 six.b("\r\r\n password:"),
             ),
             (
@@ -110,15 +110,15 @@ def test_with_context(self, mock_write, mock_expect, mock_open, mock_logout):
         tty_netconf.open = MagicMock()
 
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
             (
                 2,
-                re.search("(?P<passwd>assword:\s*$)", "password: "),
+                re.search(r"(?P<passwd>assword:\s*$)", "password: "),
                 six.b("\r\r\n password:"),
             ),
             (
                 3,
-                re.search("(?P<shell>%|#\s*$)", "junos % "),
+                re.search(r"(?P<shell>%|#\s*$)", "junos % "),
                 six.b("\r\r\nroot@device:~ # "),
             ),
         ]
diff --git a/tests/unit/test_rpcmeta.py b/tests/unit/test_rpcmeta.py
index be91cee2c..0e070e5cd 100644
--- a/tests/unit/test_rpcmeta.py
+++ b/tests/unit/test_rpcmeta.py
@@ -214,7 +214,7 @@ def test_get_config_format_json_JSONLoadError_with_line(self):
         except JSONLoadError as ex:
             self.assertTrue(
                 re.search(
-                    "Expecting '?,'? delimiter: line 17 column 39 \(char 516\)",
+                    r"Expecting '?,'? delimiter: line 17 column 39 \(char 516\)",
                     ex.ex_msg,
                 )
                 is not None
diff --git a/tests/unit/utils/test_start_shell.py b/tests/unit/utils/test_start_shell.py
index 4f3ecd9e8..ad43cf90d 100644
--- a/tests/unit/utils/test_start_shell.py
+++ b/tests/unit/utils/test_start_shell.py
@@ -69,7 +69,7 @@ def test_startshell_wait_for_regex(self, mock_select):
         ---(more)---
         """
         self.assertTrue(
-            str(self.shell.wait_for("---\(more\s?\d*%?\)---\n\s*|%")[0])
+            str(self.shell.wait_for(r"---\(more\s?\d*%?\)---\n\s*|%")[0])
             in self.shell._chan.recv.return_value
         )
 
@@ -92,7 +92,7 @@ def test_startshell_run_regex(self, mock_wait_for):
         """
         ]
         self.assertTrue(
-            self.shell.run("show version", "---\(more\s?\d*%?\)---\n\s*|%")[0]
+            self.shell.run("show version", r"---\(more\s?\d*%?\)---\n\s*|%")[0]
         )
 
     @patch("jnpr.junos.utils.start_shell.StartShell.wait_for")

From 956377031d1a6ba80565af7a430834e51a40eb7a Mon Sep 17 00:00:00 2001
From: Dwarakanath Yadavalli <dwarakanath.y@gmail.com>
Date: Sat, 10 Aug 2024 12:04:44 +0530
Subject: [PATCH 04/34] Update Docker file to use the latest Alpine

---
 Dockerfile | 26 ++++++++++++++++----------
 README.md  | 20 ++++++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5a3afdfa..bb765eb62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.12
+FROM alpine:3.20.2
 
 LABEL net.juniper.description="Junos PyEZ library for Python in a lightweight container." \
-      net.juniper.maintainer="Stephen Steiner <ssteiner@juniper.net>"
+      net.juniper.maintainer="jnpr-community-netdev@juniper.net"
 
 WORKDIR /source
 
@@ -12,15 +12,21 @@ ADD requirements.txt .
 ADD lib lib 
 ADD entrypoint.sh /usr/local/bin/.
 
-## Install dependancies and PyEZ
-RUN apk add --no-cache build-base python3-dev py-lxml \
+## Install dependencies
+RUN apk add --no-cache build-base python3-dev \
     libxslt-dev libxml2-dev libffi-dev openssl-dev curl \
-    ca-certificates py3-pip bash \
-    && pip install -U pip \
-    && pip install -r requirements.txt \
-    && apk del -r --purge gcc make g++ \
-    && ln -s /usr/bin/python3 /usr/bin/python \
-    && pip install . \
+    ca-certificates py3-pip bash
+
+## Update as per PEP 668. Use Virtual Env
+RUN python3 -m venv /scripts/.venv \
+    && source /scripts/.venv/bin/activate \
+    && pip install --upgrade pip \
+    && pip install pipdeptree \
+    && python3 -m pip install -r requirements.txt \
+    && pip install .
+
+## Clean up and start init
+RUN apk del -r --purge gcc make g++ \
     && rm -rf /source/* \
     && chmod +x /usr/local/bin/entrypoint.sh
 
diff --git a/README.md b/README.md
index bc1f48c9e..17bf7d327 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ This means that "non-programmers", for example the _Network Engineer_, can use t
 
 ## For "Programmers" - Open and Extensible
 
-There is a growing interest and need to automate the network infrastructure into larger IT systems.  To do so, traditional software programmers, DevOps, "hackers", etc. need an abstraction library of code to further those activities.  _Junos PyEZ_ is designed for extensibility so that the programmer can quickly and easily add new widgets to the library in support of their specific project requirements.  There is no need to "wait on the vendor" to provide new functionality.   _Junos PyEZ_ is not specifically tied to any version of Junos or any Junos product family.
+There is a growing interest and need to automate the network infrastructure into larger IT systems.  To do so, traditional software programmers, DevOps, "hackers", etc. need an abstraction library of code to further those activities.  _Junos PyEZ_ is designed for extensibility so that the programmer can quickly and easily add new widgets to the library in support of their specific project requirements.  There is no need to "wait on the vendor" to provide new functionality.   _Junos PyEZ_ is not specifically tied to any version of Junos (or Junos Evolved) or any Junos (or Junos Evolved) product family.
 
 # SUPPORT
 
@@ -37,7 +37,7 @@ For questions and general support, please visit our [Google Group](https://group
 
 You can also post your query on stackoverflow with __pyez__ [tag](http://stackoverflow.com/questions/tagged/pyez)
 
-For documentation and more usage examples, please visit the _Junos PyEZ_ project page, [here](http://forums.juniper.net/t5/Automation/Where-can-I-learn-more-about-Junos-PyEZ/ta-p/280496).
+For documentation and more usage examples, please visit the _Junos PyEZ_ project page, [here](http://www.juniper.net/techpubs/en_US/release-independent/junos-pyez/information-products/pathway-pages/index.html).
 
 Issues and bugs can be opened in the repository.
 
@@ -54,7 +54,7 @@ _Junos PyEZ_ is designed to provide the same capabilities as a user would have o
 
 # NOTICES
 
-- As of release 2.0.0, _Junos PyEZ_ requires [ncclient](https://pypi.python.org/pypi/ncclient) version 0.5.2 or later.
+- As of release 2.7.1, _Junos PyEZ_ requires [ncclient](https://pypi.python.org/pypi/ncclient) version 0.6.15 or later.
 - When using the `ssh_private_key_file` argument of the Device constructor on MacOS Mojave and higher, ensure that the SSH keys are in the RSA format, and not the newer OPENSSH format.
   - New key: `ssh-keygen -p -m PEM -f ~/.ssh/id_rsa`
   - Convert an existing OPENSSH key: ``ssh-keygen -p -m PEM -f ~/.ssh/private_key`
@@ -88,11 +88,16 @@ Move to the local directory which contains your script(s) and run the container.
 
 Your local scripts will be mounted to /scripts in the container.
 
+As per PEP 668, use Virtual Env in the container (after you enter the container). The docker container has virtual environment installed in the /scripts folder.
+
+Use `source .venv/bin/activate` to activate the virtual environment.
+
+
 ### Microservice Usage
 
 This image can also be used as a Python "executable" with the required Python PyEZ libraries pre-installed. To use the image in this way, mount the volume which contains the Python script and pass the script name as an argument to `docker run`. Optionally, you may also pass in a `requirements.txt` file to install additional python packages via `pip`. To add OS packages (Alpine Linux), provide a file with a list of packages --one per line-- and either reference it as an env var (`$APK`) or mount it to the container `/extras/apk.txt`. To add additional Python packages (via pip), provide a `requirements.txt` file and pass it in as an env var (`$REQ`) or mount it to the container at `/extras/requirements.txt`.
 
-`Usage: `docker run -it [ --rm ] -v some/dir:/scripts juniper/pyez [ myscript.py ]`
+Usage: `docker run -it [ --rm ] -v some/dir:/scripts juniper/pyez [ myscript.py ]`
 
 Example:
 
@@ -153,8 +158,11 @@ Juniper Networks is actively contributing to and maintaining this repo. Please c
 
 *Contributors:*
 
-[Nitin Kumar](https://github.com/vnitinv), [Stacy Smith](https://github.com/stacywsmith), [Stephen Steiner](https://github.com/ntwrkguru)
 
+* v2.7.1: [Dinesh Babu](https://github.com/dineshbaburam91)
+* v2.6.4: [Chidanand Pujar](https://github.com/chidanandpujar)
+* v2.6.3: [Rahul Kumar](https://github.com/rahkumar651991)
+* v2.5.0: [Rahul Kumar](https://github.com/rahkumar651991)
 * v2.4.1: [Nitin Kumar](https://github.com/vnitinv)
 * v2.4.0: [Nitin Kumar](https://github.com/vnitinv)
 * v2.3.0: [Nitin Kumar](https://github.com/vnitinv), [Raja Shekar Mekala](https://github.com/rsmekala), [Dinesh Babu](https://github.com/dineshbaburam91), [Chris Jenn](https://github.com/ipmonk), [Shigechika](https://github.com/shigechika)
@@ -167,4 +175,4 @@ Juniper Networks is actively contributing to and maintaining this repo. Please c
 
 *Former Contributors:*
 
-[Jeremy Schulman](https://github.com/jeremyschulman), [Rick Sherman](https://github.com/shermdog), [Edward Arcuri](https://github.com/sdndude)
+[Jeremy Schulman](https://github.com/jeremyschulman), [Rick Sherman](https://github.com/shermdog), [Edward Arcuri](https://github.com/sdndude), [Nitin Kumar](https://github.com/vnitinv), [Stacy Smith](https://github.com/stacywsmith), [Stephen Steiner](https://github.com/ntwrkguru)

From b343753f1cd68f1890e501ea1c0e897ae6701ef8 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Tue, 3 Sep 2024 12:58:00 +0530
Subject: [PATCH 05/34] Option to enable SSH known host key verification

---
 lib/jnpr/junos/device.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index 641806803..6042cd5ef 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -1216,6 +1216,10 @@ def __init__(self, *vargs, **kvargs):
             *OPTIONAL* To disable public key authentication.
             default is ``None``.
 
+        :param bool hostkey_verify:
+            *OPTIONAL* To enable ssh_known hostkey verify
+            default is ``False``.
+
         """
 
         # ----------------------------------------
@@ -1234,6 +1238,7 @@ def __init__(self, *vargs, **kvargs):
         self._huge_tree = kvargs.get("huge_tree", False)
         self._conn_open_timeout = kvargs.get("conn_open_timeout", 30)
         self._look_for_keys = kvargs.get("look_for_keys", None)
+        self._hostkey_verify = kvargs.get("hostkey_verify", False)
         if self._fact_style != "new":
             warnings.warn(
                 "fact-style %s will be removed in a future "
@@ -1367,6 +1372,14 @@ def open(self, *vargs, **kvargs):
             else:
                 look_for_keys = self._look_for_keys
 
+            # option to enable ssh_known hosts key verification
+            # using hostkey_verify=True
+            # Default is disabled with hostkey_verify=False
+            if self._hostkey_verify is None:
+                hostkey_verify = False
+            else:
+                hostkey_verify = self._hostkey_verify
+
             # open connection using ncclient transport
             self._conn = netconf_ssh.connect(
                 host=self._hostname,
@@ -1374,7 +1387,7 @@ def open(self, *vargs, **kvargs):
                 sock_fd=self._sock_fd,
                 username=self._auth_user,
                 password=self._auth_password,
-                hostkey_verify=False,
+                hostkey_verify=hostkey_verify,
                 key_filename=self._ssh_private_key_file,
                 allow_agent=allow_agent,
                 look_for_keys=look_for_keys,

From be27253cebe2c523cfd3290eeee8e723339506d1 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 4 Sep 2024 16:35:06 +0530
Subject: [PATCH 06/34] Option to enable SSH known host key verification

---
 tests/unit/facts/test_domain.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/facts/test_domain.py b/tests/unit/facts/test_domain.py
index 201d0fca0..99958db83 100644
--- a/tests/unit/facts/test_domain.py
+++ b/tests/unit/facts/test_domain.py
@@ -25,6 +25,7 @@ def setUp(self, mock_connect):
 
     @patch("jnpr.junos.Device.execute")
     def test_domain_fact_from_config(self, mock_execute):
+        self.dev.facts._cache["hostname"] = "r0"
         mock_execute.side_effect = self._mock_manager_domain_config
         self.assertEqual(self.dev.facts["domain"], "juniper.net")
         self.assertEqual(self.dev.facts["fqdn"], "r0.juniper.net")

From 897bae656dfb9d693595c895b5a032bdca83829e Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Mon, 7 Oct 2024 12:17:37 +0530
Subject: [PATCH 07/34] Option to enable SSH known host key verification

---
 tests/unit/test_factcache.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/test_factcache.py b/tests/unit/test_factcache.py
index 7f63fed45..cfe90e9f9 100644
--- a/tests/unit/test_factcache.py
+++ b/tests/unit/test_factcache.py
@@ -32,11 +32,13 @@ def test_factcache_fact_loop(self):
         # Change the callback for the model
         # fact to be the same as the personality fact
         # in order to induce a fact loop.
+        tmp = self.dev.facts._callbacks["model"]
         self.dev.facts._callbacks["model"] = self.dev.facts._callbacks["personality"]
         # Now, trying to fetch the personality
         # fact should cause a FactLoopError
         with self.assertRaises(FactLoopError):
             personality = self.dev.facts["personality"]
+        self.dev.facts._callbacks["model"] = tmp # To clear FactLoopError
 
     def test_factcache_return_unexpected_fact(self):
         # Create a callback for the foo fact.

From 6495ea5581a8ae2c67e9f0e6d38a0d695b2ef183 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Mon, 7 Oct 2024 14:44:48 +0530
Subject: [PATCH 08/34] Option to enable SSH known host key verification

---
 tests/unit/test_device.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/unit/test_device.py b/tests/unit/test_device.py
index 1f8a97ebc..42d16b559 100644
--- a/tests/unit/test_device.py
+++ b/tests/unit/test_device.py
@@ -496,6 +496,39 @@ def test_device_open_with_look_for_keys_True(self, mock_connect, mock_execute):
             )
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)
+    @patch("ncclient.manager.connect")
+    @patch("jnpr.junos.Device.execute")
+    def test_device_open_with_hostkey_verify_True(self, mock_connect, mock_execute):
+        with patch("jnpr.junos.utils.fs.FS.cat") as mock_cat:
+            mock_cat.return_value = """
+
+    domain jls.net
+
+            """
+            mock_connect.side_effect = self._mock_manager
+            mock_execute.side_effect = self._mock_manager
+            self.dev2 = Device(
+                host="2.2.2.2", user="test", password="password123", hostkey_verify=True
+            )
+            self.dev2.open()
+            self.assertEqual(self.dev2.connected, True)
+
+    @patch("ncclient.manager.connect")
+    @patch("jnpr.junos.Device.execute")
+    def test_device_open_with_hostkey_verify_False(self, mock_connect, mock_execute):
+        with patch("jnpr.junos.utils.fs.FS.cat") as mock_cat:
+            mock_cat.return_value = """
+
+    domain jls.net
+
+            """
+            mock_connect.side_effect = self._mock_manager
+            mock_execute.side_effect = self._mock_manager
+            self.dev2 = Device(
+                host="2.2.2.2", user="test", password="password123", hostkey_verify=False
+            )
+            self.dev2.open()
+            self.assertEqual(self.dev2.connected, True)
 
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.Device.execute")

From 027cbb19ba3452de8ef808cdc721e9cdbae7d8df Mon Sep 17 00:00:00 2001
From: Dinesh babu <dineshbaburam91@rediffmail.com>
Date: Mon, 7 Oct 2024 15:29:57 +0530
Subject: [PATCH 09/34] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bb765eb62..9b9c6a4c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ LABEL net.juniper.description="Junos PyEZ library for Python in a lightweight co
 
 WORKDIR /source
 
-## Copy project inside the container
+## Copy project inside the containers
 ADD setup.* ./
 ADD versioneer.py .
 ADD requirements.txt .

From caff6c6f5f9dd999c9684cd48a11c5e40ebef7e1 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 14 Oct 2024 09:31:17 +0530
Subject: [PATCH 10/34] Added vmhost paramater in dev.facts

---
 lib/jnpr/junos/facts/__init__.py              |  2 +-
 lib/jnpr/junos/facts/vmhost.py                | 40 ++++++++++
 requirements.txt                              |  4 +-
 .../vmhost_error_request-shell-execute.xml    | 11 +++
 .../vmhost_false_request-shell-execute.xml    |  5 ++
 .../vmhost_true_request-shell-execute.xml     |  5 ++
 tests/unit/facts/test_vmhost.py               | 76 +++++++++++++++++++
 7 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 lib/jnpr/junos/facts/vmhost.py
 create mode 100644 tests/unit/facts/rpc-reply/vmhost_error_request-shell-execute.xml
 create mode 100644 tests/unit/facts/rpc-reply/vmhost_false_request-shell-execute.xml
 create mode 100644 tests/unit/facts/rpc-reply/vmhost_true_request-shell-execute.xml
 create mode 100644 tests/unit/facts/test_vmhost.py

diff --git a/lib/jnpr/junos/facts/__init__.py b/lib/jnpr/junos/facts/__init__.py
index 7ac4317ae..b9159cada 100644
--- a/lib/jnpr/junos/facts/__init__.py
+++ b/lib/jnpr/junos/facts/__init__.py
@@ -48,7 +48,7 @@
 import jnpr.junos.facts.personality
 import jnpr.junos.facts.swver
 import jnpr.junos.facts.is_linux
-
+import jnpr.junos.facts.vmhost
 
 def _build_fact_callbacks_and_doc_strings():
     """
diff --git a/lib/jnpr/junos/facts/vmhost.py b/lib/jnpr/junos/facts/vmhost.py
new file mode 100644
index 000000000..a2dbd5f1d
--- /dev/null
+++ b/lib/jnpr/junos/facts/vmhost.py
@@ -0,0 +1,40 @@
+from jnpr.junos.exception import RpcError
+import re
+from lxml import etree
+
+
+def provides_facts():
+    """
+    Returns a dictionary keyed on the facts provided by this module. The value
+    of each key is the doc string describing the fact.
+    """
+    return {
+        "vmhost": "A boolean indicating if the device is vmhost.",
+    }
+
+
+def get_facts(device):
+    """
+    Gathers facts from the sysctl command.
+    """
+    SYSCTL_VMHOST_MODE = "sysctl -n hw.re.vmhost_mode"
+    vmhost = None
+
+    if device.facts["_is_linux"]:
+        vmhost = None
+    else:
+        try:
+            rsp = device.rpc.request_shell_execute(command=SYSCTL_VMHOST_MODE)
+            if rsp.tag == "rpc-error":
+                raise RpcError()
+            result = re.sub("<[^<]+>", "", etree.tostring(rsp).decode())
+            if result.strip() == "1":
+                vmhost = True
+            else:
+                vmhost = False
+        except RpcError:
+            pass
+
+    return {
+        "vmhost": vmhost,
+    }
diff --git a/requirements.txt b/requirements.txt
index c318527ec..78f0169a9 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 lxml>=3.2.4
-# ncclient version 0.6.10 has issues with PyEZ(junos-eznc) and needs to be avoided
-ncclient>=0.6.15
+# ncclient version 0.6.10 and 0.6.16 has issues with PyEZ(junos-eznc) and needs to be avoided
+ncclient==0.6.15
 scp>=0.7.0
 jinja2>=2.7.1
 PyYAML>=5.1
diff --git a/tests/unit/facts/rpc-reply/vmhost_error_request-shell-execute.xml b/tests/unit/facts/rpc-reply/vmhost_error_request-shell-execute.xml
new file mode 100644
index 000000000..3e97082a6
--- /dev/null
+++ b/tests/unit/facts/rpc-reply/vmhost_error_request-shell-execute.xml
@@ -0,0 +1,11 @@
+<rpc-reply xmlns:junos="http://xml.juniper.net/junos/16.1R1/junos">
+<rpc-error>
+<error-type>protocol</error-type>
+<error-tag>operation-failed</error-tag>
+<error-severity>error</error-severity>
+<error-message>permission denied</error-message>
+<error-info>
+<bad-element>system</bad-element>
+</error-info>
+</rpc-error>
+</rpc-reply>
diff --git a/tests/unit/facts/rpc-reply/vmhost_false_request-shell-execute.xml b/tests/unit/facts/rpc-reply/vmhost_false_request-shell-execute.xml
new file mode 100644
index 000000000..d631bc6be
--- /dev/null
+++ b/tests/unit/facts/rpc-reply/vmhost_false_request-shell-execute.xml
@@ -0,0 +1,5 @@
+<rpc-reply xmlns:junos="http://xml.juniper.net/junos/16.1R1/junos">
+<output>
+0
+</output>
+</rpc-reply>
diff --git a/tests/unit/facts/rpc-reply/vmhost_true_request-shell-execute.xml b/tests/unit/facts/rpc-reply/vmhost_true_request-shell-execute.xml
new file mode 100644
index 000000000..2f5396845
--- /dev/null
+++ b/tests/unit/facts/rpc-reply/vmhost_true_request-shell-execute.xml
@@ -0,0 +1,5 @@
+<rpc-reply xmlns:junos="http://xml.juniper.net/junos/16.1R1/junos">
+<output>
+1
+</output>
+</rpc-reply>
diff --git a/tests/unit/facts/test_vmhost.py b/tests/unit/facts/test_vmhost.py
new file mode 100644
index 000000000..1c3664d6e
--- /dev/null
+++ b/tests/unit/facts/test_vmhost.py
@@ -0,0 +1,76 @@
+__author__ = "Stacy Smith"
+__credits__ = "Jeremy Schulman, Nitin Kumar"
+
+try:
+    import unittest2 as unittest
+except:
+    import unittest
+import nose2
+from unittest.mock import patch, MagicMock
+import os
+
+from jnpr.junos import Device
+
+from ncclient.manager import Manager, make_device_handler
+from ncclient.transport import SSHSession
+
+
+class TestVmHost(unittest.TestCase):
+    @patch("ncclient.manager.connect")
+    def setUp(self, mock_connect):
+        mock_connect.side_effect = self._mock_manager_setup
+        self.dev = Device(
+            host="1.1.1.1", user="rick", password="password123", gather_facts=False
+        )
+        self.dev.open()
+
+    @patch("jnpr.junos.Device.execute")
+    def test_vmhost_true(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager_vmhost_true
+        self.assertEqual(self.dev.facts["vmhost"], True)
+
+    @patch("jnpr.junos.Device.execute")
+    def test_vmhost_false(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager_vmhost_false
+        self.assertEqual(self.dev.facts["vmhost"], False)
+
+    @patch("jnpr.junos.Device.execute")
+    def test_vmhost_none(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager_vmhost_false
+        self.dev.facts._cache["_is_linux"] = True
+        self.assertEqual(self.dev.facts["vmhost"], None)
+
+    @patch("jnpr.junos.Device.execute")
+    def test_vmhost_error(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager_vmhost_error
+        self.assertEqual(self.dev.facts["vmhost"], None)
+
+    def _read_file(self, fname):
+        from ncclient.xml_ import NCElement
+
+        fpath = os.path.join(os.path.dirname(__file__), "rpc-reply", fname)
+        foo = open(fpath).read()
+
+        rpc_reply = NCElement(
+            foo, self.dev._conn._device_handler.transform_reply()
+        )._NCElement__doc[0]
+        return rpc_reply
+
+    def _mock_manager_setup(self, *args, **kwargs):
+        if kwargs:
+            device_params = kwargs["device_params"]
+            device_handler = make_device_handler(device_params)
+            session = SSHSession(device_handler)
+            return Manager(session, device_handler)
+
+    def _mock_manager_vmhost_true(self, *args, **kwargs):
+        if args:
+            return self._read_file("vmhost_true_" + args[0].tag + ".xml")
+
+    def _mock_manager_vmhost_false(self, *args, **kwargs):
+        if args:
+            return self._read_file("vmhost_false_" + args[0].tag + ".xml")
+
+    def _mock_manager_vmhost_error(self, *args, **kwargs):
+        if args:
+            return self._read_file("vmhost_error_" + args[0].tag + ".xml")

From 5ebf723804409d20b3c397c20a3de0c57e0492ee Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 14 Oct 2024 09:35:23 +0530
Subject: [PATCH 11/34] Updated black format

---
 lib/jnpr/junos/facts/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jnpr/junos/facts/__init__.py b/lib/jnpr/junos/facts/__init__.py
index b9159cada..db28fdfed 100644
--- a/lib/jnpr/junos/facts/__init__.py
+++ b/lib/jnpr/junos/facts/__init__.py
@@ -50,6 +50,7 @@
 import jnpr.junos.facts.is_linux
 import jnpr.junos.facts.vmhost
 
+
 def _build_fact_callbacks_and_doc_strings():
     """
     Imports the fact modules and returns callbacks and doc_strings.

From 8f548e64ddd204c7af8c6be08118afd49614848a Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 14 Oct 2024 12:23:40 +0530
Subject: [PATCH 12/34] Updated the fix

---
 lib/jnpr/junos/facts/vmhost.py  | 2 +-
 tests/unit/facts/test_vmhost.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jnpr/junos/facts/vmhost.py b/lib/jnpr/junos/facts/vmhost.py
index a2dbd5f1d..081759945 100644
--- a/lib/jnpr/junos/facts/vmhost.py
+++ b/lib/jnpr/junos/facts/vmhost.py
@@ -21,7 +21,7 @@ def get_facts(device):
     vmhost = None
 
     if device.facts["_is_linux"]:
-        vmhost = None
+        vmhost = False 
     else:
         try:
             rsp = device.rpc.request_shell_execute(command=SYSCTL_VMHOST_MODE)
diff --git a/tests/unit/facts/test_vmhost.py b/tests/unit/facts/test_vmhost.py
index 1c3664d6e..50e2be367 100644
--- a/tests/unit/facts/test_vmhost.py
+++ b/tests/unit/facts/test_vmhost.py
@@ -35,10 +35,10 @@ def test_vmhost_false(self, mock_execute):
         self.assertEqual(self.dev.facts["vmhost"], False)
 
     @patch("jnpr.junos.Device.execute")
-    def test_vmhost_none(self, mock_execute):
+    def test_vmhost_linux(self, mock_execute):
         mock_execute.side_effect = self._mock_manager_vmhost_false
         self.dev.facts._cache["_is_linux"] = True
-        self.assertEqual(self.dev.facts["vmhost"], None)
+        self.assertEqual(self.dev.facts["vmhost"], False)
 
     @patch("jnpr.junos.Device.execute")
     def test_vmhost_error(self, mock_execute):

From bc5ce9507e190e62c2e429ec53eeb1d9720d8ea5 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 14 Oct 2024 12:26:56 +0530
Subject: [PATCH 13/34] Updated fix

---
 lib/jnpr/junos/facts/vmhost.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/facts/vmhost.py b/lib/jnpr/junos/facts/vmhost.py
index 081759945..89e59b339 100644
--- a/lib/jnpr/junos/facts/vmhost.py
+++ b/lib/jnpr/junos/facts/vmhost.py
@@ -21,7 +21,7 @@ def get_facts(device):
     vmhost = None
 
     if device.facts["_is_linux"]:
-        vmhost = False 
+        vmhost = False
     else:
         try:
             rsp = device.rpc.request_shell_execute(command=SYSCTL_VMHOST_MODE)

From 9dad52260248bbdbeab31d19d85f39705d706277 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Mon, 14 Oct 2024 16:49:47 +0530
Subject: [PATCH 14/34] pull requests for issue #1322 #1315

---
 lib/jnpr/junos/device.py   | 2 ++
 lib/jnpr/junos/utils/sw.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index 6042cd5ef..80acbf570 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -735,6 +735,8 @@ def cli(self, command, format="text", warning=True):
             if rsp is True:
                 return ""
             if rsp.tag in ["output", "rpc-reply"]:
+                if rsp.tag == "output" and rsp.getparent() is not None:
+                    rsp = rsp.getparent()
                 encode = None if sys.version < "3" else "unicode"
                 return etree.tostring(
                     rsp, method="text", with_tail=False, encoding=encode
diff --git a/lib/jnpr/junos/utils/sw.py b/lib/jnpr/junos/utils/sw.py
index c9e42f58e..9aeca8bb6 100644
--- a/lib/jnpr/junos/utils/sw.py
+++ b/lib/jnpr/junos/utils/sw.py
@@ -984,11 +984,15 @@ def _progress(report):
                     kwargs.update({"no_validate": True})
 
             if issu is True:
+                if validate is False:  # To Check validation is False
+                    kwargs.update({"no_validate": True})  # Need to pass the no_validate option via kwargs
                 _progress("ISSU: installing software ... please be patient ...")
                 return self.pkgaddISSU(
                     remote_package, vmhost=vmhost, dev_timeout=timeout, **kwargs
                 )
             elif nssu is True:
+                if validate is False:
+                    kwargs.update({"no_validate": True}) # Need to pass the no_validate option via kwargs
                 _progress("NSSU: installing software ... please be patient ...")
                 return self.pkgaddNSSU(remote_package, dev_timeout=timeout, **kwargs)
             elif member_id is not None:

From 8e4331d424aa3c126a4f65aae81432831170c5de Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Mon, 14 Oct 2024 16:54:40 +0530
Subject: [PATCH 15/34] pull requests for issue #1322 #1315

---
 lib/jnpr/junos/utils/sw.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/jnpr/junos/utils/sw.py b/lib/jnpr/junos/utils/sw.py
index 9aeca8bb6..bd2565d3b 100644
--- a/lib/jnpr/junos/utils/sw.py
+++ b/lib/jnpr/junos/utils/sw.py
@@ -985,14 +985,16 @@ def _progress(report):
 
             if issu is True:
                 if validate is False:  # To Check validation is False
-                    kwargs.update({"no_validate": True})  # Need to pass the no_validate option via kwargs
+                    # Need to pass the no_validate option via kwargs
+                    kwargs.update({"no_validate": True})
                 _progress("ISSU: installing software ... please be patient ...")
                 return self.pkgaddISSU(
                     remote_package, vmhost=vmhost, dev_timeout=timeout, **kwargs
                 )
             elif nssu is True:
                 if validate is False:
-                    kwargs.update({"no_validate": True}) # Need to pass the no_validate option via kwargs
+                    # Need to pass the no_validate option via kwargs
+                    kwargs.update({"no_validate": True})
                 _progress("NSSU: installing software ... please be patient ...")
                 return self.pkgaddNSSU(remote_package, dev_timeout=timeout, **kwargs)
             elif member_id is not None:

From dfeb1697a5523f28a1869b6d6e7b094a69c13dbe Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Mon, 14 Oct 2024 19:12:44 +0530
Subject: [PATCH 16/34] pull requests for issue #1322 #1315

---
 tests/unit/utils/test_sw.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/unit/utils/test_sw.py b/tests/unit/utils/test_sw.py
index ad6cc773b..2796d8a4c 100644
--- a/tests/unit/utils/test_sw.py
+++ b/tests/unit/utils/test_sw.py
@@ -242,12 +242,36 @@ def test_sw_install_issu(self, mock_execute):
         package = "test.tgz"
         self.assertTrue(self.sw.install(package, issu=True, no_copy=True))
 
+    @patch("jnpr.junos.Device.execute")
+    def test_sw_install_issu_validate_False(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager
+        package = "test.tgz"
+        self.assertTrue(self.sw.install(package, issu=True, no_copy=True, validate=False))
+
+    @patch("jnpr.junos.Device.execute")
+    def test_sw_install_issu_validate_True(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager
+        package = "test.tgz"
+        self.assertTrue(self.sw.install(package, issu=True, no_copy=True, validate=True))
+
     @patch("jnpr.junos.Device.execute")
     def test_sw_install_nssu(self, mock_execute):
         mock_execute.side_effect = self._mock_manager
         package = "test.tgz"
         self.assertTrue(self.sw.install(package, nssu=True, no_copy=True))
 
+    @patch("jnpr.junos.Device.execute")
+    def test_sw_install_nssu_validate_False(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager
+        package = "test.tgz"
+        self.assertTrue(self.sw.install(package, nssu=True, no_copy=True, validate=False))
+
+    @patch("jnpr.junos.Device.execute")
+    def test_sw_install_nssu_validate_True(self, mock_execute):
+        mock_execute.side_effect = self._mock_manager
+        package = "test.tgz"
+        self.assertTrue(self.sw.install(package, nssu=True, no_copy=True, validate=True))
+
     @patch("jnpr.junos.Device.execute")
     def test_sw_install_issu_nssu_both_error(self, mock_execute):
         mock_execute.side_effect = self._mock_manager

From fbd0b8a815b6ad98aa12b340ed99ffa512d71b81 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 14 Oct 2024 20:32:56 +0530
Subject: [PATCH 17/34] Fixed Console' object has no attribute '_use_filter'

---
 lib/jnpr/junos/console.py         | 1 +
 lib/jnpr/junos/factory/optable.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/console.py b/lib/jnpr/junos/console.py
index 5c96614e7..5fe232a35 100644
--- a/lib/jnpr/junos/console.py
+++ b/lib/jnpr/junos/console.py
@@ -114,6 +114,7 @@ def __init__(self, **kvargs):
         self._attempts = kvargs.get("attempts", 10)
         self._gather_facts = kvargs.get("gather_facts", False)
         self._fact_style = kvargs.get("fact_style", "new")
+        self._use_filter = False
         self._huge_tree = kvargs.get("huge_tree", False)
         if self._fact_style != "new":
             warnings.warn(
diff --git a/lib/jnpr/junos/factory/optable.py b/lib/jnpr/junos/factory/optable.py
index 4e22cd318..8078bd8a8 100644
--- a/lib/jnpr/junos/factory/optable.py
+++ b/lib/jnpr/junos/factory/optable.py
@@ -68,8 +68,8 @@ def get(self, *vargs, **kvargs):
                 rpc_args["filter_xml"] = filter_xml
             except Exception as ex:
                 logger.debug("Not able to create SAX parser input due to " "'%s'" % ex)
+            self.D.transform = lambda: remove_namespaces_and_spaces
 
-        self.D.transform = lambda: remove_namespaces_and_spaces
         rpc_args.update(self.GET_ARGS)  # copy default args
         # saltstack get_table pass args as named keyword
         if "args" in kvargs and isinstance(kvargs["args"], dict):

From 1e8542b3f45227c5733ba94bcb8270f8fba64fb6 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Tue, 15 Oct 2024 13:02:31 +0530
Subject: [PATCH 18/34] Fix for issue #1244

---
 lib/jnpr/junos/op/systemstorage.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/jnpr/junos/op/systemstorage.yml b/lib/jnpr/junos/op/systemstorage.yml
index 86531ae64..d61125e37 100644
--- a/lib/jnpr/junos/op/systemstorage.yml
+++ b/lib/jnpr/junos/op/systemstorage.yml
@@ -1,12 +1,23 @@
----
+  ---
 SystemStorageTable:
   rpc: get-system-storage
-  key: filesystem-name
-  item: filesystem
+  key: re-name | Null
+  item: //multi-routing-engine-item | //rpc-reply/system-storage-information
   view: SystemStorageView
 
 SystemStorageView:
   fields:
+    re-name: re-name
+    filesystems: _FsTable
+
+_FsTable:
+  item: system-storage-information/filesystem | //rpc-reply/system-storage-information/filesystem
+  key: filesystem-name
+  view: _FsView
+
+_FsView:
+  fields:
+    name: filesystem-name
     total_blocks: total-blocks
     used_blocks: used-blocks
     available_blocks: available-blocks

From cc3753f3f09fade160ed937e2b216e2c95134bf2 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Tue, 15 Oct 2024 20:32:22 +0530
Subject: [PATCH 19/34] Updated ReadMe file

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 17bf7d327..592a08d70 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,6 @@ There is a growing interest and need to automate the network infrastructure into
 
 # SUPPORT
 
-For questions and general support, please visit our [Google Group](https://groups.google.com/forum/#!forum/junos-python-ez)
-
-You can also post your query on stackoverflow with __pyez__ [tag](http://stackoverflow.com/questions/tagged/pyez)
-
 For documentation and more usage examples, please visit the _Junos PyEZ_ project page, [here](http://www.juniper.net/techpubs/en_US/release-independent/junos-pyez/information-products/pathway-pages/index.html).
 
 Issues and bugs can be opened in the repository.

From 079a60e13e7effc78c959637708b01332bcd4709 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 16 Oct 2024 10:40:33 +0530
Subject: [PATCH 20/34] Fixed the version check

---
 lib/jnpr/junos/device.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index 6042cd5ef..bd4cb2644 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -870,8 +870,8 @@ def execute(self, rpc_cmd, ignore_warning=False, **kvargs):
             ver_info = self.facts.get("version_info")
             if (
                 ver_info
-                and ver_info.major[0] >= 15
-                or (ver_info.major[0] == 14 and ver_info.major[1] >= 2)
+                and (ver_info.major[0] >= 15
+                or (ver_info.major[0] == 14 and ver_info.major[1] >= 2))
             ):
                 try:
                     return json.loads(rpc_rsp_e.text, strict=False)

From 0d045145a03c9eaebf39f01a89d8b74251c1ed47 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 16 Oct 2024 10:52:31 +0530
Subject: [PATCH 21/34] fixed black format

---
 lib/jnpr/junos/device.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index bd4cb2644..063ffb344 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -868,10 +868,9 @@ def execute(self, rpc_cmd, ignore_warning=False, **kvargs):
             "JSON",
         ]:
             ver_info = self.facts.get("version_info")
-            if (
-                ver_info
-                and (ver_info.major[0] >= 15
-                or (ver_info.major[0] == 14 and ver_info.major[1] >= 2))
+            if ver_info and (
+                ver_info.major[0] >= 15
+                or (ver_info.major[0] == 14 and ver_info.major[1] >= 2)
             ):
                 try:
                     return json.loads(rpc_rsp_e.text, strict=False)

From 719f5396dfed3e74b75e7e9c0f4fae72359dba62 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Fri, 18 Oct 2024 15:18:56 +0530
Subject: [PATCH 22/34] Fixed error handling on HelloHandler

---
 lib/jnpr/junos/transport/tty_netconf.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/transport/tty_netconf.py b/lib/jnpr/junos/transport/tty_netconf.py
index 1d5133de4..593c9b9f9 100644
--- a/lib/jnpr/junos/transport/tty_netconf.py
+++ b/lib/jnpr/junos/transport/tty_netconf.py
@@ -68,7 +68,9 @@ def open(self, at_shell):
             raise RuntimeError("Error: netconf not responding")
 
         self.hello = self._receive()
-        self._session_id, _ = HelloHandler.parse(self.hello.decode("utf-8"))
+        self._session_id, _ = HelloHandler.parse(
+            self.hello.decode("utf-8") if isinstance(self.hello, bytes) else self.hello
+        )
 
     def close(self, force=False):
         """issue the XML API to close the session"""

From 443fa3c56d1fd5d86ccd5bbfec3d6fa294be2129 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 21 Oct 2024 15:45:23 +0530
Subject: [PATCH 23/34] Added bind_addr parameter in Device() API

---
 lib/jnpr/junos/device.py  |  2 ++
 tests/unit/test_device.py | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index 37523ad15..6765d2af9 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -1239,6 +1239,7 @@ def __init__(self, *vargs, **kvargs):
         self._huge_tree = kvargs.get("huge_tree", False)
         self._conn_open_timeout = kvargs.get("conn_open_timeout", 30)
         self._look_for_keys = kvargs.get("look_for_keys", None)
+        self._bind_addr = kvargs.get("bind_addr", None)
         self._hostkey_verify = kvargs.get("hostkey_verify", False)
         if self._fact_style != "new":
             warnings.warn(
@@ -1393,6 +1394,7 @@ def open(self, *vargs, **kvargs):
                 allow_agent=allow_agent,
                 look_for_keys=look_for_keys,
                 ssh_config=self._sshconf_lkup(),
+                bind_addr=self._bind_addr,
                 timeout=self._conn_open_timeout,
                 device_params={
                     "name": "junos",
diff --git a/tests/unit/test_device.py b/tests/unit/test_device.py
index 42d16b559..1773ee706 100644
--- a/tests/unit/test_device.py
+++ b/tests/unit/test_device.py
@@ -463,6 +463,23 @@ def test_device_open(self, mock_connect, mock_execute):
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)
 
+    @patch("ncclient.manager.connect")
+    @patch("jnpr.junos.Device.execute")
+    def test_device_open_with_bind_addr(self, mock_connect, mock_execute):
+        with patch("jnpr.junos.utils.fs.FS.cat") as mock_cat:
+            mock_cat.return_value = """
+
+    domain jls.net
+
+            """
+            mock_connect.side_effect = self._mock_manager
+            mock_execute.side_effect = self._mock_manager
+            self.dev2 = Device(
+                host="2.2.2.2", user="test", password="password123", bind_addr="1.1.1.1"
+            )
+            self.dev2.open()
+            self.assertEqual(self.dev2.connected, True)
+
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.Device.execute")
     def test_device_open_with_look_for_keys_False(self, mock_connect, mock_execute):
@@ -496,6 +513,7 @@ def test_device_open_with_look_for_keys_True(self, mock_connect, mock_execute):
             )
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)
+
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.Device.execute")
     def test_device_open_with_hostkey_verify_True(self, mock_connect, mock_execute):
@@ -525,7 +543,10 @@ def test_device_open_with_hostkey_verify_False(self, mock_connect, mock_execute)
             mock_connect.side_effect = self._mock_manager
             mock_execute.side_effect = self._mock_manager
             self.dev2 = Device(
-                host="2.2.2.2", user="test", password="password123", hostkey_verify=False
+                host="2.2.2.2",
+                user="test",
+                password="password123",
+                hostkey_verify=False,
             )
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)

From cf87f0359eebec91b841b176065d2b2e61d9abfc Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Mon, 21 Oct 2024 15:49:41 +0530
Subject: [PATCH 24/34] Updated the comments

---
 lib/jnpr/junos/device.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
index 6765d2af9..27133661c 100644
--- a/lib/jnpr/junos/device.py
+++ b/lib/jnpr/junos/device.py
@@ -1217,6 +1217,10 @@ def __init__(self, *vargs, **kvargs):
             *OPTIONAL* To disable public key authentication.
             default is ``None``.
 
+        :param str bind_addr:
+            *OPTIONAL* To use (local) source IP address.
+            default is ``None``.
+
         :param bool hostkey_verify:
             *OPTIONAL* To enable ssh_known hostkey verify
             default is ``False``.

From 8509d330b1e91741c7064de275e0623adbdc15c6 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 23 Oct 2024 10:49:24 +0530
Subject: [PATCH 25/34] Fix for issue #1228

---
 lib/jnpr/junos/op/ethernetswitchingtable.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jnpr/junos/op/ethernetswitchingtable.yml b/lib/jnpr/junos/op/ethernetswitchingtable.yml
index 1cfc7601b..c5b25e30a 100644
--- a/lib/jnpr/junos/op/ethernetswitchingtable.yml
+++ b/lib/jnpr/junos/op/ethernetswitchingtable.yml
@@ -3,6 +3,7 @@ EthernetSwitchingTable:
     rpc: get-ethernet-switching-table-information
     args:
         detail: True
+    key: mac-table-count
     item: ethernet-switching-table
     view: EthernetSwitchingView
 

From 8a51765adf928c4c0194acaee6dbd67d828c61a4 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 23 Oct 2024 15:23:42 +0530
Subject: [PATCH 26/34] Updated latest paramiko which support aes128-gcm and
 aes256-gcm ciper

---
 requirements.txt | 1 +
 setup.py         | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 78f0169a9..16937fa40 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ ncclient==0.6.15
 scp>=0.7.0
 jinja2>=2.7.1
 PyYAML>=5.1
+paramiko>=3.5.0
 six
 pyserial
 yamlordereddictloader
diff --git a/setup.py b/setup.py
index 981a023d1..6bf18bed6 100755
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,6 @@
 import versioneer
 import os
 
-# Install customer paramiko
-os.system("pip install git+https://github.com/Juniper/paramiko.git@v3.4.0-JNPR")
 # parse requirements
 req_lines = [line.strip() for line in open("requirements.txt").readlines()]
 install_reqs = list(filter(None, req_lines))

From 929bf184b802738c5cbfe04c6d7d82e519a5b192 Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 23 Oct 2024 15:33:04 +0530
Subject: [PATCH 27/34] Updated cryptography version

---
 development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development.txt b/development.txt
index 24a995026..84be0bed3 100644
--- a/development.txt
+++ b/development.txt
@@ -6,4 +6,4 @@ pep8	     # https://github.com/jcrocholl/pep8
 pyflakes	 # https://launchpad.net/pyflakes
 coveralls	 # https://coveralls.io/
 ntc_templates # user needs to explicitly install this
-cryptography==3.2
+cryptography

From 123b22337545e0b72ef8fe3fc30ab2b8ad3f08bf Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 23 Oct 2024 19:04:40 +0530
Subject: [PATCH 28/34] PyEZ 2.7.2 release update

---
 RELEASE-NOTES.md          | 18 +++++++++++++++++-
 lib/jnpr/junos/version.py |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index da92bb139..aabcfea81 100755
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,8 +1,24 @@
-## Release 2.7.2 - 12 APR 2024
+## Release 2.7.2 - 23 Oct 2024
 ## Features Added
+- Introduced bind_addr parameter in Device() API #1279
+- Introduced vmhost paramater in dev.facts #1333
+- Introduced hostkey_verify paramater in Device() API #1321
+- Updated Docker file to use the latest Alpine #1316
 
 ## Bugs Fixed
 
+- Fixed the missing key to EthernetSwitchingTable #1228
+- Fixed error handling on HelloHandler #1339
+- Fixed the version check #1338
+- Removed Google and Stackflow link from the ReadME #1337
+- Fixed SystemStorageTable tables and views to handles multiple routing-engine file system storage information.#1244
+- Fixed Console' object has no attribute '_use_filter' error when executed Table/View script #1335
+- Fixed cli function to get full RPC response #1315
+- Fixed sw.install to set no_validate option when validate=False for NSSU and ISSU upgrade #1323
+- Fixed UT framework mock to use built-in unittest.mock #1311
+- Fixed specific VC member reboot handling #1308 #1310
+- Supported latest paramiko version which supports aes128-gcm and aes256-gcm cipher
+
 ## Release 2.7.1 - 12 APR 2024
 ## Features Added
 - Added customer juniper paramiko module as a dependency  which supported aes128 and aes257 cipher #1299 
diff --git a/lib/jnpr/junos/version.py b/lib/jnpr/junos/version.py
index 6492f3d25..ac35cfa9e 100644
--- a/lib/jnpr/junos/version.py
+++ b/lib/jnpr/junos/version.py
@@ -1,5 +1,5 @@
-VERSION = "2.7.2.dev0"
-DATE = "2024-Apr-12"
+VERSION = "2.7.2"
+DATE = "2024-Oct-23"
 
 # Augment with the internal version if present
 try:

From d708f321339df789f8ae2350b4cb4920f4f21d6f Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 23 Oct 2024 20:01:11 +0530
Subject: [PATCH 29/34] Update Readthedoc file

---
 docs/.readthedocs.yaml        | 22 ++++++++++++++++++++++
 docreq.txt => docs/docreq.txt |  0
 2 files changed, 22 insertions(+)
 create mode 100644 docs/.readthedocs.yaml
 rename docreq.txt => docs/docreq.txt (100%)

diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml
new file mode 100644
index 000000000..6c4ddaa5a
--- /dev/null
+++ b/docs/.readthedocs.yaml
@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.8"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/docreq.txt
diff --git a/docreq.txt b/docs/docreq.txt
similarity index 100%
rename from docreq.txt
rename to docs/docreq.txt

From 71fe887cc8d61ebe9ddc259713767e6a7fdfe1ec Mon Sep 17 00:00:00 2001
From: dineshbaburam91 <dineshbaburam91@rediffmail.com>
Date: Wed, 23 Oct 2024 20:13:09 +0530
Subject: [PATCH 30/34] Update the read the doc requirement

---
 docs/docreq.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/docreq.txt b/docs/docreq.txt
index e57488aa1..f95fb895b 100644
--- a/docs/docreq.txt
+++ b/docs/docreq.txt
@@ -1 +1,12 @@
 git+https://github.com/ryan-roemer/sphinx-bootstrap-theme.git#egg=sphinx-bootstrap-theme
+lxml>=3.2.4
+ncclient==0.6.15
+scp>=0.7.0
+jinja2>=2.7.1
+PyYAML>=5.1
+paramiko>=3.5.0
+six
+pyserial
+yamlordereddictloader
+pyparsing
+transitions

From f187f59c49ba10890876330baded5498b830ac27 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 23 Oct 2024 20:25:45 +0530
Subject: [PATCH 31/34] PyEZ 2.7.3.dev0 updated

---
 README.md                 | 2 +-
 RELEASE-NOTES.md          | 7 ++++++-
 lib/jnpr/junos/version.py | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 592a08d70..b6bfcd848 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ Juniper Networks is actively contributing to and maintaining this repo. Please c
 
 *Contributors:*
 
-
+* v2.7.2: [Dinesh Babu](https://github.com/dineshbaburam91), [Chidanand Pujar](https://github.com/chidanandpujar)
 * v2.7.1: [Dinesh Babu](https://github.com/dineshbaburam91)
 * v2.6.4: [Chidanand Pujar](https://github.com/chidanandpujar)
 * v2.6.3: [Rahul Kumar](https://github.com/rahkumar651991)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index aabcfea81..222c12309 100755
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,4 +1,9 @@
-## Release 2.7.2 - 23 Oct 2024
+## Release 2.7.3.dev0 - 23 OCT 2024
+## Features Added
+
+## Bugs Fixed
+
+## Release 2.7.2 - 23 OCT 2024
 ## Features Added
 - Introduced bind_addr parameter in Device() API #1279
 - Introduced vmhost paramater in dev.facts #1333
diff --git a/lib/jnpr/junos/version.py b/lib/jnpr/junos/version.py
index ac35cfa9e..130c26776 100644
--- a/lib/jnpr/junos/version.py
+++ b/lib/jnpr/junos/version.py
@@ -1,4 +1,4 @@
-VERSION = "2.7.2"
+VERSION = "2.7.3.dev0"
 DATE = "2024-Oct-23"
 
 # Augment with the internal version if present

From cace78b081a46d72523d7a04bfe7fda1f36d7d3d Mon Sep 17 00:00:00 2001
From: Dinesh babu <dineshbaburam91@rediffmail.com>
Date: Thu, 24 Oct 2024 07:32:31 +0530
Subject: [PATCH 32/34] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b6bfcd848..8747559a5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![PyPi Version](https://img.shields.io/pypi/v/junos-eznc.svg)](https://pypi.python.org/pypi/junos-eznc/)
-[![Documentation Status](https://readthedocs.org/projects/junos-pyez/badge/?version=stable)](http://junos-pyez.readthedocs.io)
+[![Documentation Status](https://readthedocs.org/projects/junos-pyez/badge/?version=stable)](https://junos-pyez.readthedocs.io/en/latest/)
 [![Coverage Status](https://img.shields.io/coveralls/Juniper/py-junos-eznc.svg)](https://coveralls.io/r/Juniper/py-junos-eznc)
 [![UnitTest Status](https://travis-ci.org/Juniper/py-junos-eznc.svg?branch=master)](https://travis-ci.org/Juniper/py-junos-eznc)
 [![](https://images.microbadger.com/badges/image/juniper/pyez.svg)](https://microbadger.com/images/juniper/pyez)

From 5d5d8a487d211d2a467c8de931098377a3b9628f Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 27 Nov 2024 18:54:50 +0530
Subject: [PATCH 33/34] Dockerfile update

---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b9c6a4c7..567130a2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM python:3.12-alpine
 
 LABEL net.juniper.description="Junos PyEZ library for Python in a lightweight container." \
       net.juniper.maintainer="jnpr-community-netdev@juniper.net"
@@ -12,15 +12,12 @@ ADD requirements.txt .
 ADD lib lib 
 ADD entrypoint.sh /usr/local/bin/.
 
-## Install dependencies
+## Install dependancies and PyEZ
 RUN apk add --no-cache build-base python3-dev \
     libxslt-dev libxml2-dev libffi-dev openssl-dev curl \
     ca-certificates py3-pip bash
 
-## Update as per PEP 668. Use Virtual Env
-RUN python3 -m venv /scripts/.venv \
-    && source /scripts/.venv/bin/activate \
-    && pip install --upgrade pip \
+RUN pip install --upgrade pip \
     && pip install pipdeptree \
     && python3 -m pip install -r requirements.txt \
     && pip install .

From baadb7c005d7a7b66ec5bd298984a86608a1be06 Mon Sep 17 00:00:00 2001
From: chidanandpujar <chidanandpujar@gmail.com>
Date: Wed, 27 Nov 2024 19:02:55 +0530
Subject: [PATCH 34/34] Dockerfile update

---
 entrypoint.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index af403b5f7..ecf2b2fbc 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -18,8 +18,11 @@ function pip_install {
 }
 
 function run_scripts {
-    echo "Executing defined script"
-    python3 $1 ${@:2}
+    if [ "$1" = "python3" ] || [ "$1" = "python" ]; then python3
+    else
+      echo "Executing defined script"
+      $1 ${@:2}
+    fi
 }
 
 ## Manually defined variables will take precedence