Accepting request 805820 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/805820
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-napalm-asa?expand=0&rev=2

napalm3.patch

@@ -0,0 +1,48 @@
+Index: napalm-asa-0.1.1/napalm_asa/asa.py
+===================================================================
+--- napalm-asa-0.1.1.orig/napalm_asa/asa.py
++++ napalm-asa-0.1.1/napalm_asa/asa.py
+@@ -30,7 +30,6 @@ from collections import OrderedDict
+ from netaddr import IPNetwork
+ 
+ from napalm.base import NetworkDriver
+-from napalm.base.utils import py23_compat
+ from napalm.base.exceptions import (
+     ConnectionException,
+     CommandErrorException,
+@@ -70,7 +69,7 @@ class RespFetcherHttps:
+             else:
+                 return (False, token_request.status_code)
+         except requests.exceptions.RequestException as e:
+-            raise ConnectionException(py23_compat.text_type(e))
++            raise ConnectionException(str(e))
+ 
+     def delete_token(self):
+         """Delete auth token."""
+@@ -85,7 +84,7 @@ class RespFetcherHttps:
+             else:
+                 return (False, token_delete_request.status_code)
+         except requests.exceptions.RequestException as e:
+-            raise ConnectionException(py23_compat.text_type(e))
++            raise ConnectionException(str(e))
+ 
+     def get_resp(self, endpoint="", data=None):
+         """Get response from device and returne parsed json."""
+@@ -103,7 +102,7 @@ class RespFetcherHttps:
+ 
+             return f.json()
+         except requests.exceptions.RequestException as e:
+-            raise ConnectionException(py23_compat.text_type(e))
++            raise ConnectionException(str(e))
+ 
+ 
+ class ASADriver(NetworkDriver):
+@@ -276,7 +275,7 @@ class ASADriver(NetworkDriver):
+ 
+         return interfaces
+ 
+-    def get_config(self, retrieve='all'):
++    def get_config(self, retrieve='all', full=False, sanitized=False):
+         """Get config."""
+         config = {
+             'startup': '',

python-napalm-asa.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri May 15 11:04:03 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Add patch napalm3.patch
+  * make the package compatible with python-napalm 3.0.0
+
+-------------------------------------------------------------------
+Wed May  6 09:51:15 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Format with spec-cleaner
+
 -------------------------------------------------------------------
 Thu Oct 10 21:32:04 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 

python-napalm-asa.spec

@@ -1,6 +1,7 @@
 #
 # spec file for package python-napalm-asa
 #
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2019, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,29 +13,32 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# skip py2 as napalm dropped py2
+%define skip_python2 1
 Name:           python-napalm-asa
 Version:        0.1.1
 Release:        0
-License:        Apache-2.0
 Summary:        NAPALM - Cisco ASA Driver network driver
-Url:            https://github.com/napalm-automation-community/napalm-asa
-Group:          Development/Languages/Python
+License:        Apache-2.0
+URL:            https://github.com/napalm-automation-community/napalm-asa
 Source:         https://github.com/napalm-automation-community/napalm-asa/archive/v0.1.1.tar.gz#/napalm-asa-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
+Patch0:         napalm3.patch
 BuildRequires:  %{python_module setuptools}
-# SECTION test requirements
-BuildRequires:  %{python_module napalm >= 2.0.0}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module pytest-cov}
-BuildRequires:  %{python_module pylama}
-# /SECTION
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 Requires:       python-napalm >= 2.0.0
 BuildArch:      noarch
+# SECTION test requirements
+BuildRequires:  %{python_module napalm >= 2.0.0}
+BuildRequires:  %{python_module pylama}
+BuildRequires:  %{python_module pytest-cov}
+BuildRequires:  %{python_module pytest}
+# /SECTION
 %python_subpackages
 
 %description
@@ -45,6 +49,7 @@ ASAv, ASA on Firepower and ISA 3000 platforms.
 
 %prep
 %setup -q -n napalm-asa-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -54,7 +59,10 @@ ASAv, ASA on Firepower and ISA 3000 platforms.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%pytest
+# Although the napalm3.patch fixes the methods signatures in test_method_signatures (to preserve compatibility), 
+# there is no support for get_config(sanitized=True)
+# test_get_interfaces has obsolete model
+%pytest -k "not (test_get_config_sanitized or (test_get_interfaces and not test_get_interfaces_))"
 
 %files %{python_files}
 %license LICENSE