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

atomicapp/providers/lib/kubeshift/kubernetes.py

@@ -17,11 +17,11 @@
  along with Atomic App. If not, see <http://www.gnu.org/licenses/>.
 """
 
-from urlparse import urljoin
-from urllib import urlencode
 import logging
 import re
 
+from urlparse import urljoin
+from urllib import urlencode
 from atomicapp.constants import LOGGER_DEFAULT
 from atomicapp.providers.lib.kubeshift.kubebase import KubeBase
 from atomicapp.providers.lib.kubeshift.exceptions import (KubeKubernetesError)
@@ -39,7 +39,7 @@ def __init__(self, config):
 
         '''
 
-        # Pass in the configuration data (.kube/config object) to the KubeBase
+        # The configuration data passed in will be .kube/config data, so process is accordingly.
         self.api = KubeBase(config)
 
         # Check the API url
@@ -75,7 +75,9 @@ def create(self, obj, namespace):
         '''
         name = self._get_metadata_name(obj)
         kind, url = self._generate_kurl(obj, namespace)
+
         self.api.request("post", url, data=obj)
+
         logger.info("%s '%s' successfully created", kind.capitalize(), name)
 
     def delete(self, obj, namespace):
@@ -99,8 +101,8 @@ def delete(self, obj, namespace):
 
         if kind in ['rcs', 'replicationcontrollers']:
             self.scale(obj, namespace)
-
         self.api.request("delete", url)
+
         logger.info("%s '%s' successfully deleted", kind.capitalize(), name)
 
     def scale(self, obj, namespace, replicas=0):