Fixups and Python 3.11 Environment

apiclient/rancher_api/api.py

@@ -68,25 +68,21 @@ def __repr__(self):
     def _get(self, path, **kwargs):
         url = urljoin(self.endpoint, path)
         resp = self.session.get(url, **kwargs)
-        print(f"{resp.request.method} {resp.request.url}")
         return resp
 
     def _post(self, path, **kwargs):
         url = urljoin(self.endpoint, path)
         resp = self.session.post(url, **kwargs)
-        print(f"{resp.request.method} {resp.request.url}")
         return resp
 
     def _put(self, path, **kwargs):
         url = urljoin(self.endpoint, path)
         resp = self.session.put(url, **kwargs)
-        print(f"{resp.request.method} {resp.request.url}")
         return resp
 
     def _delete(self, path, **kwargs):
         url = urljoin(self.endpoint, path)
         resp = self.session.delete(url, **kwargs)
-        print(f"{resp.request.method} {resp.request.url}")
         return resp
 
     def authenticate(self, user, passwd, **kwargs):

apiclient/rancher_api/managers.py

@@ -810,8 +810,11 @@ def delete(self, name, *, raw=False):
         return self._delete(self.PATH_fmt.format(uid=name), raw=raw)
 
     def generate_kubeconfig(self, name, *, raw=False):
-        params = {'action': 'generateKubeconfig'}
-        return self._create(f"v3/clusters/{name}", raw=raw, params=params)
+        return self._create(
+            self.PATH1_fmt.format(uid=name),
+            raw=raw,
+            params={'action': 'generateKubeconfig'}
+        )
 
     def explore(self, name):
         from .cluster_api import ClusterExploreAPI  # circular dependency

harvester_e2e_tests/fixtures/settings.py

@@ -16,8 +16,7 @@ def __init__(self):
         def _storage_net_configured(self):
             code, data = self.settings.get('storage-network')
 
-            cs = data.get('status', {}).get('conditions')
-            if cs:
+            if (cs := data.get('status', {}).get('conditions')):
                 if 'True' == cs[-1].get('status') and 'Completed' == cs[-1].get('reason'):
                     return True, (code, data)
             return False, (code, data)

harvester_e2e_tests/integrations/test_upgrade.py

@@ -507,8 +507,7 @@ def test_degraded_volume(self, api_client, wait_timeout, vm_shell_from_host,
         # https://github.com/harvester/harvester/issues/6425
         code, data = api_client.hosts.get()
         assert 200 == code, (code, data)
-        cluster_size = len(data['data'])
-        if cluster_size < 3:
+        if (cluster_size := len(data['data'])) < 3:
             pytest.skip(
                 f"Degraded volumes only checked on 3+ nodes cluster, skip on {cluster_size}."
             )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py38,pep8,testenv
+envlist = py38,py311,pep8,testenv
 # TODO(gyee): we are not distributing the test code right now. Will need
 # to revisit this once we have majority of the tests developed.
 skipsdist = True
@@ -20,6 +20,9 @@ commands =
   pytest -c {env:PYTEST_CONFIG:{toxinidir}/tox.ini} {posargs}
 passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VERSION
 
+[testenv:py311]
+basepython = python3.11
+
 [testenv:pep8]
 deps = flake8
 commands =
@@ -31,7 +34,3 @@ max-line-length = 99
 [pytest]
 initial_sort = original
 render_collapsed = all
-
-[testenv:py36]
-setenv =
-    PYTEST_CONFIG = {toxinidir}/py36_pytest.ini