Upgraded openshift client to version > 2.0.1

Pipfile

@@ -45,7 +45,7 @@ widgetastic-patternfly = "*"
 # 3scale-api = {editable = true,path = "./../3scale-api-python"}
 # 3scale-api = {git = "https://github.com/pestanko/3scale-api-python.git", editable = true}
 cfssl = "==0.0.3b243"
-openshift-client = ">=1.0.14"
+openshift-client = ">=2.0.1"
 hyperfoil-client="*"
 paramiko = "*"
 docker = "*"

testsuite/dynaconf_loader.py

@@ -27,7 +27,7 @@
 from packaging.version import Version, InvalidVersion
 from weakget import weakget
 
-from openshift import OpenShiftPythonException
+from openshift_client import OpenShiftPythonException
 from testsuite.openshift.client import OpenShiftClient
 
 log = logging.getLogger(__name__)  # pylint: disable=invalid-name

testsuite/gateways/apicast/system.py

@@ -4,7 +4,7 @@
 
 import backoff
 
-from openshift import OpenShiftPythonException
+from openshift_client import OpenShiftPythonException
 
 from testsuite.capabilities import Capability
 from testsuite.gateways.apicast import AbstractApicast

testsuite/gateways/service_mesh/mesh.py

@@ -4,7 +4,7 @@
 from typing import List
 from urllib.parse import urlparse, urlunparse
 
-from openshift import Selector
+from openshift_client import Selector
 
 from testsuite.openshift.client import OpenShiftClient
 from testsuite.openshift.env import Properties

testsuite/mailhog.py

@@ -7,7 +7,7 @@
 import pytest
 import requests
 
-from openshift import OpenShiftPythonException
+from openshift_client import OpenShiftPythonException
 
 from testsuite.utils import warn_and_skip
 from testsuite.openshift.client import OpenShiftClient

testsuite/openshift/crd/apicast.py

@@ -1,6 +1,6 @@
 """APIcast CRD object"""
 
-from openshift import APIObject, Context
+from openshift_client import APIObject, Context
 
 from testsuite.openshift.client import OpenShiftClient
 

testsuite/openshift/crd/apimanager.py

@@ -2,7 +2,7 @@
 
 from typing import Optional, Set
 
-from openshift import APIObject, Missing
+from openshift_client import APIObject, Missing
 
 
 def _locator(path, apiobj):

testsuite/openshift/crd/operator.py

@@ -1,7 +1,7 @@
 """Module containing Operator object"""
 
-import openshift as oc
-from openshift import APIObject
+import openshift_client as oc
+from openshift_client import APIObject
 
 
 class Operator(APIObject):

testsuite/openshift/deployments.py

@@ -6,7 +6,7 @@
 from contextlib import ExitStack
 from datetime import timezone
 
-import openshift as oc
+import openshift_client as oc
 from testsuite.openshift.env import Environ
 
 if typing.TYPE_CHECKING:

testsuite/tests/conftest.py

@@ -13,7 +13,7 @@
 
 import backoff
 import importlib_resources as resources
-import openshift as oc
+import openshift_client as oc
 import pytest
 from dynaconf.vendor.box.exceptions import BoxKeyError
 from pytest_metadata.plugin import metadata_key

testsuite/tests/grafana/conftest.py

@@ -1,6 +1,6 @@
 """Check for openshift configuration"""
 
-from openshift import Missing
+from openshift_client import Missing
 from weakget import weakget
 import pytest
 

testsuite/tests/ui/billing/braintree/conftest.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 import pytest
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.billing import Braintree
 from testsuite.ui.objects import CreditCard