Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load.

3 files changed, 85 insertions, 26 deletions

diff --git a/roles/lib_openshift/src/lib/base.py b/roles/lib_openshift/src/lib/base.py
index a895b40b3..0b37862c9 100644
--- a/roles/lib_openshift/src/lib/base.py
+++ b/roles/lib_openshift/src/lib/base.py
@@ -295,7 +295,10 @@ class Utils(object):
         tmp = Utils.create_tmpfile(prefix=rname)
 
         if ftype == 'yaml':
-            Utils._write(tmp, yaml.dump(data, Dumper=yaml.RoundTripDumper))
+            if hasattr(yaml, 'RoundTripDumper'):
+                Utils._write(tmp, yaml.dump(data, Dumper=yaml.RoundTripDumper))
+            else:
+                Utils._write(tmp, yaml.safe_dump(data, default_flow_style=False))
         elif ftype == 'json':
             Utils._write(tmp, json.dumps(data))
         else:
@@ -377,7 +380,10 @@ class Utils(object):
             contents = sfd.read()
 
         if sfile_type == 'yaml':
-            contents = yaml.load(contents, yaml.RoundTripLoader)
+            if hasattr(yaml, 'RoundTripLoader'):
+                contents = yaml.load(contents, yaml.RoundTripLoader)
+            else:
+                contents = yaml.safe_load(contents)
         elif sfile_type == 'json':
             contents = json.loads(contents)
 
diff --git a/roles/lib_openshift/src/lib/import.py b/roles/lib_openshift/src/lib/import.py
index 6344c1a54..a79297898 100644
--- a/roles/lib_openshift/src/lib/import.py
+++ b/roles/lib_openshift/src/lib/import.py
@@ -7,6 +7,7 @@
 
 from __future__ import print_function
 import atexit
+import copy
 import json
 import os
 import re
@@ -14,5 +15,9 @@ import shutil
 import subprocess
 import tempfile
 # pylint: disable=import-error
-import ruamel.yaml as yaml
+try:
+    import ruamel.yaml as yaml
+except ImportError:
+    import yaml
+
 from ansible.module_utils.basic import AnsibleModule
diff --git a/roles/lib_openshift/src/test/unit/oc_serviceaccount_secret.py b/roles/lib_openshift/src/test/unit/oc_serviceaccount_secret.py
index 4d555d412..1eb7dd3be 100755
--- a/roles/lib_openshift/src/test/unit/oc_serviceaccount_secret.py
+++ b/roles/lib_openshift/src/test/unit/oc_serviceaccount_secret.py
@@ -25,6 +25,12 @@ module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]),
 sys.path.insert(0, module_path)
 from oc_serviceaccount_secret import OCServiceAccountSecret  # noqa: E402
 
+try:
+    import ruamel.yaml as yaml
+    YAML_TYPE='ruamel'
+except ImportError:
+    YAML_TYPE='pyyaml'
+
 
 class OCServiceAccountSecretTest(unittest.TestCase):
     '''
@@ -54,8 +60,13 @@ class OCServiceAccountSecretTest(unittest.TestCase):
         }
 
         oc_get_sa_before = '''{
-            "kind": "ServiceAccount",
             "apiVersion": "v1",
+            "imagePullSecrets": [
+                {
+                    "name": "builder-dockercfg-rsrua"
+                }
+            ],
+            "kind": "ServiceAccount",
             "metadata": {
                 "name": "builder",
                 "namespace": "default",
@@ -72,18 +83,18 @@ class OCServiceAccountSecretTest(unittest.TestCase):
                     "name": "builder-token-akqxi"
                 }
 
-            ],
-            "imagePullSecrets": [
-                {
-                    "name": "builder-dockercfg-rsrua"
-                }
             ]
         }
         '''
 
         oc_get_sa_after = '''{
-            "kind": "ServiceAccount",
             "apiVersion": "v1",
+            "imagePullSecrets": [
+                {
+                    "name": "builder-dockercfg-rsrua"
+                }
+            ],
+            "kind": "ServiceAccount",
             "metadata": {
                 "name": "builder",
                 "namespace": "default",
@@ -103,16 +114,10 @@ class OCServiceAccountSecretTest(unittest.TestCase):
                     "name": "newsecret"
                 }
 
-            ],
-            "imagePullSecrets": [
-                {
-                    "name": "builder-dockercfg-rsrua"
-                }
             ]
         }
         '''
-
-        builder_yaml_file = '''\
+        builder_ryaml_file = '''\
 secrets:
 - name: builder-dockercfg-rsrua
 - name: builder-token-akqxi
@@ -130,6 +135,24 @@ metadata:
   uid: cf47bca7-ebc4-11e6-b041-0ed9df7abc38
 '''
 
+        builder_pyyaml_file = '''\
+apiVersion: v1
+imagePullSecrets:
+- name: builder-dockercfg-rsrua
+kind: ServiceAccount
+metadata:
+  creationTimestamp: '2017-02-05T17:02:00Z'
+  name: builder
+  namespace: default
+  resourceVersion: '302879'
+  selfLink: /api/v1/namespaces/default/serviceaccounts/builder
+  uid: cf47bca7-ebc4-11e6-b041-0ed9df7abc38
+secrets:
+- name: builder-dockercfg-rsrua
+- name: builder-token-akqxi
+- name: newsecret
+'''
+
         # Return values of our mocked function call. These get returned once per call.
         mock_cmd.side_effect = [
             (0, oc_get_sa_before, ''),  # First call to the mock
@@ -158,8 +181,12 @@ metadata:
             mock.call(['oc', '-n', 'default', 'get', 'sa', 'builder', '-o', 'json'], None)
         ])
 
+        yaml_file = builder_pyyaml_file
+
+        if YAML_TYPE == 'ruamel':
+            yaml_file = builder_ryaml_file
         mock_write.assert_has_calls([
-            mock.call(mock.ANY, builder_yaml_file)
+            mock.call(mock.ANY, yaml_file)
         ])
 
     @mock.patch('oc_serviceaccount_secret.Utils.create_tmpfile_copy')
@@ -181,8 +208,13 @@ metadata:
         }
 
         oc_get_sa_before = '''{
-            "kind": "ServiceAccount",
             "apiVersion": "v1",
+            "imagePullSecrets": [
+                {
+                    "name": "builder-dockercfg-rsrua"
+                }
+            ],
+            "kind": "ServiceAccount",
             "metadata": {
                 "name": "builder",
                 "namespace": "default",
@@ -202,16 +234,11 @@ metadata:
                     "name": "newsecret"
                 }
 
-            ],
-            "imagePullSecrets": [
-                {
-                    "name": "builder-dockercfg-rsrua"
-                }
             ]
         }
         '''
 
-        builder_yaml_file = '''\
+        builder_ryaml_file = '''\
 secrets:
 - name: builder-dockercfg-rsrua
 - name: builder-token-akqxi
@@ -228,6 +255,23 @@ metadata:
   uid: cf47bca7-ebc4-11e6-b041-0ed9df7abc38
 '''
 
+        builder_pyyaml_file = '''\
+apiVersion: v1
+imagePullSecrets:
+- name: builder-dockercfg-rsrua
+kind: ServiceAccount
+metadata:
+  creationTimestamp: '2017-02-05T17:02:00Z'
+  name: builder
+  namespace: default
+  resourceVersion: '302879'
+  selfLink: /api/v1/namespaces/default/serviceaccounts/builder
+  uid: cf47bca7-ebc4-11e6-b041-0ed9df7abc38
+secrets:
+- name: builder-dockercfg-rsrua
+- name: builder-token-akqxi
+'''
+
         # Return values of our mocked function call. These get returned once per call.
         mock_cmd.side_effect = [
             (0, oc_get_sa_before, ''),  # First call to the mock
@@ -254,8 +298,12 @@ metadata:
             mock.call(['oc', '-n', 'default', 'replace', '-f', mock.ANY], None),
         ])
 
+        yaml_file = builder_pyyaml_file
+
+        if YAML_TYPE == 'ruamel':
+            yaml_file = builder_ryaml_file
         mock_write.assert_has_calls([
-            mock.call(mock.ANY, builder_yaml_file)
+            mock.call(mock.ANY, yaml_file)
         ])
 
     def tearDown(self):