diff --git a/.gitignore b/.gitignore
index 0094ce2..3e59c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /python-neutronclient-6.7.0.tar.gz
 /python-neutronclient-6.12.0.tar.gz
 /python-neutronclient-6.14.0.tar.gz
+/python-neutronclient-7.1.1.tar.gz
diff --git a/python-neutronclient.spec b/python-neutronclient.spec
index 3467a2d..47763cc 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -1,14 +1,3 @@
-# Macros for py2/py3 compatibility
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global pyver %{python3_pkgversion}
-%else
-%global pyver 2
-%endif
-%global pyver_bin python%{pyver}
-%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
-%global pyver_install %{expand:%{py%{pyver}_install}}
-%global pyver_build %{expand:%{py%{pyver}_build}}
-# End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global with_doc 1
 
@@ -20,8 +9,8 @@ Client library and command line utility for interacting with OpenStack \
 Neutron's API.
 
 Name:       python-neutronclient
-Version:    6.14.0
-Release:    3%{?dist}
+Version:    7.1.1
+Release:    1%{?dist}
 Summary:    Python API and CLI for OpenStack Neutron
 
 License:    ASL 2.0
@@ -35,70 +24,63 @@ Obsoletes:  python-%{sname}-tests <= 4.1.1-3
 %description
 %{common_desc}
 
-%package -n python%{pyver}-%{sname}
+%package -n python3-%{sname}
 Summary:    Python API and CLI for OpenStack Neutron
-%{?python_provide:%python_provide python%{pyver}-%{sname}}
-%if %{pyver} == 3
+%{?python_provide:%python_provide python3-%{sname}}
 Obsoletes: python2-%{sname} < %{version}-%{release}
-%endif
 
 BuildRequires: git
-BuildRequires: python%{pyver}-devel
-BuildRequires: python%{pyver}-setuptools
-BuildRequires: python%{pyver}-pbr
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-pbr
 # Required for unit tests
-BuildRequires: python%{pyver}-osc-lib-tests
-BuildRequires: python%{pyver}-oslotest
-BuildRequires: python%{pyver}-testtools
-BuildRequires: python%{pyver}-testrepository
-BuildRequires: python%{pyver}-testscenarios
-BuildRequires: python%{pyver}-keystoneauth1
-BuildRequires: python%{pyver}-keystoneclient
-BuildRequires: python%{pyver}-os-client-config
-BuildRequires: python%{pyver}-osc-lib
-BuildRequires: python%{pyver}-oslo-log
-BuildRequires: python%{pyver}-oslo-serialization
-BuildRequires: python%{pyver}-oslo-utils
-BuildRequires: python%{pyver}-cliff
-
-Requires: python%{pyver}-babel >= 2.3.4
-Requires: python%{pyver}-iso8601 >= 0.1.11
-Requires: python%{pyver}-os-client-config >= 1.28.0
-Requires: python%{pyver}-oslo-i18n >= 3.15.3
-Requires: python%{pyver}-oslo-log >= 3.36.0
-Requires: python%{pyver}-oslo-serialization >= 2.18.0
-Requires: python%{pyver}-oslo-utils >= 3.33.0
-Requires: python%{pyver}-pbr
-Requires: python%{pyver}-requests >= 2.14.2
-Requires: python%{pyver}-six >= 1.10.0
-Requires: python%{pyver}-debtcollector >= 1.2.0
-Requires: python%{pyver}-osc-lib >= 1.10.0
-Requires: python%{pyver}-keystoneauth1 >= 3.4.0
-Requires: python%{pyver}-keystoneclient >= 1:3.8.0
-Requires: python%{pyver}-cliff >= 2.8.0
-Requires: python%{pyver}-netaddr >= 0.7.18
-
-# Handle python2 exception
-%if %{pyver} == 2
-Requires: python-simplejson >= 3.5.1
-%else
-Requires: python%{pyver}-simplejson >= 3.5.1
-%endif
-
-%description -n python%{pyver}-%{sname}
+BuildRequires: python3-osc-lib-tests
+BuildRequires: python3-oslotest
+BuildRequires: python3-testtools
+BuildRequires: python3-testrepository
+BuildRequires: python3-testscenarios
+BuildRequires: python3-keystoneauth1
+BuildRequires: python3-keystoneclient
+BuildRequires: python3-os-client-config
+BuildRequires: python3-osc-lib
+BuildRequires: python3-oslo-log
+BuildRequires: python3-oslo-serialization
+BuildRequires: python3-oslo-utils
+BuildRequires: python3-cliff
+
+Requires: python3-babel >= 2.3.4
+Requires: python3-iso8601 >= 0.1.11
+Requires: python3-os-client-config >= 1.28.0
+Requires: python3-oslo-i18n >= 3.15.3
+Requires: python3-oslo-log >= 3.36.0
+Requires: python3-oslo-serialization >= 2.18.0
+Requires: python3-oslo-utils >= 3.33.0
+Requires: python3-pbr
+Requires: python3-requests >= 2.14.2
+Requires: python3-six >= 1.10.0
+Requires: python3-debtcollector >= 1.2.0
+Requires: python3-osc-lib >= 1.10.0
+Requires: python3-keystoneauth1 >= 3.4.0
+Requires: python3-keystoneclient >= 1:3.8.0
+Requires: python3-cliff >= 2.8.0
+Requires: python3-netaddr >= 0.7.18
+
+Requires: python3-simplejson >= 3.5.1
+
+%description -n python3-%{sname}
 %{common_desc}
 
-%package -n python%{pyver}-%{sname}-tests
+%package -n python3-%{sname}-tests
 Summary:    Python API and CLI for OpenStack Neutron - Unit tests
-%{?python_provide:%python_provide python%{pyver}-%{sname}-tests}
-Requires: python%{pyver}-%{sname} == %{version}-%{release}
-Requires: python%{pyver}-osc-lib-tests
-Requires: python%{pyver}-oslotest
-Requires: python%{pyver}-testtools
-Requires: python%{pyver}-testrepository
-Requires: python%{pyver}-testscenarios
-
-%description -n python%{pyver}-%{sname}-tests
+%{?python_provide:%python_provide python3-%{sname}-tests}
+Requires: python3-%{sname} == %{version}-%{release}
+Requires: python3-osc-lib-tests
+Requires: python3-oslotest
+Requires: python3-testtools
+Requires: python3-testrepository
+Requires: python3-testscenarios
+
+%description -n python3-%{sname}-tests
 %{common_desc}
 
 This package containts the unit tests.
@@ -107,9 +89,9 @@ This package containts the unit tests.
 %package doc
 Summary:          Documentation for OpenStack Neutron API Client
 
-BuildRequires:    python%{pyver}-sphinx
-BuildRequires:    python%{pyver}-openstackdocstheme
-BuildRequires:    python%{pyver}-reno
+BuildRequires:    python3-sphinx
+BuildRequires:    python3-openstackdocstheme
+BuildRequires:    python3-reno
 
 %description      doc
 %{common_desc}
@@ -122,39 +104,39 @@ BuildRequires:    python%{pyver}-reno
 rm -rf *requirements.txt
 
 %build
-%{pyver_build}
+%{py3_build}
 
 %if 0%{?with_doc}
 # Build HTML docs
 export PYTHONPATH=.
-sphinx-build-%{pyver} -W -b html doc/source doc/build/html
+sphinx-build -W -b html doc/source doc/build/html
 
 # Fix hidden-file-or-dir warnings
 rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
 %endif
 
 %install
-%{pyver_install}
+%{py3_install}
 
 # Create a versioned binary for backwards compatibility until everything is pure py3
-ln -s %{cname} %{buildroot}%{_bindir}/%{cname}-%{pyver}
+ln -s %{cname} %{buildroot}%{_bindir}/%{cname}-3
 
 %check
 # (TODO) Ignore unit tests results until https://bugs.launchpad.net/python-neutronclient/+bug/1783789
 # is fixed.
-%{pyver_bin} setup.py testr || true
+%{__python3} setup.py testr || true
 
-%files -n python%{pyver}-%{sname}
+%files -n python3-%{sname}
 %doc README.rst
 %license LICENSE
-%{pyver_sitelib}/%{sname}
-%{pyver_sitelib}/*.egg-info
+%{python3_sitelib}/%{sname}
+%{python3_sitelib}/*.egg-info
 %{_bindir}/%{cname}
-%{_bindir}/%{cname}-%{pyver}
-%exclude %{pyver_sitelib}/%{sname}/tests
+%{_bindir}/%{cname}-3
+%exclude %{python3_sitelib}/%{sname}/tests
 
-%files -n python%{pyver}-%{sname}-tests
-%{pyver_sitelib}/%{sname}/tests
+%files -n python3-%{sname}-tests
+%{python3_sitelib}/%{sname}/tests
 
 %if 0%{?with_doc}
 %files doc
@@ -163,6 +145,9 @@ ln -s %{cname} %{buildroot}%{_bindir}/%{cname}-%{pyver}
 %endif
 
 %changelog
+* Thu Jun 04 2020 Joel Capitao <jcapitao@redhat.com> 7.1.1-1
+- Update to upstream version 7.1.1
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.14.0-3
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 6ae117e..432af87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-neutronclient-6.14.0.tar.gz) = f039c6948feedd6f8efc80e0140a9229a5f470c108e4b2ebd55cf308dbbb3da6bed1559503c7d8aa9e886591ca47460884e3068d1130e9dfc88ad28f1ac04d63
+SHA512 (python-neutronclient-7.1.1.tar.gz) = a9fbd62665abd3a4009c6d934ed51c69a029ca3d4a3d37d073e0c2facf4b50e1a651a389c266b62ee27cfa81f7b973fe6a3d27577f8ec83bc1e8357278380c7b