Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test cases.

6 files changed, 378 insertions, 93 deletions

diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py
index 37904c43f..a9911966b 100644
--- a/roles/lib_openshift/src/class/oc_adm_registry.py
+++ b/roles/lib_openshift/src/class/oc_adm_registry.py
@@ -119,7 +119,6 @@ class Registry(OpenShiftCLI):
 
     def exists(self):
         '''does the object exist?'''
-        self.get()
         if self.deploymentconfig and self.service:
             return True
 
@@ -180,7 +179,8 @@ class Registry(OpenShiftCLI):
             service.put('spec.portalIP', self.portal_ip)
 
         # the dry-run doesn't apply the selector correctly
-        service.put('spec.selector', self.service.get_selector())
+        if self.service:
+            service.put('spec.selector', self.service.get_selector())
 
         # need to create the service and the deploymentconfig
         service_file = Utils.create_tmp_file_from_contents('service', service.yaml_dict)
diff --git a/roles/lib_openshift/src/lib/base.py b/roles/lib_openshift/src/lib/base.py
index d037074a5..3bc34a675 100644
--- a/roles/lib_openshift/src/lib/base.py
+++ b/roles/lib_openshift/src/lib/base.py
@@ -577,7 +577,7 @@ class OpenShiftCLIConfig(object):
         self.kubeconfig = kubeconfig
         self.name = rname
         self.namespace = namespace
-        self._options = options
+        self._options = collections.OrderedDict(options)
 
     @property
     def config_options(self):
diff --git a/roles/lib_openshift/src/lib/import.py b/roles/lib_openshift/src/lib/import.py
index a79297898..97e03062e 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 collections
 import copy
 import json
 import os
diff --git a/roles/lib_openshift/src/test/unit/oc_adm_ca.py b/roles/lib_openshift/src/test/unit/oc_adm_ca.py
deleted file mode 100755
index 836285ac6..000000000
--- a/roles/lib_openshift/src/test/unit/oc_adm_ca.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python2
-'''
- Unit tests for oadm certificate authority
-'''
-# To run
-# python -m unittest version
-#
-# .
-# Ran 1 test in 0.597s
-#
-# OK
-
-import os
-import sys
-import unittest
-import mock
-
-# Removing invalid variable names for tests so that I can
-# keep them brief
-# pylint: disable=invalid-name,no-name-in-module
-# Disable import-error b/c our libraries aren't loaded in jenkins
-# pylint: disable=import-error
-# place class in our python path
-module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library')  # noqa: E501
-sys.path.insert(0, module_path)
-from oadm_ca import CertificateAuthority  # noqa: E402
-
-
-# pylint: disable=too-many-public-methods
-class OadmCATest(unittest.TestCase):
-    '''
-     Test class for oadm_ca
-    '''
-
-    def setUp(self):
-        ''' setup method will set to known configuration '''
-        pass
-
-    @mock.patch('oadm_ca.Utils.create_tmpfile_copy')
-    @mock.patch('oadm_ca.CertificateAuthority._run')
-    def test_state_list(self, mock_cmd, mock_tmpfile_copy):
-        ''' Testing a get '''
-
-
-
-        params = {'cmd': 'create-server-cert',
-                  'signer_cert': '/etc/origin/master/ca.crt',
-                  'signer_key': '/etc/origin/master/ca.key',
-                  'signer_serial': '/etc/origin/master/ca.serial.txt',
-                  'hostnames': ['registry.test.openshift.com',
-                                '127.0.0.1',
-                                'docker-registry.default.svc.cluster.local'],
-                  'cert': '/etc/origin/master/registry.crt',
-                  'key': '/etc/origin/master/registry.key',
-                  'kubeconfig': '/etc/origin/master/admin.kubeconfig',
-		  'private_key': None,
-                  'public_key': None,
-                  'cert_dir': None,
-                  'master': None,
-                  'public_master': None,
-                  'overwrite': False,
-                  'state': 'present',
-                  'debug': False}
-
-        mock_cmd.side_effect = [
-            (0, '', '')
-        ]
-
-        mock_tmpfile_copy.side_effect = [
-            '/tmp/mock_kubeconfig',
-        ]
-
-        results = CertificateAuthority.run_ansible(params, False)
-        import pdb; pdb.set_trace()
-
-        self.assertFalse(results['changed'])
-        self.assertEqual(results['results']['results'][0]['metadata']['name'], 'mysql-ephemeral')
-
-    def tearDown(self):
-        '''TearDown method'''
-        pass
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/roles/lib_openshift/src/test/unit/test_oc_adm_registry.py b/roles/lib_openshift/src/test/unit/test_oc_adm_registry.py
new file mode 100755
index 000000000..a663c5a97
--- /dev/null
+++ b/roles/lib_openshift/src/test/unit/test_oc_adm_registry.py
@@ -0,0 +1,370 @@
+#!/usr/bin/env python
+'''
+ Unit tests for oc adm registry
+'''
+
+import os
+import six
+import sys
+import unittest
+import mock
+
+# Removing invalid variable names for tests so that I can
+# keep them brief
+# pylint: disable=invalid-name,no-name-in-module
+# Disable import-error b/c our libraries aren't loaded in jenkins
+# pylint: disable=import-error
+# place class in our python path
+module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library')  # noqa: E501
+sys.path.insert(0, module_path)
+from oc_adm_registry import Registry, locate_oc_binary  # noqa: E402
+
+
+# pylint: disable=too-many-public-methods
+class RegistryTest(unittest.TestCase):
+    '''
+     Test class for Registry
+    '''
+    dry_run = '''{
+        "kind": "List",
+        "apiVersion": "v1",
+        "metadata": {},
+        "items": [
+            {
+                "kind": "ServiceAccount",
+                "apiVersion": "v1",
+                "metadata": {
+                    "name": "registry",
+                    "creationTimestamp": null
+                }
+            },
+            {
+                "kind": "ClusterRoleBinding",
+                "apiVersion": "v1",
+                "metadata": {
+                    "name": "registry-registry-role",
+                    "creationTimestamp": null
+                },
+                "userNames": [
+                    "system:serviceaccount:default:registry"
+                ],
+                "groupNames": null,
+                "subjects": [
+                    {
+                        "kind": "ServiceAccount",
+                        "namespace": "default",
+                        "name": "registry"
+                    }
+                ],
+                "roleRef": {
+                    "kind": "ClusterRole",
+                    "name": "system:registry"
+                }
+            },
+            {
+                "kind": "DeploymentConfig",
+                "apiVersion": "v1",
+                "metadata": {
+                    "name": "docker-registry",
+                    "creationTimestamp": null,
+                    "labels": {
+                        "docker-registry": "default"
+                    }
+                },
+                "spec": {
+                    "strategy": {
+                        "resources": {}
+                    },
+                    "triggers": [
+                        {
+                            "type": "ConfigChange"
+                        }
+                    ],
+                    "replicas": 1,
+                    "test": false,
+                    "selector": {
+                        "docker-registry": "default"
+                    },
+                    "template": {
+                        "metadata": {
+                            "creationTimestamp": null,
+                            "labels": {
+                                "docker-registry": "default"
+                            }
+                        },
+                        "spec": {
+                            "volumes": [
+                                {
+                                    "name": "registry-storage",
+                                    "emptyDir": {}
+                                }
+                            ],
+                            "containers": [
+                                {
+                                    "name": "registry",
+                                    "image": "openshift3/ose-docker-registry:v3.5.0.39",
+                                    "ports": [
+                                        {
+                                            "containerPort": 5000
+                                        }
+                                    ],
+                                    "env": [
+                                        {
+                                            "name": "REGISTRY_HTTP_ADDR",
+                                            "value": ":5000"
+                                        },
+                                        {
+                                            "name": "REGISTRY_HTTP_NET",
+                                            "value": "tcp"
+                                        },
+                                        {
+                                            "name": "REGISTRY_HTTP_SECRET",
+                                            "value": "WQjSGeUu5KFZRTwGeIXgwIjyraNDLmdJblsFbtzZdF8="
+                                        },
+                                        {
+                                            "name": "REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ENFORCEQUOTA",
+                                            "value": "false"
+                                        }
+                                    ],
+                                    "resources": {
+                                        "requests": {
+                                            "cpu": "100m",
+                                            "memory": "256Mi"
+                                        }
+                                    },
+                                    "volumeMounts": [
+                                        {
+                                            "name": "registry-storage",
+                                            "mountPath": "/registry"
+                                        }
+                                    ],
+                                    "livenessProbe": {
+                                        "httpGet": {
+                                            "path": "/healthz",
+                                            "port": 5000
+                                        },
+                                        "initialDelaySeconds": 10,
+                                        "timeoutSeconds": 5
+                                    },
+                                    "readinessProbe": {
+                                        "httpGet": {
+                                            "path": "/healthz",
+                                            "port": 5000
+                                        },
+                                        "timeoutSeconds": 5
+                                    },
+                                    "securityContext": {
+                                        "privileged": false
+                                    }
+                                }
+                            ],
+                            "nodeSelector": {
+                                "type": "infra"
+                            },
+                            "serviceAccountName": "registry",
+                            "serviceAccount": "registry"
+                        }
+                    }
+                },
+                "status": {
+                    "latestVersion": 0,
+                    "observedGeneration": 0,
+                    "replicas": 0,
+                    "updatedReplicas": 0,
+                    "availableReplicas": 0,
+                    "unavailableReplicas": 0
+                }
+            },
+            {
+                "kind": "Service",
+                "apiVersion": "v1",
+                "metadata": {
+                    "name": "docker-registry",
+                    "creationTimestamp": null,
+                    "labels": {
+                        "docker-registry": "default"
+                    }
+                },
+                "spec": {
+                    "ports": [
+                        {
+                            "name": "5000-tcp",
+                            "port": 5000,
+                            "targetPort": 5000
+                        }
+                    ],
+                    "selector": {
+                        "docker-registry": "default"
+                    },
+                    "clusterIP": "172.30.119.110",
+                    "sessionAffinity": "ClientIP"
+                },
+                "status": {
+                    "loadBalancer": {}
+                }
+            }
+        ]}'''
+
+
+    @mock.patch('oc_adm_registry.Utils._write')
+    @mock.patch('oc_adm_registry.Utils.create_tmpfile_copy')
+    @mock.patch('oc_adm_registry.Registry._run')
+    def test_state_list(self, mock_cmd, mock_tmpfile_copy, mock_write):
+        ''' Testing state present '''
+        params = {'state': 'present',
+                  'debug': False,
+                  'namespace': 'default',
+                  'name': 'docker-registry',
+                  'kubeconfig': '/etc/origin/master/admin.kubeconfig',
+                  'images': None,
+                  'latest_images': None,
+                  'labels': None,
+                  'ports': ['5000'],
+                  'replicas': 1,
+                  'selector': 'type=infra',
+                  'service_account': 'registry',
+                  'mount_host': None,
+                  'volume_mounts': None,
+                  'env_vars': {},
+                  'enforce_quota': False,
+                  'force': False,
+                  'daemonset': False,
+                  'tls_key': None,
+                  'tls_certificate': None,
+                  'edits': []}
+
+        mock_cmd.side_effect = [
+            (1, '', 'Error from server (NotFound): deploymentconfigs "docker-registry" not found'),
+            (1, '', 'Error from server (NotFound): service "docker-registry" not found'),
+            (0, RegistryTest.dry_run, ''),
+            (0, '', ''),
+            (0, '', ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = Registry.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+        for result in results['results']['results']:
+            self.assertEqual(result['returncode'], 0)
+
+        mock_cmd.assert_has_calls([
+            mock.call(['oc', 'get', 'dc', 'docker-registry', '-o', 'json', '-n', 'default'], None),
+            mock.call(['oc', 'get', 'svc', 'docker-registry', '-o', 'json', '-n', 'default'], None),
+            mock.call(['oc', 'adm', 'registry', '-n', 'default', '--replicas=1', '--selector=type=infra',
+                       '--enforce-quota=False', '--service-account=registry', '--ports=5000',
+                       '--daemonset=False', '--dry-run=True', '-o', 'json', '-n', 'default'], None),
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None),
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None), ])
+
+    @unittest.skipIf(six.PY3, 'py2 test only')
+    @mock.patch('os.path.exists')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_fallback(self, mock_env_get, mock_path_exists):
+        ''' Testing binary lookup fallback '''
+
+        mock_env_get.side_effect = lambda _v, _d: ''
+
+        mock_path_exists.side_effect = lambda _: False
+
+        self.assertEqual(locate_oc_binary(), 'oc')
+
+    @unittest.skipIf(six.PY3, 'py2 test only')
+    @mock.patch('os.path.exists')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_path(self, mock_env_get, mock_path_exists):
+        ''' Testing binary lookup in path '''
+
+        oc_bin = '/usr/bin/oc'
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_path_exists.side_effect = lambda f: f == oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
+
+    @unittest.skipIf(six.PY3, 'py2 test only')
+    @mock.patch('os.path.exists')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_usr_local(self, mock_env_get, mock_path_exists):
+        ''' Testing binary lookup in /usr/local/bin '''
+
+        oc_bin = '/usr/local/bin/oc'
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_path_exists.side_effect = lambda f: f == oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
+
+    @unittest.skipIf(six.PY3, 'py2 test only')
+    @mock.patch('os.path.exists')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_home(self, mock_env_get, mock_path_exists):
+        ''' Testing binary lookup in ~/bin '''
+
+        oc_bin = os.path.expanduser('~/bin/oc')
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_path_exists.side_effect = lambda f: f == oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
+
+    @unittest.skipIf(six.PY2, 'py3 test only')
+    @mock.patch('shutil.which')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_fallback_py3(self, mock_env_get, mock_shutil_which):
+        ''' Testing binary lookup fallback '''
+
+        mock_env_get.side_effect = lambda _v, _d: ''
+
+        mock_shutil_which.side_effect = lambda _f, path=None: None
+
+        self.assertEqual(locate_oc_binary(), 'oc')
+
+    @unittest.skipIf(six.PY2, 'py3 test only')
+    @mock.patch('shutil.which')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_path_py3(self, mock_env_get, mock_shutil_which):
+        ''' Testing binary lookup in path '''
+
+        oc_bin = '/usr/bin/oc'
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_shutil_which.side_effect = lambda _f, path=None: oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
+
+    @unittest.skipIf(six.PY2, 'py3 test only')
+    @mock.patch('shutil.which')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_usr_local_py3(self, mock_env_get, mock_shutil_which):
+        ''' Testing binary lookup in /usr/local/bin '''
+
+        oc_bin = '/usr/local/bin/oc'
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_shutil_which.side_effect = lambda _f, path=None: oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
+
+    @unittest.skipIf(six.PY2, 'py3 test only')
+    @mock.patch('shutil.which')
+    @mock.patch('os.environ.get')
+    def test_binary_lookup_in_home_py3(self, mock_env_get, mock_shutil_which):
+        ''' Testing binary lookup in ~/bin '''
+
+        oc_bin = os.path.expanduser('~/bin/oc')
+
+        mock_env_get.side_effect = lambda _v, _d: '/bin:/usr/bin'
+
+        mock_shutil_which.side_effect = lambda _f, path=None: oc_bin
+
+        self.assertEqual(locate_oc_binary(), oc_bin)
diff --git a/roles/lib_openshift/src/test/unit/test_oc_adm_router.py b/roles/lib_openshift/src/test/unit/test_oc_adm_router.py
index 410ae3bd4..5184990e8 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_adm_router.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_adm_router.py
@@ -344,7 +344,6 @@ class RouterTest(unittest.TestCase):
             (0, '', ''),
         ]
 
-
         mock_tmpfile_copy.side_effect = [
             '/tmp/mocked_kubeconfig',
         ]
@@ -362,10 +361,10 @@ class RouterTest(unittest.TestCase):
             mock.call(['oc', 'get', 'secret', 'router-certs', '-o', 'json', '-n', 'default'], None),
             mock.call(['oc', 'get', 'clusterrolebinding', 'router-router-role', '-o', 'json', '-n', 'default'], None),
             mock.call(['oc', 'adm', 'router', 'router', '-n', 'default', '--external-host-insecure=False', '--replicas=2', '--selector=type=infra', '--stats-port=1936', '--service-account=router', '--expose-metrics=False', '--ports=80:80,443:443', '--dry-run=True', '-o', 'json', '-n', 'default'], None),
-            mock.call(['oc', 'create', '-f', '/tmp/ClusterRoleBindingyDm_yh', '-n', 'default'], None),
-            mock.call(['oc', 'create', '-f', '/tmp/ServiceAccountbzYs4o', '-n', 'default'], None),
-            mock.call(['oc', 'create', '-f', '/tmp/ServiceWfYdjg', '-n', 'default'], None),
-            mock.call(['oc', 'create', '-f', '/tmp/DeploymentConfigxfIFpn', '-n', 'default'], None)])
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None),
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None),
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None),
+            mock.call(['oc', 'create', '-f', mock.ANY, '-n', 'default'], None)])
 
     @unittest.skipIf(six.PY3, 'py2 test only')
     @mock.patch('os.path.exists')