openshift-client 2.0.5__tar.gz → 2.0.6__tar.gz

{openshift_client-2.0.5 → openshift_client-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: openshift-client
-Version: 2.0.5
+Version: 2.0.6
 Summary: OpenShift python client
 Author-email: Justin Pierce <jupierce@redhat.com>
 Maintainer-email: Brad Williams <brawilli@redhat.com>
@@ -216,6 +216,7 @@ Requires-Dist: six
 Requires-Dist: pyyaml
 Provides-Extra: ssh
 Requires-Dist: paramiko; extra == "ssh"
+Dynamic: license-file
 
 # Openshift Python Client
 
@@ -806,7 +807,7 @@ Establishing explicit contexts within an application will override these environ
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_PATH` - default path to use when invoking `oc`
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CONFIG_PATH` - default `--kubeconfig` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_API_SERVER` - default `--server` argument
-- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--cacert` argument
+- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--certificate-authority` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_PROJECT` - default `--namespace` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_LOGLEVEL` - default `--loglevel` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_SKIP_TLS_VERIFY` - default `--insecure-skip-tls-verify`

{openshift_client-2.0.5 → openshift_client-2.0.6}/README.md

@@ -587,7 +587,7 @@ Establishing explicit contexts within an application will override these environ
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_PATH` - default path to use when invoking `oc`
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CONFIG_PATH` - default `--kubeconfig` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_API_SERVER` - default `--server` argument
-- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--cacert` argument
+- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--certificate-authority` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_PROJECT` - default `--namespace` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_LOGLEVEL` - default `--loglevel` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_SKIP_TLS_VERIFY` - default `--insecure-skip-tls-verify`

{openshift_client-2.0.5 → openshift_client-2.0.6}/packages/openshift_client/__init__.py

@@ -12,7 +12,7 @@ from . import config
 from .ansible import ansible
 
 # Single source for module version
-__VERSION__ = '2.0.5'
+__VERSION__ = '2.0.6'
 
 null = None  # Allow scripts to specify null in object definitions
 

{openshift_client-2.0.5 → openshift_client-2.0.6}/packages/openshift_client/action.py

@@ -246,7 +246,7 @@ def oc_action(context, verb, cmd_args=None, all_namespaces=False, no_namespace=F
         cmds.append('--token={}'.format(context.get_token()))
 
     if context.get_ca_cert_path() is not None:
-        cmds.append('--cacert={}'.format(context.get_ca_cert_path()))
+        cmds.append('--certificate-authority={}'.format(context.get_ca_cert_path()))
 
     if all_namespaces:
         cmds.append("--all-namespaces")

{openshift_client-2.0.5 → openshift_client-2.0.6}/packages/openshift_client/base_verbs.py

@@ -1,24 +1,25 @@
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import print_function
 
-import os
 import base64
 import io
+import json
+import os
 import sys
-import traceback
 import time
-import json
-import yaml
+import traceback
+
 import six
+import yaml
 
-from .selector import Selector, selector
+from . import naming
+from . import util
 from .action import oc_action
-from .context import cur_context, project, no_tracking
-from .result import Result
 from .apiobject import APIObject
+from .context import cur_context, project, no_tracking
 from .model import Model, Missing, OpenShiftPythonException
-from . import util
-from . import naming
+from .result import Result
+from .selector import Selector, selector
 
 
 def eprint(*args, **kwargs):
@@ -86,6 +87,18 @@ def whoami(cmd_args=None):
     return r.out().strip()
 
 
+def api_url(cmd_args=None):
+    """
+    :param cmd_args: An optional list of additional arguments to pass on the command line
+    :return: The current server's REST API url
+    """
+
+    r = Result("whoami")
+    r.add_action(oc_action(cur_context(), "whoami", cmd_args=['--show-server', cmd_args]))
+    r.fail_if("Unable to determine current server's REST API url")
+    return r.out().strip()
+
+
 def get_auth_token(cmd_args=None):
     """
     :param cmd_args: An optional list of additional arguments to pass on the command line
@@ -1059,7 +1072,7 @@ def build_imagestream_simple(imagestream_name,
 
     spec = {
         'lookupPolicy': {
-                'local': local_lookup_policy
+            'local': local_lookup_policy
         }
     }
 

{openshift_client-2.0.5 → openshift_client-2.0.6}/packages/openshift_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: openshift-client
-Version: 2.0.5
+Version: 2.0.6
 Summary: OpenShift python client
 Author-email: Justin Pierce <jupierce@redhat.com>
 Maintainer-email: Brad Williams <brawilli@redhat.com>
@@ -216,6 +216,7 @@ Requires-Dist: six
 Requires-Dist: pyyaml
 Provides-Extra: ssh
 Requires-Dist: paramiko; extra == "ssh"
+Dynamic: license-file
 
 # Openshift Python Client
 
@@ -806,7 +807,7 @@ Establishing explicit contexts within an application will override these environ
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_PATH` - default path to use when invoking `oc`
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CONFIG_PATH` - default `--kubeconfig` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_API_SERVER` - default `--server` argument
-- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--cacert` argument
+- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--certificate-authority` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_PROJECT` - default `--namespace` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_LOGLEVEL` - default `--loglevel` argument
 - `OPENSHIFT_CLIENT_PYTHON_DEFAULT_SKIP_TLS_VERIFY` - default `--insecure-skip-tls-verify`