From 8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 23 Mar 2017 16:24:20 -0400
Subject: Fixing up test cases, linting, and added a return.

---
 roles/lib_openshift/src/class/oc_image.py | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'roles/lib_openshift/src/class/oc_image.py')

diff --git a/roles/lib_openshift/src/class/oc_image.py b/roles/lib_openshift/src/class/oc_image.py
index 619e58057..d25349127 100644
--- a/roles/lib_openshift/src/class/oc_image.py
+++ b/roles/lib_openshift/src/class/oc_image.py
@@ -1,9 +1,10 @@
 # pylint: skip-file
+# flake8: noqa
+
 
 # pylint: disable=too-many-arguments
 class OCImage(OpenShiftCLI):
-    ''' Class to wrap the oc command line tools
-    '''
+    ''' Class to import and create an imagestream object'''
     def __init__(self,
                  namespace,
                  registry_url,
@@ -11,13 +12,11 @@ class OCImage(OpenShiftCLI):
                  image_tag,
                  kubeconfig='/etc/origin/master/admin.kubeconfig',
                  verbose=False):
-        ''' Constructor for OpenshiftOC '''
+        ''' Constructor for OCImage'''
         super(OCImage, self).__init__(namespace, kubeconfig)
-        self.namespace = namespace
         self.registry_url = registry_url
         self.image_name = image_name
         self.image_tag = image_tag
-        self.kubeconfig = kubeconfig
         self.verbose = verbose
 
     def get(self):
@@ -27,21 +26,21 @@ class OCImage(OpenShiftCLI):
         if results['returncode'] == 0 and results['results'][0]:
             results['exists'] = True
 
-        if results['returncode'] != 0 and '"%s" not found' % self.image_name in results['stderr']:
+        if results['returncode'] != 0 and '"{}" not found'.format(self.image_name) in results['stderr']:
             results['returncode'] = 0
 
         return results
 
     def create(self, url=None, name=None, tag=None):
         '''Create an image '''
-
         return self._import_image(url, name, tag)
 
 
+    # pylint: disable=too-many-return-statements
     @staticmethod
     def run_ansible(params, check_mode):
         ''' run the ansible idempotent code '''
-    
+
         ocimage = OCImage(params['namespace'],
                           params['registry_url'],
                           params['image_name'],
@@ -61,14 +60,11 @@ class OCImage(OpenShiftCLI):
                 return {"failed": True, "msg": api_rval}
             return {"changed": False, "results": api_rval, "state": "list"}
 
-        if not params['image_name']:
-            return {"failed": True, "msg": 'Please specify a name when state is absent|present.'}
-
+        ########
+        # Create
+        ########
         if state == 'present':
 
-            ########
-            # Create
-            ########
             if not Utils.exists(api_rval['results'], params['image_name']):
 
                 if check_mode:
@@ -81,10 +77,15 @@ class OCImage(OpenShiftCLI):
                 if api_rval['returncode'] != 0:
                     return {"failed": True, "msg": api_rval}
 
-                return {"changed": True, "results": api_rval, "state": "present"}
+                # return the newly created object
+                api_rval = ocimage.get()
 
+                if api_rval['returncode'] != 0:
+                    return {"failed": True, "msg": api_rval}
+
+                return {"changed": True, "results": api_rval, "state": "present"}
 
             # image exists, no change
             return {"changed": False, "results": api_rval, "state": "present"}
 
-        return {"failed": True, "changed": False, "results": "Unknown state passed. {0}".format(state), "state": "unknown"}
+        return {"failed": True, "changed": False, "msg": "Unknown state passed. {0}".format(state)}
-- 
cgit v1.2.3