diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-07 15:08:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 15:08:26 -0500 |
| commit | 07eeb063fd4f718f7ad23135c6daae97624e560a (patch) | |
| tree | d577f2d22cb0fb3f4fec9dac479100ede25b5b96 /roles | |
| parent | ed103af9a9fb6f99f4c2f4d040649698d67eb6b0 (diff) | |
| parent | 049af8749ac52066aa9cc27130b8dd5b00ceaef4 (diff) | |
| download | openshift-07eeb063fd4f718f7ad23135c6daae97624e560a.tar.gz openshift-07eeb063fd4f718f7ad23135c6daae97624e560a.tar.bz2 openshift-07eeb063fd4f718f7ad23135c6daae97624e560a.tar.xz openshift-07eeb063fd4f718f7ad23135c6daae97624e560a.zip | |
Merge pull request #3574 from sdodson/35_sdnvalidator
Add oc_objectvalidator to upgrade check
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_objectvalidator.py | 11 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_objectvalidator.py | 11 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py | 2 |
3 files changed, 21 insertions, 3 deletions
diff --git a/roles/lib_openshift/library/oc_objectvalidator.py b/roles/lib_openshift/library/oc_objectvalidator.py index f6802a9b3..5a966fa93 100644 --- a/roles/lib_openshift/library/oc_objectvalidator.py +++ b/roles/lib_openshift/library/oc_objectvalidator.py @@ -1380,7 +1380,16 @@ class OCObjectValidator(OpenShiftCLI): all_invalid[invalid_msg] = invalid if failed: - return {'failed': True, 'msg': 'All objects are not valid.', 'state': 'list', 'results': all_invalid} + return { + 'failed': True, + 'msg': ( + "All objects are not valid. If you are a supported customer please contact " + "Red Hat Support providing the complete output above. If you are not a customer " + "please contact users@lists.openshift.redhat.com for assistance." + ), + 'state': 'list', + 'results': all_invalid + } return {'msg': 'All objects are valid.'} diff --git a/roles/lib_openshift/src/class/oc_objectvalidator.py b/roles/lib_openshift/src/class/oc_objectvalidator.py index b76fc995e..43f6cac67 100644 --- a/roles/lib_openshift/src/class/oc_objectvalidator.py +++ b/roles/lib_openshift/src/class/oc_objectvalidator.py @@ -72,6 +72,15 @@ class OCObjectValidator(OpenShiftCLI): all_invalid[invalid_msg] = invalid if failed: - return {'failed': True, 'msg': 'All objects are not valid.', 'state': 'list', 'results': all_invalid} + return { + 'failed': True, + 'msg': ( + "All objects are not valid. If you are a supported customer please contact " + "Red Hat Support providing the complete output above. If you are not a customer " + "please contact users@lists.openshift.redhat.com for assistance." + ), + 'state': 'list', + 'results': all_invalid + } return {'msg': 'All objects are valid.'} diff --git a/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py b/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py index a97d0493e..da326742f 100755 --- a/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py +++ b/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py @@ -891,7 +891,7 @@ class OCObjectValidatorTest(unittest.TestCase): # Assert self.assertTrue(results['failed']) - self.assertEqual(results['msg'], 'All objects are not valid.') + self.assertIn('All objects are not valid.', results['msg']) self.assertEqual(results['state'], 'list') self.assertEqual(results['results'], invalid_results) |