refactor

atomicapp/constants.py

@@ -76,6 +76,7 @@
 PROVIDER_CA_KEY = "provider-cafile"
 
 K8S_DEFAULT_API = "http://localhost:8080"
+OC_DEFAULT_API = "http://localhost:8443"
 
 # Persistent Storage Formats
 PERSISTENT_STORAGE_FORMAT = ["ReadWriteOnce", "ReadOnlyMany", "ReadWriteMany"]

atomicapp/providers/lib/kubeshift/client.py

@@ -18,6 +18,7 @@
 """
 
 from atomicapp.providers.lib.kubeshift.kubernetes import KubeKubernetesClient
+from atomicapp.providers.lib.kubeshift.openshift import KubeOpenshiftClient
 from atomicapp.providers.lib.kubeshift.exceptions import KubeClientError
 from atomicapp.constants import LOGGER_DEFAULT
 import logging
@@ -41,6 +42,9 @@ def __init__(self, config, provider):
         if provider is "kubernetes":
             self.connection = KubeKubernetesClient(config)
             logger.debug("Using Kubernetes Provider KubeClient library")
+        elif provider is "openshift":
+            self.connection = KubeOpenshiftClient(config)
+            logger.debug("Using OpenShift Provider KubeClient library")
         else:
             raise KubeClientError("No provider by that name.")
 

atomicapp/providers/lib/kubeshift/kubebase.py

@@ -178,7 +178,7 @@ def get_resources(self, url):
 
     def test_connection(self, url):
         self.api.request("get", url)
-        logger.debug("Connection successfully tested")
+        logger.debug("Connection successfully tested on URL %s" % url)
 
     @staticmethod
     def cert_file(data, key):
@@ -337,7 +337,7 @@ def _request_method(self, method, url, data):
             data (object): object of the data that is being passed (will be converted to json)
         '''
         if method.lower() == "get":
-            res = self.api.get(url)
+            res = self.api.get(url, json=data)
         elif method.lower() == "post":
             res = self.api.post(url, json=data)
         elif method.lower() == "put":

atomicapp/providers/lib/kubeshift/kubeconfig.py

@@ -75,6 +75,9 @@ def from_params(api=None, auth=None, ca=None, verify=True):
 
         if ca:
             config['clusters'][0]['cluster']['certificate-authority'] = ca
+
+        if verify is False:
+            config['clusters'][0]['cluster']['insecure-skip-tls-verify'] = 'true'
         return config
 
     @staticmethod