bump to 0.21.0

dmulyalin · Jan 18, 2024 · 9f5cb40 · 9f5cb40
1 parent 86890b2
commit 9f5cb40
Show file tree

Hide file tree

Showing 8 changed files with 1,652 additions and 1,764 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "salt_nornir"
-version = "0.20.7"
+version = "0.21.0"
 description = "Salt-Nornir Proxy Minion SaltStack Modules"
 authors = ["Denis Mulyalin <[email protected]>"]
 maintainers = ["Denis Mulyalin <[email protected]>"]
@@ -22,50 +22,50 @@ classifiers = [
 
 [tool.poetry.dependencies]
 # mandatory dependencies
-python = ">=3.7,<4.0"
-nornir = "3.3.0"
-pydantic = ">=1.10.2,<=2.3.0"
-nornir_salt = "0.20.*"
+python = ">=3.8,<4.0"
+nornir = ">=3.3.0,<=3.4.1"
+pydantic = ">=1.10.2,<=2.5.3"
+nornir_salt = "0.21.*"
 psutil = ">=5.8.*,<6.*"
 
 # optional dependencies for extras definition
-cerberus = { version = "1.3.4", optional = true }
-genie = { version = "23.7", markers = "sys_platform != 'win32'", optional = true, extras = ['full'] }
+cerberus = { version = "1.3.5", optional = true }
+genie = { version = "23.11", markers = "sys_platform != 'win32'", optional = true, extras = ['full'] }
 jmespath = { version = "1.0.1", optional = true }
 napalm = { version = "4.1.0", optional = true }
-ncclient = { version = "0.6.13", optional = true }
-netmiko = { version = "4.1.2", optional = true }
+ncclient = { version = "0.6.15", optional = true }
+netmiko = { version = "4.3.0", optional = true }
 nornir-napalm = { version = "0.4.0", optional = true }
-nornir-netmiko = { version = "1.0.0", optional = true }
+nornir-netmiko = { version = "1.0.1", optional = true }
 nornir-scrapli = { version = "2023.7.30", optional = true }
-ntc-templates = { version = "^3.0.0", optional = true }
-paramiko = { version = "2.12.0", optional = true }
-pyats = { version = "23.7", markers = "sys_platform != 'win32'", optional = true, extras = ['full'] }
-pygnmi = { version = "0.8.12", optional = true }
-pynetbox = { version = "7.0.1", optional = true }
+ntc-templates = { version = "4.1.0", optional = true }
+paramiko = { version = "3.4.0", optional = true }
+pyats = { version = "23.11", markers = "sys_platform != 'win32'", optional = true, extras = ['full'] }
+pygnmi = { version = "0.8.13", optional = true }
+pynetbox = { version = "7.3.3", optional = true }
 pyyaml = { version = "6.0.1", optional = true }
 puresnmp = { version = "2.0.0", optional = true, extras = ['crypto'] }
-requests = { version = "2.25.1", optional = true }
+requests = { version = "2.31.0", optional = true }
 scrapli = { version = "2023.7.30", optional = true }
 scrapli-community = { version = "2023.7.30", optional = true }
 scrapli-netconf = { version = "2023.7.30", optional = true }
 tabulate = { version = "0.9.0", optional = true }
 ttp = { version = "0.9.*", optional = true }
 ttp-templates = { version = "0.3.*", optional = true }
 xmltodict = { version = "0.13.0", optional = true }
-lxml = { version = "4.9.3", optional = true }
-textfsm = { version = "1.1.2", optional = true }
-jinja2 = { version = "3.1.2", optional = true }
-rich = { version = "13.5.2", optional = true }
+lxml = { version = ">=4.9.3,<5.1.0", optional = true }
+textfsm = { version = "1.1.3", optional = true }
+jinja2 = { version = "3.1.3", optional = true }
+rich = { version = "13.7.0", optional = true }
 N2G = { version = "0.3.*", optional = true }
-robotframework = { version = "6.1.1", optional = true }
+robotframework = { version = "7.0", optional = true }
 dnspython = { version = "2.4.2", optional = true, python = ">=3.8,<4.0"}
-diskcache = { version = "5.6.1", optional = true }
+diskcache = { version = "5.6.3", optional = true }
 pythonping = { version = "1.1.4", optional = true }
 picle = { version = "0.2.*", optional = true }
 
 # docs dependencies for extras definition
-readthedocs-sphinx-search = { version = "0.1.1", optional = true }
+readthedocs-sphinx-search = { version = "0.3.2", optional = true }
 Sphinx = { version = "4.3.0", optional = true }
 sphinx_rtd_theme = { version = "1.0.0", optional = true }
 sphinxcontrib-applehelp = { version = "1.0.1", optional = true }

diff --git a/test/Dockerfile.py39.saltstack b/test/Dockerfile.py39.saltstack
@@ -22,7 +22,7 @@ RUN pip install --no-cache-dir /tmp/nornir_salt/.[prodmaxmaster] --upgrade && \
     pip install --no-cache-dir /tmp/nornir_salt/.[prodmaxminion] --upgrade && \
     pip install --no-cache-dir /tmp/salt_nornir/.[prodmaxminion] --upgrade
 
-RUN USE_STATIC_REQUIREMENTS=1 pip install --no-cache-dir salt==3006.2
+RUN USE_STATIC_REQUIREMENTS=1 pip install --no-cache-dir salt==3006.5
 
 ENTRYPOINT ["/usr/bin/dumb-init"]
 CMD ["/usr/local/bin/saltinit"]
diff --git a/test/pytest/netbox_data.py b/test/pytest/netbox_data.py
@@ -10,38 +10,38 @@
 log = logging.getLogger(__name__)
 
 NB_VERSION = None
-NB_URL = "http://192.168.1.130:8000/"
-NB_URL_SSL = "https://192.168.1.130:443/"
+NB_URL = "http://192.168.4.130:8000/"
+NB_URL_SSL = "https://192.168.4.130:443/"
 NB_USERNAME = "admin"
 NB_PASSWORD = "admin"
 NB_API_TOKEN = "0123456789abcdef0123456789abcdef01234567"
 NB_SECRETS_PRIVATE_KEY = """
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA82kitu278RaOyvgKu6Qjqs2ubDFO4lUYLsiN8tvKeYh4NPtZ
-EbVCeeks3xl3AUP3G88WaBZgrV0uH5okQyfHGV6DtKf+p2Efio2Lwru224KyqHHs
-Bbq+qrWxy6sAISm6phY8uHGz0kHhvGycUcVHuViGqkzOuILUYlC/PgqU3jG6HB9S
-9UiUxQ5UqY7gb6W8K+CLFlQ4u7LNwEaOCz6XMbS6gElE+sq772HJxN84wETPEdY8
-FP21l+KPM96fhWiVb/aAmGhLb8ZTyucKOD2V6wNlxqIVMpPmDaX8oV8trEpzAl+S
-tossH5MOVUJ9fdjBKa0P+qRDHFXjXMBSIiUM5QIDAQABAoIBAAnnaPlwTmGb9Ubr
-v+9hxBlsIYZMR6VSE41nF87TeRdSrBtxxQPBWuQAJBUsIX63GnvymZA2JYxgRSMV
-ipdYlr4LmF3L08LROESTB6ZZLMfyjIeUjRHa8ZebaXwmksyGo2N5y6eF6YHAWv7n
-nMD/VIYFhK3eDq+Mvoyv3ubXbOERKMIk4/iqrqEhQkyc5w3IQMtuZGxjaDC4qvnW
-QJ0fTiKfWaIkkkrd8TNDbL9cquObNitEdH8MiJJ1/dVbDHLTznjOjcUQDA3g3iMS
-ZpgBb996k1O9bQFn9ZqVeNV61zHsXN1fpyPwNoOpFvQxP+5gzLmz41I3wl4dhQO8
-i9aH2EECgYEA97puK3mbXl5LDw8jOH0X3ZomoDePWIBReTSSp5ECKxOaUDg5s5Dk
-r55FVTomsAKK7LOiQjwAVGWB7PSB2ch1hiuPm9z3gUI/RqeemB+5JT+6OoPO3C2M
-2xkij4S8ZM/PTbrRzpmFgpfwDXMwZG2P61BVWHEGuCF0aWgkbQWNxUECgYEA+4nM
-iTd3vg5CPBI6mTefdF9KbIb9lxLGy2OTWBGuN5hK2ypqjZZjtaeGnhVpz8PaRlts
-S+G9OuRiiqU7n0bbdlDGnfuYnqnkE6XX7Bm/FeoRmAi+NN4eH2AoT6793+qo8YLd
-reFCIfY0yf2EGPzB+y+ZNGc/IbmJnPjV01wYaqUCgYEAnXhRbatIeu0fczwhHFhQ
-IlpJsVB/+zbeE1i63G9N3IoCbnm/HAi/hW7rDakATKPhIWNygf3YC83WkARAwmot
-YpMwH1iPsAenZ0dHhdWsgCQJQgblKIp/3goVMPukMcTzNqrJkTV/a6sfOb1+Bmiq
-sl8HUUfPiJ4jfJlphi+glcECgYBXemzvq6KxLjRKv+wxLO7/gcRYSfoXeCg6w76S
-elOkcgpWfkHgS9URb9mZUMkjwHFA1rqrCS7ONG8w2JYLppDcbOsmNkG1rE/tpVea
-fLm/3U+RGDlOGZFQSBi83ZbdMLbghyqhNh3RwdZKCSjPp9eui7c0SlPiXqxFMyTq
-BLVZIQKBgQDoAwAXkSsvqWgOBVr6NlF/3ddPzE0N56c6TQivBIAoFimsTCN+vQ0z
-IECcSdqgqS9dbs/Spgm1DooXZmxnbvL1x3lLTXha9vgjIwWgparGzFGOK5tlIrbt
-m7UUK8pXtoNCGGWdIxJOFBaeYSbCG3Iye3uVHFbU4Y1EZ9d1QVKJJQ==
+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
 -----END RSA PRIVATE KEY-----
 """
 

diff --git a/test/pytest/test_interop_juniper.py b/test/pytest/test_interop_juniper.py
@@ -37,7 +37,7 @@
     client = salt.client.LocalClient()
 
 test_proxy_id = "nrp2"
-JUNOS_DEVICE_IP = "192.168.1.220"
+JUNOS_DEVICE_IP = "192.168.4.220"
 junos_test_device_params = f"""
 name: vSRX-1
 hostname: {JUNOS_DEVICE_IP}

diff --git a/test/salt_master_files/netbox_secrets_private.key b/test/salt_master_files/netbox_secrets_private.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/salt_master_files/pillar/hosts/csr1000v-1.sls b/test/salt_master_files/pillar/hosts/csr1000v-1.sls
@@ -1,9 +1,9 @@
 hosts:
   csr1000v-1:
-    hostname: sandbox-iosxe-recomm-1.cisco.com
+    hostname: sandbox-iosxe-latest-1.cisco.com
     platform: cisco_ios
-    username: developer
-    password: lastorangerestoreball8876
+    username: admin
+    password: C1sco12345
     port: 22
     connection_options:
       pyats:
@@ -13,7 +13,7 @@ hosts:
               os: iosxe
               connections:
                 default:
-                  ip: sandbox-iosxe-recomm-1.cisco.com
+                  ip: sandbox-iosxe-latest-1.cisco.com
                   protocol: ssh
                   port: 22
       http:

diff --git a/test/salt_master_files/pillar/hosts/nxos1.sls b/test/salt_master_files/pillar/hosts/nxos1.sls
@@ -1,6 +1,6 @@
 hosts:
   nxos1:
-    hostname: sandbox-nxos-1.cisco.com
+    hostname: sbx-nxos-mgmt.cisco.com
     platform: nxos_ssh
     username: admin
     password: "Admin_1234!"
@@ -29,6 +29,6 @@ hosts:
                 default:
                   arguments:
                     learn_hostname: true
-                  ip: sandbox-nxos-1.cisco.com
+                  ip: sbx-nxos-mgmt.cisco.com
                   protocol: ssh
                   port: 22