diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-03 10:46:55 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-06 09:09:14 -0500 |
| commit | c08768c051ae86a1c62feb878848acf0c653b82b (patch) | |
| tree | 201fe6f77930e668f81a0e570515ac7a2a8e7557 /roles | |
| parent | ee3609784e12a8961c8167d6326427f5808a9263 (diff) | |
| download | openshift-c08768c051ae86a1c62feb878848acf0c653b82b.tar.gz openshift-c08768c051ae86a1c62feb878848acf0c653b82b.tar.bz2 openshift-c08768c051ae86a1c62feb878848acf0c653b82b.tar.xz openshift-c08768c051ae86a1c62feb878848acf0c653b82b.zip | |
Fixed the none namespace. Fixed tests with latest loc_oc_binary call.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_project.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_project.py | 4 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_project.py | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/roles/lib_openshift/library/oc_project.py b/roles/lib_openshift/library/oc_project.py index 79b6ab380..812c67de5 100644 --- a/roles/lib_openshift/library/oc_project.py +++ b/roles/lib_openshift/library/oc_project.py @@ -1519,7 +1519,7 @@ class OCProject(OpenShiftCLI): else: self.project.update_annotation('node-selector', self.project.find_annotation('node-selector')) - return self._replace_content(self.kind, self.config.namespace, self.project.yaml_dict) + return self._replace_content(self.kind, self.config.name, self.project.yaml_dict) def needs_update(self): ''' verify an update is needed ''' @@ -1547,7 +1547,7 @@ class OCProject(OpenShiftCLI): _ns = ','.join(params['node_selector']) pconfig = ProjectConfig(params['name'], - None, + 'None', params['kubeconfig'], {'admin': {'value': params['admin'], 'include': True}, 'admin_role': {'value': params['admin_role'], 'include': True}, diff --git a/roles/lib_openshift/src/class/oc_project.py b/roles/lib_openshift/src/class/oc_project.py index 5b39b43fa..7e3984297 100644 --- a/roles/lib_openshift/src/class/oc_project.py +++ b/roles/lib_openshift/src/class/oc_project.py @@ -70,7 +70,7 @@ class OCProject(OpenShiftCLI): else: self.project.update_annotation('node-selector', self.project.find_annotation('node-selector')) - return self._replace_content(self.kind, self.config.namespace, self.project.yaml_dict) + return self._replace_content(self.kind, self.config.name, self.project.yaml_dict) def needs_update(self): ''' verify an update is needed ''' @@ -98,7 +98,7 @@ class OCProject(OpenShiftCLI): _ns = ','.join(params['node_selector']) pconfig = ProjectConfig(params['name'], - None, + 'None', params['kubeconfig'], {'admin': {'value': params['admin'], 'include': True}, 'admin_role': {'value': params['admin_role'], 'include': True}, diff --git a/roles/lib_openshift/src/test/unit/test_oc_project.py b/roles/lib_openshift/src/test/unit/test_oc_project.py index 3cc439bf7..1f9d353aa 100755 --- a/roles/lib_openshift/src/test/unit/test_oc_project.py +++ b/roles/lib_openshift/src/test/unit/test_oc_project.py @@ -35,10 +35,11 @@ class OCProjectTest(unittest.TestCase): ''' setup method will create a file and set to known configuration ''' pass + @mock.patch('oc_project.locate_oc_binary') @mock.patch('oc_project.Utils.create_tmpfile_copy') @mock.patch('oc_project.Utils._write') @mock.patch('oc_project.OCProject._run') - def test_adding_a_project(self, mock_cmd, mock_write, mock_tmpfile_copy): + def test_adding_a_project(self, mock_cmd, mock_write, mock_tmpfile_copy, mock_loc_oc_bin): ''' Testing adding a project ''' # Arrange @@ -96,6 +97,10 @@ class OCProjectTest(unittest.TestCase): '/tmp/mocked_kubeconfig', ] + mock_loc_oc_bin.side_effect = [ + 'oc', + ] + # Act results = OCProject.run_ansible(params, False) |