Browse Source

Merge pull request #10075 from camabeh/fix_oc_group_get

Fix oc group get
OpenShift Merge Robot 6 years ago
parent
commit
298684e8f7

+ 1 - 1
roles/lib_openshift/library/oc_group.py

@@ -1522,7 +1522,7 @@ class OCGroup(OpenShiftCLI):
         result = self._get(self.kind, self.config.name)
         if result['returncode'] == 0:
             self.group = Group(content=result['results'][0])
-        elif 'groups \"{}\" not found'.format(self.config.name) in result['stderr']:
+        elif 'groups.user.openshift.io \"{}\" not found'.format(self.config.name) in result['stderr']:
             result['returncode'] = 0
             result['results'] = [{}]
 

+ 1 - 1
roles/lib_openshift/src/class/oc_group.py

@@ -39,7 +39,7 @@ class OCGroup(OpenShiftCLI):
         result = self._get(self.kind, self.config.name)
         if result['returncode'] == 0:
             self.group = Group(content=result['results'][0])
-        elif 'groups \"{}\" not found'.format(self.config.name) in result['stderr']:
+        elif 'groups.user.openshift.io \"{}\" not found'.format(self.config.name) in result['stderr']:
             result['returncode'] = 0
             result['results'] = [{}]
 

+ 3 - 3
roles/lib_openshift/src/test/unit/test_oc_group.py

@@ -46,8 +46,8 @@ class OCGroupTest(unittest.TestCase):
         }'''
 
         mock_run.side_effect = [
-            (1, '', 'Error from server: groups "acme" not found'),
-            (1, '', 'Error from server: groups "acme" not found'),
+            (1, '', 'Error from server: groups.user.openshift.io "acme" not found'),
+            (1, '', 'Error from server: groups.user.openshift.io "acme" not found'),
             (0, '', ''),
             (0, group, ''),
         ]
@@ -70,7 +70,7 @@ class OCGroupTest(unittest.TestCase):
         params['name'] = 'noexist'
 
         mock_run.side_effect = [
-            (1, '', 'Error from server: groups "acme" not found'),
+            (1, '', 'Error from server: groups.user.openshift.io "acme" not found'),
         ]
 
         mock_tmpfile_copy.side_effect = [