From e8f02e60daf2d158a0fa6f08ac7d3ed89f9c5317 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 9 Feb 2017 21:51:12 -0500
Subject: Adding integration test.  Fixed issue with node_selector.

---
 roles/lib_openshift/library/oc_project.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'roles/lib_openshift/library')

diff --git a/roles/lib_openshift/library/oc_project.py b/roles/lib_openshift/library/oc_project.py
index bdfeca5ca..d8a88d12c 100644
--- a/roles/lib_openshift/library/oc_project.py
+++ b/roles/lib_openshift/library/oc_project.py
@@ -1387,7 +1387,6 @@ class OCProject(OpenShiftCLI):
 
     def get(self):
         '''return project '''
-        #result = self.openshift_cmd(['get', self.kind, self.config.name, '-o', 'json'], output=True, output_type='raw')
         result = self._get(self.kind, self.config.name)
 
         if result['returncode'] == 0:
@@ -1441,11 +1440,15 @@ class OCProject(OpenShiftCLI):
         # Check rolebindings and policybindings
         return False
 
-    # pylint: disable=too-many-return-statements
+    # pylint: disable=too-many-return-statements,too-many-branches
     @staticmethod
     def run_ansible(params, check_mode):
         '''run the idempotent ansible code'''
 
+        _ns = None
+        if params['node_selector'] is not None:
+            _ns = ','.join(params['node_selector'])
+
         pconfig = ProjectConfig(params['name'],
                                 params['name'],
                                 params['kubeconfig'],
@@ -1453,7 +1456,7 @@ class OCProject(OpenShiftCLI):
                                  'admin_role': {'value': params['admin_role'], 'include': True},
                                  'description': {'value': params['description'], 'include': True},
                                  'display_name': {'value': params['display_name'], 'include': True},
-                                 'node_selector': {'value': ','.join(params['node_selector']), 'include': True},
+                                 'node_selector': {'value': _ns, 'include': True},
                                 })
 
         oadm_project = OCProject(pconfig, verbose=params['debug'])
@@ -1466,7 +1469,7 @@ class OCProject(OpenShiftCLI):
         # Get
         #####
         if state == 'list':
-            exit_json(changed=False, results=api_rval['results'], state="list")
+            return {'changed': False, 'results': api_rval['results'], 'state': state}
 
         ########
         # Delete
-- 
cgit v1.2.3