diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-01-26 14:16:23 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 14:16:23 -0500 | 
| commit | 8f2b3f132bc6cd03640c31c0c33cffb01f80138c (patch) | |
| tree | 6ec0b8b4caed6279c45d14f2979390468b7772bc /roles/lib_openshift/library | |
| parent | a44270f3dfd2c4707138891cfc485e0a82e7dd7c (diff) | |
| parent | b05c1e3bb7f1cd66a326bb7784ec166c4db4395a (diff) | |
| download | openshift-8f2b3f132bc6cd03640c31c0c33cffb01f80138c.tar.gz openshift-8f2b3f132bc6cd03640c31c0c33cffb01f80138c.tar.bz2 openshift-8f2b3f132bc6cd03640c31c0c33cffb01f80138c.tar.xz openshift-8f2b3f132bc6cd03640c31c0c33cffb01f80138c.zip | |
Merge pull request #3183 from kwoodson/oc_scale
Adding oc_scale to lib_openshift.
Diffstat (limited to 'roles/lib_openshift/library')
| -rw-r--r-- | roles/lib_openshift/library/oc_edit.py | 5 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_obj.py | 5 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_route.py | 5 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_scale.py | 1709 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_secret.py | 5 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_version.py | 5 | 
6 files changed, 1719 insertions, 15 deletions
| diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py index 2338d5e8e..ad158e56a 100644 --- a/roles/lib_openshift/library/oc_edit.py +++ b/roles/lib_openshift/library/oc_edit.py @@ -842,12 +842,11 @@ class OpenShiftCLI(object):          cmd = ['get', resource]          if selector:              cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname)          cmd.extend(['-o', 'json']) -        if rname: -            cmd.append(rname) -          rval = self.openshift_cmd(cmd, output=True)          # Ensure results are retuned in an array diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py index ac24c35ca..b5ccfe700 100644 --- a/roles/lib_openshift/library/oc_obj.py +++ b/roles/lib_openshift/library/oc_obj.py @@ -821,12 +821,11 @@ class OpenShiftCLI(object):          cmd = ['get', resource]          if selector:              cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname)          cmd.extend(['-o', 'json']) -        if rname: -            cmd.append(rname) -          rval = self.openshift_cmd(cmd, output=True)          # Ensure results are retuned in an array diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py index f5d6c3dfe..fb51367fc 100644 --- a/roles/lib_openshift/library/oc_route.py +++ b/roles/lib_openshift/library/oc_route.py @@ -846,12 +846,11 @@ class OpenShiftCLI(object):          cmd = ['get', resource]          if selector:              cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname)          cmd.extend(['-o', 'json']) -        if rname: -            cmd.append(rname) -          rval = self.openshift_cmd(cmd, output=True)          # Ensure results are retuned in an array diff --git a/roles/lib_openshift/library/oc_scale.py b/roles/lib_openshift/library/oc_scale.py new file mode 100644 index 000000000..6ae85e220 --- /dev/null +++ b/roles/lib_openshift/library/oc_scale.py @@ -0,0 +1,1709 @@ +#!/usr/bin/env python +# pylint: disable=missing-docstring +# flake8: noqa: T001 +#     ___ ___ _  _ ___ ___    _ _____ ___ ___ +#    / __| __| \| | __| _ \  /_\_   _| __|   \ +#   | (_ | _|| .` | _||   / / _ \| | | _|| |) | +#    \___|___|_|\_|___|_|_\/_/_\_\_|_|___|___/_ _____ +#   |   \ / _ \  | \| |/ _ \_   _| | __|   \_ _|_   _| +#   | |) | (_) | | .` | (_) || |   | _|| |) | |  | | +#   |___/ \___/  |_|\_|\___/ |_|   |___|___/___| |_| +# +# Copyright 2016 Red Hat, Inc. and/or its affiliates +# and other contributors as indicated by the @author tags. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +#    http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# -*- -*- -*- Begin included fragment: lib/import.py -*- -*- -*- +''' +   OpenShiftCLI class that wraps the oc commands in a subprocess +''' +# pylint: disable=too-many-lines + +from __future__ import print_function +import atexit +import json +import os +import re +import shutil +import subprocess +# pylint: disable=import-error +import ruamel.yaml as yaml +from ansible.module_utils.basic import AnsibleModule + +# -*- -*- -*- End included fragment: lib/import.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: doc/scale -*- -*- -*- + +DOCUMENTATION = ''' +--- +module: oc_scale +short_description: Manage openshift services through the scale parameters +description: +  - Manage openshift services through scaling them. +options: +  state: +    description: +    - State represents whether to scale or list the current replicas +    required: true +    default: present +    choices: ["present", "list"] +    aliases: [] +  kubeconfig: +    description: +    - The path for the kubeconfig file to use for authentication +    required: false +    default: /etc/origin/master/admin.kubeconfig +    aliases: [] +  debug: +    description: +    - Turn on debug output. +    required: false +    default: False +    aliases: [] +  name: +    description: +    - Name of the object that is being queried. +    required: false +    default: None +    aliases: [] +  namespace: +    description: +    - The namespace where the object lives. +    required: false +    default: default +    aliases: [] +  kind: +    description: +    - The kind of object to scale. +    required: false +    default: None +    choices: +    - rc +    - dc +    aliases: [] +author: +- "Kenny Woodson <kwoodson@redhat.com>" +extends_documentation_fragment: [] +''' + +EXAMPLES = ''' +- name: scale down a rc to 0 +  oc_scale: +    name: my-replication-controller +    kind: rc +    namespace: openshift-infra +    replicas: 0 + +- name: scale up a deploymentconfig to 2 +  oc_scale: +    name: php +    kind: dc +    namespace: my-php-app +    replicas: 2 +''' + +# -*- -*- -*- End included fragment: doc/scale -*- -*- -*- + +# -*- -*- -*- Begin included fragment: ../../lib_utils/src/class/yedit.py -*- -*- -*- +# noqa: E301,E302 + + +class YeditException(Exception): +    ''' Exception class for Yedit ''' +    pass + + +# pylint: disable=too-many-public-methods +class Yedit(object): +    ''' Class to modify yaml files ''' +    re_valid_key = r"(((\[-?\d+\])|([0-9a-zA-Z%s/_-]+)).?)+$" +    re_key = r"(?:\[(-?\d+)\])|([0-9a-zA-Z%s/_-]+)" +    com_sep = set(['.', '#', '|', ':']) + +    # pylint: disable=too-many-arguments +    def __init__(self, +                 filename=None, +                 content=None, +                 content_type='yaml', +                 separator='.', +                 backup=False): +        self.content = content +        self._separator = separator +        self.filename = filename +        self.__yaml_dict = content +        self.content_type = content_type +        self.backup = backup +        self.load(content_type=self.content_type) +        if self.__yaml_dict is None: +            self.__yaml_dict = {} + +    @property +    def separator(self): +        ''' getter method for yaml_dict ''' +        return self._separator + +    @separator.setter +    def separator(self): +        ''' getter method for yaml_dict ''' +        return self._separator + +    @property +    def yaml_dict(self): +        ''' getter method for yaml_dict ''' +        return self.__yaml_dict + +    @yaml_dict.setter +    def yaml_dict(self, value): +        ''' setter method for yaml_dict ''' +        self.__yaml_dict = value + +    @staticmethod +    def parse_key(key, sep='.'): +        '''parse the key allowing the appropriate separator''' +        common_separators = list(Yedit.com_sep - set([sep])) +        return re.findall(Yedit.re_key % ''.join(common_separators), key) + +    @staticmethod +    def valid_key(key, sep='.'): +        '''validate the incoming key''' +        common_separators = list(Yedit.com_sep - set([sep])) +        if not re.match(Yedit.re_valid_key % ''.join(common_separators), key): +            return False + +        return True + +    @staticmethod +    def remove_entry(data, key, sep='.'): +        ''' remove data at location key ''' +        if key == '' and isinstance(data, dict): +            data.clear() +            return True +        elif key == '' and isinstance(data, list): +            del data[:] +            return True + +        if not (key and Yedit.valid_key(key, sep)) and \ +           isinstance(data, (list, dict)): +            return None + +        key_indexes = Yedit.parse_key(key, sep) +        for arr_ind, dict_key in key_indexes[:-1]: +            if dict_key and isinstance(data, dict): +                data = data.get(dict_key, None) +            elif (arr_ind and isinstance(data, list) and +                  int(arr_ind) <= len(data) - 1): +                data = data[int(arr_ind)] +            else: +                return None + +        # process last index for remove +        # expected list entry +        if key_indexes[-1][0]: +            if isinstance(data, list) and int(key_indexes[-1][0]) <= len(data) - 1:  # noqa: E501 +                del data[int(key_indexes[-1][0])] +                return True + +        # expected dict entry +        elif key_indexes[-1][1]: +            if isinstance(data, dict): +                del data[key_indexes[-1][1]] +                return True + +    @staticmethod +    def add_entry(data, key, item=None, sep='.'): +        ''' Get an item from a dictionary with key notation a.b.c +            d = {'a': {'b': 'c'}}} +            key = a#b +            return c +        ''' +        if key == '': +            pass +        elif (not (key and Yedit.valid_key(key, sep)) and +              isinstance(data, (list, dict))): +            return None + +        key_indexes = Yedit.parse_key(key, sep) +        for arr_ind, dict_key in key_indexes[:-1]: +            if dict_key: +                if isinstance(data, dict) and dict_key in data and data[dict_key]:  # noqa: E501 +                    data = data[dict_key] +                    continue + +                elif data and not isinstance(data, dict): +                    return None + +                data[dict_key] = {} +                data = data[dict_key] + +            elif (arr_ind and isinstance(data, list) and +                  int(arr_ind) <= len(data) - 1): +                data = data[int(arr_ind)] +            else: +                return None + +        if key == '': +            data = item + +        # process last index for add +        # expected list entry +        elif key_indexes[-1][0] and isinstance(data, list) and int(key_indexes[-1][0]) <= len(data) - 1:  # noqa: E501 +            data[int(key_indexes[-1][0])] = item + +        # expected dict entry +        elif key_indexes[-1][1] and isinstance(data, dict): +            data[key_indexes[-1][1]] = item + +        return data + +    @staticmethod +    def get_entry(data, key, sep='.'): +        ''' Get an item from a dictionary with key notation a.b.c +            d = {'a': {'b': 'c'}}} +            key = a.b +            return c +        ''' +        if key == '': +            pass +        elif (not (key and Yedit.valid_key(key, sep)) and +              isinstance(data, (list, dict))): +            return None + +        key_indexes = Yedit.parse_key(key, sep) +        for arr_ind, dict_key in key_indexes: +            if dict_key and isinstance(data, dict): +                data = data.get(dict_key, None) +            elif (arr_ind and isinstance(data, list) and +                  int(arr_ind) <= len(data) - 1): +                data = data[int(arr_ind)] +            else: +                return None + +        return data + +    def write(self): +        ''' write to file ''' +        if not self.filename: +            raise YeditException('Please specify a filename.') + +        if self.backup and self.file_exists(): +            shutil.copy(self.filename, self.filename + '.orig') + +        tmp_filename = self.filename + '.yedit' +        with open(tmp_filename, 'w') as yfd: +            # pylint: disable=no-member +            if hasattr(self.yaml_dict, 'fa'): +                self.yaml_dict.fa.set_block_style() + +            yfd.write(yaml.dump(self.yaml_dict, Dumper=yaml.RoundTripDumper)) + +        os.rename(tmp_filename, self.filename) + +        return (True, self.yaml_dict) + +    def read(self): +        ''' read from file ''' +        # check if it exists +        if self.filename is None or not self.file_exists(): +            return None + +        contents = None +        with open(self.filename) as yfd: +            contents = yfd.read() + +        return contents + +    def file_exists(self): +        ''' return whether file exists ''' +        if os.path.exists(self.filename): +            return True + +        return False + +    def load(self, content_type='yaml'): +        ''' return yaml file ''' +        contents = self.read() + +        if not contents and not self.content: +            return None + +        if self.content: +            if isinstance(self.content, dict): +                self.yaml_dict = self.content +                return self.yaml_dict +            elif isinstance(self.content, str): +                contents = self.content + +        # check if it is yaml +        try: +            if content_type == 'yaml' and contents: +                self.yaml_dict = yaml.load(contents, yaml.RoundTripLoader) +                # pylint: disable=no-member +                if hasattr(self.yaml_dict, 'fa'): +                    self.yaml_dict.fa.set_block_style() +            elif content_type == 'json' and contents: +                self.yaml_dict = json.loads(contents) +        except yaml.YAMLError as err: +            # Error loading yaml or json +            raise YeditException('Problem with loading yaml file. %s' % err) + +        return self.yaml_dict + +    def get(self, key): +        ''' get a specified key''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, key, self.separator) +        except KeyError: +            entry = None + +        return entry + +    def pop(self, path, key_or_item): +        ''' remove a key, value pair from a dict or an item for a list''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if entry is None: +            return (False, self.yaml_dict) + +        if isinstance(entry, dict): +            # pylint: disable=no-member,maybe-no-member +            if key_or_item in entry: +                entry.pop(key_or_item) +                return (True, self.yaml_dict) +            return (False, self.yaml_dict) + +        elif isinstance(entry, list): +            # pylint: disable=no-member,maybe-no-member +            ind = None +            try: +                ind = entry.index(key_or_item) +            except ValueError: +                return (False, self.yaml_dict) + +            entry.pop(ind) +            return (True, self.yaml_dict) + +        return (False, self.yaml_dict) + +    def delete(self, path): +        ''' remove path from a dict''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if entry is None: +            return (False, self.yaml_dict) + +        result = Yedit.remove_entry(self.yaml_dict, path, self.separator) +        if not result: +            return (False, self.yaml_dict) + +        return (True, self.yaml_dict) + +    def exists(self, path, value): +        ''' check if value exists at path''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if isinstance(entry, list): +            if value in entry: +                return True +            return False + +        elif isinstance(entry, dict): +            if isinstance(value, dict): +                rval = False +                for key, val in value.items(): +                    if entry[key] != val: +                        rval = False +                        break +                else: +                    rval = True +                return rval + +            return value in entry + +        return entry == value + +    def append(self, path, value): +        '''append value to a list''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if entry is None: +            self.put(path, []) +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        if not isinstance(entry, list): +            return (False, self.yaml_dict) + +        # pylint: disable=no-member,maybe-no-member +        entry.append(value) +        return (True, self.yaml_dict) + +    # pylint: disable=too-many-arguments +    def update(self, path, value, index=None, curr_value=None): +        ''' put path, value into a dict ''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if isinstance(entry, dict): +            # pylint: disable=no-member,maybe-no-member +            if not isinstance(value, dict): +                raise YeditException('Cannot replace key, value entry in ' + +                                     'dict with non-dict type. value=[%s] [%s]' % (value, type(value)))  # noqa: E501 + +            entry.update(value) +            return (True, self.yaml_dict) + +        elif isinstance(entry, list): +            # pylint: disable=no-member,maybe-no-member +            ind = None +            if curr_value: +                try: +                    ind = entry.index(curr_value) +                except ValueError: +                    return (False, self.yaml_dict) + +            elif index is not None: +                ind = index + +            if ind is not None and entry[ind] != value: +                entry[ind] = value +                return (True, self.yaml_dict) + +            # see if it exists in the list +            try: +                ind = entry.index(value) +            except ValueError: +                # doesn't exist, append it +                entry.append(value) +                return (True, self.yaml_dict) + +            # already exists, return +            if ind is not None: +                return (False, self.yaml_dict) +        return (False, self.yaml_dict) + +    def put(self, path, value): +        ''' put path, value into a dict ''' +        try: +            entry = Yedit.get_entry(self.yaml_dict, path, self.separator) +        except KeyError: +            entry = None + +        if entry == value: +            return (False, self.yaml_dict) + +        # deepcopy didn't work +        tmp_copy = yaml.load(yaml.round_trip_dump(self.yaml_dict, +                                                  default_flow_style=False), +                             yaml.RoundTripLoader) +        # pylint: disable=no-member +        if hasattr(self.yaml_dict, 'fa'): +            tmp_copy.fa.set_block_style() +        result = Yedit.add_entry(tmp_copy, path, value, self.separator) +        if not result: +            return (False, self.yaml_dict) + +        self.yaml_dict = tmp_copy + +        return (True, self.yaml_dict) + +    def create(self, path, value): +        ''' create a yaml file ''' +        if not self.file_exists(): +            # deepcopy didn't work +            tmp_copy = yaml.load(yaml.round_trip_dump(self.yaml_dict, default_flow_style=False),  # noqa: E501 +                                 yaml.RoundTripLoader) +            # pylint: disable=no-member +            if hasattr(self.yaml_dict, 'fa'): +                tmp_copy.fa.set_block_style() +            result = Yedit.add_entry(tmp_copy, path, value, self.separator) +            if result: +                self.yaml_dict = tmp_copy +                return (True, self.yaml_dict) + +        return (False, self.yaml_dict) + +    @staticmethod +    def get_curr_value(invalue, val_type): +        '''return the current value''' +        if invalue is None: +            return None + +        curr_value = invalue +        if val_type == 'yaml': +            curr_value = yaml.load(invalue) +        elif val_type == 'json': +            curr_value = json.loads(invalue) + +        return curr_value + +    @staticmethod +    def parse_value(inc_value, vtype=''): +        '''determine value type passed''' +        true_bools = ['y', 'Y', 'yes', 'Yes', 'YES', 'true', 'True', 'TRUE', +                      'on', 'On', 'ON', ] +        false_bools = ['n', 'N', 'no', 'No', 'NO', 'false', 'False', 'FALSE', +                       'off', 'Off', 'OFF'] + +        # It came in as a string but you didn't specify value_type as string +        # we will convert to bool if it matches any of the above cases +        if isinstance(inc_value, str) and 'bool' in vtype: +            if inc_value not in true_bools and inc_value not in false_bools: +                raise YeditException('Not a boolean type. str=[%s] vtype=[%s]' +                                     % (inc_value, vtype)) +        elif isinstance(inc_value, bool) and 'str' in vtype: +            inc_value = str(inc_value) + +        # If vtype is not str then go ahead and attempt to yaml load it. +        if isinstance(inc_value, str) and 'str' not in vtype: +            try: +                inc_value = yaml.load(inc_value) +            except Exception: +                raise YeditException('Could not determine type of incoming ' + +                                     'value. value=[%s] vtype=[%s]' +                                     % (type(inc_value), vtype)) + +        return inc_value + +    # pylint: disable=too-many-return-statements,too-many-branches +    @staticmethod +    def run_ansible(module): +        '''perform the idempotent crud operations''' +        yamlfile = Yedit(filename=module.params['src'], +                         backup=module.params['backup'], +                         separator=module.params['separator']) + +        if module.params['src']: +            rval = yamlfile.load() + +            if yamlfile.yaml_dict is None and \ +               module.params['state'] != 'present': +                return {'failed': True, +                        'msg': 'Error opening file [%s].  Verify that the ' + +                               'file exists, that it is has correct' + +                               ' permissions, and is valid yaml.'} + +        if module.params['state'] == 'list': +            if module.params['content']: +                content = Yedit.parse_value(module.params['content'], +                                            module.params['content_type']) +                yamlfile.yaml_dict = content + +            if module.params['key']: +                rval = yamlfile.get(module.params['key']) or {} + +            return {'changed': False, 'result': rval, 'state': "list"} + +        elif module.params['state'] == 'absent': +            if module.params['content']: +                content = Yedit.parse_value(module.params['content'], +                                            module.params['content_type']) +                yamlfile.yaml_dict = content + +            if module.params['update']: +                rval = yamlfile.pop(module.params['key'], +                                    module.params['value']) +            else: +                rval = yamlfile.delete(module.params['key']) + +            if rval[0] and module.params['src']: +                yamlfile.write() + +            return {'changed': rval[0], 'result': rval[1], 'state': "absent"} + +        elif module.params['state'] == 'present': +            # check if content is different than what is in the file +            if module.params['content']: +                content = Yedit.parse_value(module.params['content'], +                                            module.params['content_type']) + +                # We had no edits to make and the contents are the same +                if yamlfile.yaml_dict == content and \ +                   module.params['value'] is None: +                    return {'changed': False, +                            'result': yamlfile.yaml_dict, +                            'state': "present"} + +                yamlfile.yaml_dict = content + +            # we were passed a value; parse it +            if module.params['value']: +                value = Yedit.parse_value(module.params['value'], +                                          module.params['value_type']) +                key = module.params['key'] +                if module.params['update']: +                    # pylint: disable=line-too-long +                    curr_value = Yedit.get_curr_value(Yedit.parse_value(module.params['curr_value']),  # noqa: E501 +                                                      module.params['curr_value_format'])  # noqa: E501 + +                    rval = yamlfile.update(key, value, module.params['index'], curr_value)  # noqa: E501 + +                elif module.params['append']: +                    rval = yamlfile.append(key, value) +                else: +                    rval = yamlfile.put(key, value) + +                if rval[0] and module.params['src']: +                    yamlfile.write() + +                return {'changed': rval[0], +                        'result': rval[1], 'state': "present"} + +            # no edits to make +            if module.params['src']: +                # pylint: disable=redefined-variable-type +                rval = yamlfile.write() +                return {'changed': rval[0], +                        'result': rval[1], +                        'state': "present"} + +        return {'failed': True, 'msg': 'Unkown state passed'} + +# -*- -*- -*- End included fragment: ../../lib_utils/src/class/yedit.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: lib/base.py -*- -*- -*- +# pylint: disable=too-many-lines +# noqa: E301,E302,E303,T001 + + +class OpenShiftCLIError(Exception): +    '''Exception class for openshiftcli''' +    pass + + +# pylint: disable=too-few-public-methods +class OpenShiftCLI(object): +    ''' Class to wrap the command line tools ''' +    def __init__(self, +                 namespace, +                 kubeconfig='/etc/origin/master/admin.kubeconfig', +                 verbose=False, +                 all_namespaces=False): +        ''' Constructor for OpenshiftCLI ''' +        self.namespace = namespace +        self.verbose = verbose +        self.kubeconfig = kubeconfig +        self.all_namespaces = all_namespaces + +    # Pylint allows only 5 arguments to be passed. +    # pylint: disable=too-many-arguments +    def _replace_content(self, resource, rname, content, force=False, sep='.'): +        ''' replace the current object with the content ''' +        res = self._get(resource, rname) +        if not res['results']: +            return res + +        fname = '/tmp/%s' % rname +        yed = Yedit(fname, res['results'][0], separator=sep) +        changes = [] +        for key, value in content.items(): +            changes.append(yed.put(key, value)) + +        if any([change[0] for change in changes]): +            yed.write() + +            atexit.register(Utils.cleanup, [fname]) + +            return self._replace(fname, force) + +        return {'returncode': 0, 'updated': False} + +    def _replace(self, fname, force=False): +        '''replace the current object with oc replace''' +        cmd = ['replace', '-f', fname] +        if force: +            cmd.append('--force') +        return self.openshift_cmd(cmd) + +    def _create_from_content(self, rname, content): +        '''create a temporary file and then call oc create on it''' +        fname = '/tmp/%s' % rname +        yed = Yedit(fname, content=content) +        yed.write() + +        atexit.register(Utils.cleanup, [fname]) + +        return self._create(fname) + +    def _create(self, fname): +        '''call oc create on a filename''' +        return self.openshift_cmd(['create', '-f', fname]) + +    def _delete(self, resource, rname, selector=None): +        '''call oc delete on a resource''' +        cmd = ['delete', resource, rname] +        if selector: +            cmd.append('--selector=%s' % selector) + +        return self.openshift_cmd(cmd) + +    def _process(self, template_name, create=False, params=None, template_data=None):  # noqa: E501 +        '''process a template + +           template_name: the name of the template to process +           create: whether to send to oc create after processing +           params: the parameters for the template +           template_data: the incoming template's data; instead of a file +        ''' +        cmd = ['process'] +        if template_data: +            cmd.extend(['-f', '-']) +        else: +            cmd.append(template_name) +        if params: +            param_str = ["%s=%s" % (key, value) for key, value in params.items()] +            cmd.append('-v') +            cmd.extend(param_str) + +        results = self.openshift_cmd(cmd, output=True, input_data=template_data) + +        if results['returncode'] != 0 or not create: +            return results + +        fname = '/tmp/%s' % template_name +        yed = Yedit(fname, results['results']) +        yed.write() + +        atexit.register(Utils.cleanup, [fname]) + +        return self.openshift_cmd(['create', '-f', fname]) + +    def _get(self, resource, rname=None, selector=None): +        '''return a resource by name ''' +        cmd = ['get', resource] +        if selector: +            cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname) + +        cmd.extend(['-o', 'json']) + +        rval = self.openshift_cmd(cmd, output=True) + +        # Ensure results are retuned in an array +        if 'items' in rval: +            rval['results'] = rval['items'] +        elif not isinstance(rval['results'], list): +            rval['results'] = [rval['results']] + +        return rval + +    def _schedulable(self, node=None, selector=None, schedulable=True): +        ''' perform oadm manage-node scheduable ''' +        cmd = ['manage-node'] +        if node: +            cmd.extend(node) +        else: +            cmd.append('--selector=%s' % selector) + +        cmd.append('--schedulable=%s' % schedulable) + +        return self.openshift_cmd(cmd, oadm=True, output=True, output_type='raw')  # noqa: E501 + +    def _list_pods(self, node=None, selector=None, pod_selector=None): +        ''' perform oadm list pods + +            node: the node in which to list pods +            selector: the label selector filter if provided +            pod_selector: the pod selector filter if provided +        ''' +        cmd = ['manage-node'] +        if node: +            cmd.extend(node) +        else: +            cmd.append('--selector=%s' % selector) + +        if pod_selector: +            cmd.append('--pod-selector=%s' % pod_selector) + +        cmd.extend(['--list-pods', '-o', 'json']) + +        return self.openshift_cmd(cmd, oadm=True, output=True, output_type='raw') + +    # pylint: disable=too-many-arguments +    def _evacuate(self, node=None, selector=None, pod_selector=None, dry_run=False, grace_period=None, force=False): +        ''' perform oadm manage-node evacuate ''' +        cmd = ['manage-node'] +        if node: +            cmd.extend(node) +        else: +            cmd.append('--selector=%s' % selector) + +        if dry_run: +            cmd.append('--dry-run') + +        if pod_selector: +            cmd.append('--pod-selector=%s' % pod_selector) + +        if grace_period: +            cmd.append('--grace-period=%s' % int(grace_period)) + +        if force: +            cmd.append('--force') + +        cmd.append('--evacuate') + +        return self.openshift_cmd(cmd, oadm=True, output=True, output_type='raw') + +    def _version(self): +        ''' return the openshift version''' +        return self.openshift_cmd(['version'], output=True, output_type='raw') + +    def _import_image(self, url=None, name=None, tag=None): +        ''' perform image import ''' +        cmd = ['import-image'] + +        image = '{0}'.format(name) +        if tag: +            image += ':{0}'.format(tag) + +        cmd.append(image) + +        if url: +            cmd.append('--from={0}/{1}'.format(url, image)) + +        cmd.append('-n{0}'.format(self.namespace)) + +        cmd.append('--confirm') +        return self.openshift_cmd(cmd) + +    # pylint: disable=too-many-arguments,too-many-branches +    def openshift_cmd(self, cmd, oadm=False, output=False, output_type='json', input_data=None): +        '''Base command for oc ''' +        cmds = [] +        if oadm: +            cmds = ['/usr/bin/oadm'] +        else: +            cmds = ['/usr/bin/oc'] + +        if self.all_namespaces: +            cmds.extend(['--all-namespaces']) +        elif self.namespace: +            cmds.extend(['-n', self.namespace]) + +        cmds.extend(cmd) + +        rval = {} +        results = '' +        err = None + +        if self.verbose: +            print(' '.join(cmds)) + +        proc = subprocess.Popen(cmds, +                                stdin=subprocess.PIPE, +                                stdout=subprocess.PIPE, +                                stderr=subprocess.PIPE, +                                env={'KUBECONFIG': self.kubeconfig}) + +        stdout, stderr = proc.communicate(input_data) +        rval = {"returncode": proc.returncode, +                "results": results, +                "cmd": ' '.join(cmds)} + +        if proc.returncode == 0: +            if output: +                if output_type == 'json': +                    try: +                        rval['results'] = json.loads(stdout) +                    except ValueError as err: +                        if "No JSON object could be decoded" in err.args: +                            err = err.args +                elif output_type == 'raw': +                    rval['results'] = stdout + +            if self.verbose: +                print("STDOUT: {0}".format(stdout)) +                print("STDERR: {0}".format(stderr)) + +            if err: +                rval.update({"err": err, +                             "stderr": stderr, +                             "stdout": stdout, +                             "cmd": cmds}) + +        else: +            rval.update({"stderr": stderr, +                         "stdout": stdout, +                         "results": {}}) + +        return rval + + +class Utils(object): +    ''' utilities for openshiftcli modules ''' +    @staticmethod +    def create_file(rname, data, ftype='yaml'): +        ''' create a file in tmp with name and contents''' +        path = os.path.join('/tmp', rname) +        with open(path, 'w') as fds: +            if ftype == 'yaml': +                fds.write(yaml.dump(data, Dumper=yaml.RoundTripDumper)) + +            elif ftype == 'json': +                fds.write(json.dumps(data)) +            else: +                fds.write(data) + +        # Register cleanup when module is done +        atexit.register(Utils.cleanup, [path]) +        return path + +    @staticmethod +    def create_files_from_contents(content, content_type=None): +        '''Turn an array of dict: filename, content into a files array''' +        if not isinstance(content, list): +            content = [content] +        files = [] +        for item in content: +            path = Utils.create_file(item['path'], item['data'], ftype=content_type) +            files.append({'name': os.path.basename(path), 'path': path}) +        return files + +    @staticmethod +    def cleanup(files): +        '''Clean up on exit ''' +        for sfile in files: +            if os.path.exists(sfile): +                if os.path.isdir(sfile): +                    shutil.rmtree(sfile) +                elif os.path.isfile(sfile): +                    os.remove(sfile) + +    @staticmethod +    def exists(results, _name): +        ''' Check to see if the results include the name ''' +        if not results: +            return False + +        if Utils.find_result(results, _name): +            return True + +        return False + +    @staticmethod +    def find_result(results, _name): +        ''' Find the specified result by name''' +        rval = None +        for result in results: +            if 'metadata' in result and result['metadata']['name'] == _name: +                rval = result +                break + +        return rval + +    @staticmethod +    def get_resource_file(sfile, sfile_type='yaml'): +        ''' return the service file ''' +        contents = None +        with open(sfile) as sfd: +            contents = sfd.read() + +        if sfile_type == 'yaml': +            contents = yaml.load(contents, yaml.RoundTripLoader) +        elif sfile_type == 'json': +            contents = json.loads(contents) + +        return contents + +    @staticmethod +    def filter_versions(stdout): +        ''' filter the oc version output ''' + +        version_dict = {} +        version_search = ['oc', 'openshift', 'kubernetes'] + +        for line in stdout.strip().split('\n'): +            for term in version_search: +                if not line: +                    continue +                if line.startswith(term): +                    version_dict[term] = line.split()[-1] + +        # horrible hack to get openshift version in Openshift 3.2 +        #  By default "oc version in 3.2 does not return an "openshift" version +        if "openshift" not in version_dict: +            version_dict["openshift"] = version_dict["oc"] + +        return version_dict + +    @staticmethod +    def add_custom_versions(versions): +        ''' create custom versions strings ''' + +        versions_dict = {} + +        for tech, version in versions.items(): +            # clean up "-" from version +            if "-" in version: +                version = version.split("-")[0] + +            if version.startswith('v'): +                versions_dict[tech + '_numeric'] = version[1:].split('+')[0] +                # "v3.3.0.33" is what we have, we want "3.3" +                versions_dict[tech + '_short'] = version[1:4] + +        return versions_dict + +    @staticmethod +    def openshift_installed(): +        ''' check if openshift is installed ''' +        import yum + +        yum_base = yum.YumBase() +        if yum_base.rpmdb.searchNevra(name='atomic-openshift'): +            return True + +        return False + +    # Disabling too-many-branches.  This is a yaml dictionary comparison function +    # pylint: disable=too-many-branches,too-many-return-statements,too-many-statements +    @staticmethod +    def check_def_equal(user_def, result_def, skip_keys=None, debug=False): +        ''' Given a user defined definition, compare it with the results given back by our query.  ''' + +        # Currently these values are autogenerated and we do not need to check them +        skip = ['metadata', 'status'] +        if skip_keys: +            skip.extend(skip_keys) + +        for key, value in result_def.items(): +            if key in skip: +                continue + +            # Both are lists +            if isinstance(value, list): +                if key not in user_def: +                    if debug: +                        print('User data does not have key [%s]' % key) +                        print('User data: %s' % user_def) +                    return False + +                if not isinstance(user_def[key], list): +                    if debug: +                        print('user_def[key] is not a list key=[%s] user_def[key]=%s' % (key, user_def[key])) +                    return False + +                if len(user_def[key]) != len(value): +                    if debug: +                        print("List lengths are not equal.") +                        print("key=[%s]: user_def[%s] != value[%s]" % (key, len(user_def[key]), len(value))) +                        print("user_def: %s" % user_def[key]) +                        print("value: %s" % value) +                    return False + +                for values in zip(user_def[key], value): +                    if isinstance(values[0], dict) and isinstance(values[1], dict): +                        if debug: +                            print('sending list - list') +                            print(type(values[0])) +                            print(type(values[1])) +                        result = Utils.check_def_equal(values[0], values[1], skip_keys=skip_keys, debug=debug) +                        if not result: +                            print('list compare returned false') +                            return False + +                    elif value != user_def[key]: +                        if debug: +                            print('value should be identical') +                            print(value) +                            print(user_def[key]) +                        return False + +            # recurse on a dictionary +            elif isinstance(value, dict): +                if key not in user_def: +                    if debug: +                        print("user_def does not have key [%s]" % key) +                    return False +                if not isinstance(user_def[key], dict): +                    if debug: +                        print("dict returned false: not instance of dict") +                    return False + +                # before passing ensure keys match +                api_values = set(value.keys()) - set(skip) +                user_values = set(user_def[key].keys()) - set(skip) +                if api_values != user_values: +                    if debug: +                        print("keys are not equal in dict") +                        print(api_values) +                        print(user_values) +                    return False + +                result = Utils.check_def_equal(user_def[key], value, skip_keys=skip_keys, debug=debug) +                if not result: +                    if debug: +                        print("dict returned false") +                        print(result) +                    return False + +            # Verify each key, value pair is the same +            else: +                if key not in user_def or value != user_def[key]: +                    if debug: +                        print("value not equal; user_def does not have key") +                        print(key) +                        print(value) +                        if key in user_def: +                            print(user_def[key]) +                    return False + +        if debug: +            print('returning true') +        return True + + +class OpenShiftCLIConfig(object): +    '''Generic Config''' +    def __init__(self, rname, namespace, kubeconfig, options): +        self.kubeconfig = kubeconfig +        self.name = rname +        self.namespace = namespace +        self._options = options + +    @property +    def config_options(self): +        ''' return config options ''' +        return self._options + +    def to_option_list(self): +        '''return all options as a string''' +        return self.stringify() + +    def stringify(self): +        ''' return the options hash as cli params in a string ''' +        rval = [] +        for key, data in self.config_options.items(): +            if data['include'] \ +               and (data['value'] or isinstance(data['value'], int)): +                rval.append('--%s=%s' % (key.replace('_', '-'), data['value'])) + +        return rval + + +# -*- -*- -*- End included fragment: lib/base.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: lib/deploymentconfig.py -*- -*- -*- + + +# pylint: disable=too-many-public-methods +class DeploymentConfig(Yedit): +    ''' Class to wrap the oc command line tools ''' +    default_deployment_config = ''' +apiVersion: v1 +kind: DeploymentConfig +metadata: +  name: default_dc +  namespace: default +spec: +  replicas: 0 +  selector: +    default_dc: default_dc +  strategy: +    resources: {} +    rollingParams: +      intervalSeconds: 1 +      maxSurge: 0 +      maxUnavailable: 25% +      timeoutSeconds: 600 +      updatePercent: -25 +      updatePeriodSeconds: 1 +    type: Rolling +  template: +    metadata: +    spec: +      containers: +      - env: +        - name: default +          value: default +        image: default +        imagePullPolicy: IfNotPresent +        name: default_dc +        ports: +        - containerPort: 8000 +          hostPort: 8000 +          protocol: TCP +          name: default_port +        resources: {} +        terminationMessagePath: /dev/termination-log +      dnsPolicy: ClusterFirst +      hostNetwork: true +      nodeSelector: +        type: compute +      restartPolicy: Always +      securityContext: {} +      serviceAccount: default +      serviceAccountName: default +      terminationGracePeriodSeconds: 30 +  triggers: +  - type: ConfigChange +''' + +    replicas_path = "spec.replicas" +    env_path = "spec.template.spec.containers[0].env" +    volumes_path = "spec.template.spec.volumes" +    container_path = "spec.template.spec.containers" +    volume_mounts_path = "spec.template.spec.containers[0].volumeMounts" + +    def __init__(self, content=None): +        ''' Constructor for deploymentconfig ''' +        if not content: +            content = DeploymentConfig.default_deployment_config + +        super(DeploymentConfig, self).__init__(content=content) + +    # pylint: disable=no-member +    def add_env_value(self, key, value): +        ''' add key, value pair to env array ''' +        rval = False +        env = self.get_env_vars() +        if env: +            env.append({'name': key, 'value': value}) +            rval = True +        else: +            result = self.put(DeploymentConfig.env_path, {'name': key, 'value': value}) +            rval = result[0] + +        return rval + +    def exists_env_value(self, key, value): +        ''' return whether a key, value  pair exists ''' +        results = self.get_env_vars() +        if not results: +            return False + +        for result in results: +            if result['name'] == key and result['value'] == value: +                return True + +        return False + +    def exists_env_key(self, key): +        ''' return whether a key, value  pair exists ''' +        results = self.get_env_vars() +        if not results: +            return False + +        for result in results: +            if result['name'] == key: +                return True + +        return False + +    def get_env_vars(self): +        '''return a environment variables ''' +        return self.get(DeploymentConfig.env_path) or [] + +    def delete_env_var(self, keys): +        '''delete a list of keys ''' +        if not isinstance(keys, list): +            keys = [keys] + +        env_vars_array = self.get_env_vars() +        modified = False +        idx = None +        for key in keys: +            for env_idx, env_var in enumerate(env_vars_array): +                if env_var['name'] == key: +                    idx = env_idx +                    break + +            if idx: +                modified = True +                del env_vars_array[idx] + +        if modified: +            return True + +        return False + +    def update_env_var(self, key, value): +        '''place an env in the env var list''' + +        env_vars_array = self.get_env_vars() +        idx = None +        for env_idx, env_var in enumerate(env_vars_array): +            if env_var['name'] == key: +                idx = env_idx +                break + +        if idx: +            env_vars_array[idx]['value'] = value +        else: +            self.add_env_value(key, value) + +        return True + +    def exists_volume_mount(self, volume_mount): +        ''' return whether a volume mount exists ''' +        exist_volume_mounts = self.get_volume_mounts() + +        if not exist_volume_mounts: +            return False + +        volume_mount_found = False +        for exist_volume_mount in exist_volume_mounts: +            if exist_volume_mount['name'] == volume_mount['name']: +                volume_mount_found = True +                break + +        return volume_mount_found + +    def exists_volume(self, volume): +        ''' return whether a volume exists ''' +        exist_volumes = self.get_volumes() + +        volume_found = False +        for exist_volume in exist_volumes: +            if exist_volume['name'] == volume['name']: +                volume_found = True +                break + +        return volume_found + +    def find_volume_by_name(self, volume, mounts=False): +        ''' return the index of a volume ''' +        volumes = [] +        if mounts: +            volumes = self.get_volume_mounts() +        else: +            volumes = self.get_volumes() +        for exist_volume in volumes: +            if exist_volume['name'] == volume['name']: +                return exist_volume + +        return None + +    def get_replicas(self): +        ''' return replicas setting ''' +        return self.get(DeploymentConfig.replicas_path) + +    def get_volume_mounts(self): +        '''return volume mount information ''' +        return self.get_volumes(mounts=True) + +    def get_volumes(self, mounts=False): +        '''return volume mount information ''' +        if mounts: +            return self.get(DeploymentConfig.volume_mounts_path) or [] + +        return self.get(DeploymentConfig.volumes_path) or [] + +    def delete_volume_by_name(self, volume): +        '''delete a volume ''' +        modified = False +        exist_volume_mounts = self.get_volume_mounts() +        exist_volumes = self.get_volumes() +        del_idx = None +        for idx, exist_volume in enumerate(exist_volumes): +            if 'name' in exist_volume and exist_volume['name'] == volume['name']: +                del_idx = idx +                break + +        if del_idx != None: +            del exist_volumes[del_idx] +            modified = True + +        del_idx = None +        for idx, exist_volume_mount in enumerate(exist_volume_mounts): +            if 'name' in exist_volume_mount and exist_volume_mount['name'] == volume['name']: +                del_idx = idx +                break + +        if del_idx != None: +            del exist_volume_mounts[idx] +            modified = True + +        return modified + +    def add_volume_mount(self, volume_mount): +        ''' add a volume or volume mount to the proper location ''' +        exist_volume_mounts = self.get_volume_mounts() + +        if not exist_volume_mounts and volume_mount: +            self.put(DeploymentConfig.volume_mounts_path, [volume_mount]) +        else: +            exist_volume_mounts.append(volume_mount) + +    def add_volume(self, volume): +        ''' add a volume or volume mount to the proper location ''' +        exist_volumes = self.get_volumes() +        if not volume: +            return + +        if not exist_volumes: +            self.put(DeploymentConfig.volumes_path, [volume]) +        else: +            exist_volumes.append(volume) + +    def update_replicas(self, replicas): +        ''' update replicas value ''' +        self.put(DeploymentConfig.replicas_path, replicas) + +    def update_volume(self, volume): +        '''place an env in the env var list''' +        exist_volumes = self.get_volumes() + +        if not volume: +            return False + +        # update the volume +        update_idx = None +        for idx, exist_vol in enumerate(exist_volumes): +            if exist_vol['name'] == volume['name']: +                update_idx = idx +                break + +        if update_idx != None: +            exist_volumes[update_idx] = volume +        else: +            self.add_volume(volume) + +        return True + +    def update_volume_mount(self, volume_mount): +        '''place an env in the env var list''' +        modified = False + +        exist_volume_mounts = self.get_volume_mounts() + +        if not volume_mount: +            return False + +        # update the volume mount +        for exist_vol_mount in exist_volume_mounts: +            if exist_vol_mount['name'] == volume_mount['name']: +                if 'mountPath' in exist_vol_mount and \ +                   str(exist_vol_mount['mountPath']) != str(volume_mount['mountPath']): +                    exist_vol_mount['mountPath'] = volume_mount['mountPath'] +                    modified = True +                break + +        if not modified: +            self.add_volume_mount(volume_mount) +            modified = True + +        return modified + +    def needs_update_volume(self, volume, volume_mount): +        ''' verify a volume update is needed ''' +        exist_volume = self.find_volume_by_name(volume) +        exist_volume_mount = self.find_volume_by_name(volume, mounts=True) +        results = [] +        results.append(exist_volume['name'] == volume['name']) + +        if 'secret' in volume: +            results.append('secret' in exist_volume) +            results.append(exist_volume['secret']['secretName'] == volume['secret']['secretName']) +            results.append(exist_volume_mount['name'] == volume_mount['name']) +            results.append(exist_volume_mount['mountPath'] == volume_mount['mountPath']) + +        elif 'emptyDir' in volume: +            results.append(exist_volume_mount['name'] == volume['name']) +            results.append(exist_volume_mount['mountPath'] == volume_mount['mountPath']) + +        elif 'persistentVolumeClaim' in volume: +            pvc = 'persistentVolumeClaim' +            results.append(pvc in exist_volume) +            if results[-1]: +                results.append(exist_volume[pvc]['claimName'] == volume[pvc]['claimName']) + +                if 'claimSize' in volume[pvc]: +                    results.append(exist_volume[pvc]['claimSize'] == volume[pvc]['claimSize']) + +        elif 'hostpath' in volume: +            results.append('hostPath' in exist_volume) +            results.append(exist_volume['hostPath']['path'] == volume_mount['mountPath']) + +        return not all(results) + +    def needs_update_replicas(self, replicas): +        ''' verify whether a replica update is needed ''' +        current_reps = self.get(DeploymentConfig.replicas_path) +        return not current_reps == replicas + +# -*- -*- -*- End included fragment: lib/deploymentconfig.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: lib/replicationcontroller.py -*- -*- -*- + + +# pylint: disable=too-many-public-methods +class ReplicationController(DeploymentConfig): +    ''' Class to wrap the oc command line tools ''' +    replicas_path = "spec.replicas" +    env_path = "spec.template.spec.containers[0].env" +    volumes_path = "spec.template.spec.volumes" +    container_path = "spec.template.spec.containers" +    volume_mounts_path = "spec.template.spec.containers[0].volumeMounts" + +    def __init__(self, content): +        ''' Constructor for ReplicationController ''' +        super(ReplicationController, self).__init__(content=content) + +# -*- -*- -*- End included fragment: lib/replicationcontroller.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: class/oc_scale.py -*- -*- -*- + +# pylint: disable=too-many-instance-attributes +class OCScale(OpenShiftCLI): +    ''' Class to wrap the oc command line tools ''' + +    # pylint allows 5 +    # pylint: disable=too-many-arguments +    def __init__(self, +                 resource_name, +                 namespace, +                 replicas, +                 kind, +                 kubeconfig='/etc/origin/master/admin.kubeconfig', +                 verbose=False): +        ''' Constructor for OCScale ''' +        super(OCScale, self).__init__(namespace, kubeconfig) +        self.kind = kind +        self.replicas = replicas +        self.name = resource_name +        self.namespace = namespace +        self.kubeconfig = kubeconfig +        self.verbose = verbose +        self._resource = None + +    @property +    def resource(self): +        ''' property function for resource var ''' +        if not self._resource: +            self.get() +        return self._resource + +    @resource.setter +    def resource(self, data): +        ''' setter function for resource var ''' +        self._resource = data + +    def get(self): +        '''return replicas information ''' +        vol = self._get(self.kind, self.name) +        if vol['returncode'] == 0: +            if self.kind == 'dc': +                # The resource returned from a query could be an rc or dc. +                # pylint: disable=redefined-variable-type +                self.resource = DeploymentConfig(content=vol['results'][0]) +                vol['results'] = [self.resource.get_replicas()] +            if self.kind == 'rc': +                # The resource returned from a query could be an rc or dc. +                # pylint: disable=redefined-variable-type +                self.resource = ReplicationController(content=vol['results'][0]) +                vol['results'] = [self.resource.get_replicas()] + +        return vol + +    def put(self): +        '''update replicas into dc ''' +        self.resource.update_replicas(self.replicas) +        return self._replace_content(self.kind, self.name, self.resource.yaml_dict) + +    def needs_update(self): +        ''' verify whether an update is needed ''' +        return self.resource.needs_update_replicas(self.replicas) + +    # pylint: disable=too-many-return-statements +    @staticmethod +    def run_ansible(params, check_mode): +        '''perform the idempotent ansible logic''' + +        oc_scale = OCScale(params['name'], +                           params['namespace'], +                           params['replicas'], +                           params['kind'], +                           params['kubeconfig'], +                           verbose=params['debug']) + +        state = params['state'] + +        api_rval = oc_scale.get() + +        ##### +        # Get +        ##### +        if state == 'list': +            return {'changed': False, 'result': api_rval['results'], 'state': 'list'}  # noqa: E501 + +        elif state == 'present': +            ######## +            # Update +            ######## +            if oc_scale.needs_update(): +                if check_mode: +                    return {'changed': True, 'result': 'CHECK_MODE: Would have updated.'}  # noqa: E501 +                api_rval = oc_scale.put() + +                if api_rval['returncode'] != 0: +                    return {'failed': True, 'msg': api_rval} + +                # return the created object +                api_rval = oc_scale.get() + +                if api_rval['returncode'] != 0: +                    return {'failed': True, 'msg': api_rval} + +                return {'changed': True, 'result': api_rval['results'], 'state': 'present'}  # noqa: E501 + +            return {'changed': False, 'result': api_rval['results'], 'state': 'present'}  # noqa: E501 + +        return {'failed': True, 'msg': 'Unknown state passed. [{}]'.format(state)} + +# -*- -*- -*- End included fragment: class/oc_scale.py -*- -*- -*- + +# -*- -*- -*- Begin included fragment: ansible/oc_scale.py -*- -*- -*- + +def main(): +    ''' +    ansible oc module for scaling +    ''' + +    module = AnsibleModule( +        argument_spec=dict( +            kubeconfig=dict(default='/etc/origin/master/admin.kubeconfig', type='str'), +            state=dict(default='present', type='str', choices=['present', 'list']), +            debug=dict(default=False, type='bool'), +            kind=dict(default='dc', choices=['dc', 'rc'], type='str'), +            namespace=dict(default='default', type='str'), +            replicas=dict(default=None, type='int'), +            name=dict(default=None, type='str'), +        ), +        supports_check_mode=True, +    ) +    rval = OCScale.run_ansible(module.params, module.check_mode) +    if 'failed' in rval: +        module.fail_json(**rval) + +    module.exit_json(**rval) + + +if __name__ == '__main__': +    main() + +# -*- -*- -*- End included fragment: ansible/oc_scale.py -*- -*- -*- diff --git a/roles/lib_openshift/library/oc_secret.py b/roles/lib_openshift/library/oc_secret.py index 21779c117..69dcb314b 100644 --- a/roles/lib_openshift/library/oc_secret.py +++ b/roles/lib_openshift/library/oc_secret.py @@ -842,12 +842,11 @@ class OpenShiftCLI(object):          cmd = ['get', resource]          if selector:              cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname)          cmd.extend(['-o', 'json']) -        if rname: -            cmd.append(rname) -          rval = self.openshift_cmd(cmd, output=True)          # Ensure results are retuned in an array diff --git a/roles/lib_openshift/library/oc_version.py b/roles/lib_openshift/library/oc_version.py index 5ee3e9c9b..d74564352 100644 --- a/roles/lib_openshift/library/oc_version.py +++ b/roles/lib_openshift/library/oc_version.py @@ -766,12 +766,11 @@ class OpenShiftCLI(object):          cmd = ['get', resource]          if selector:              cmd.append('--selector=%s' % selector) +        elif rname: +            cmd.append(rname)          cmd.extend(['-o', 'json']) -        if rname: -            cmd.append(rname) -          rval = self.openshift_cmd(cmd, output=True)          # Ensure results are retuned in an array | 
