5 files changed, 1067 insertions, 0 deletions
diff --git a/roles/lib_openshift/src/test/integration/oc_configmap.yml b/roles/lib_openshift/src/test/integration/oc_configmap.yml
new file mode 100755
index 000000000..c0d200e73
--- /dev/null
+++ b/roles/lib_openshift/src/test/integration/oc_configmap.yml
@@ -0,0 +1,95 @@
+#!/usr/bin/ansible-playbook --module-path=../../../library/
+## ./oc_configmap.yml -M ../../../library -e "cli_master_test=$OPENSHIFT_MASTER
+---
+- hosts: "{{ cli_master_test }}"
+  gather_facts: no
+  user: root
+  vars:
+    filename: /tmp/test_configmap_from_file
+
+  post_tasks:
+  - name: Setup a file with known contents
+    copy:
+      content: This is a file
+      dest: "{{ filename }}"
+
+  - name: create a test project
+    oc_project:
+      name: test
+      description: for tests only
+
+  ###### create test ###########
+  - name: create a configmap
+    oc_configmap:
+      state: present
+      name: configmaptest
+      namespace: test
+      from_file:
+        config: "{{ filename }}"
+      from_literal:
+        foo: bar
+
+  - name: fetch the created configmap
+    oc_configmap:
+      name: configmaptest
+      state: list
+      namespace: test
+    register: cmout
+
+  - debug: var=cmout
+
+  - name: assert configmaptest exists
+    assert:
+      that:
+      - cmout.results.results[0].metadata.name == 'configmaptest'
+      - cmout.results.results[0].data.foo == 'bar'
+  ###### end create test ###########
+
+  ###### update test ###########
+  - name: create a configmap
+    oc_configmap:
+      state: present
+      name: configmaptest
+      namespace: test
+      from_file:
+        config: "{{ filename }}"
+      from_literal:
+        foo: notbar
+        deployment_type: online
+
+  - name: fetch the updated configmap
+    oc_configmap:
+      name: configmaptest
+      state: list
+      namespace: test
+    register: cmout
+
+  - debug: var=cmout
+
+  - name: assert configmaptest exists
+    assert:
+      that:
+      - cmout.results.results[0].metadata.name == 'configmaptest'
+      - cmout.results.results[0].data.deployment_type == 'online'
+      - cmout.results.results[0].data.foo == 'notbar'
+  ###### end update test ###########
+
+  ###### delete test ###########
+  - name: delete a configmap
+    oc_configmap:
+      state: absent
+      name: configmaptest
+      namespace: test
+
+  - name: fetch the updated configmap
+    oc_configmap:
+      name: configmaptest
+      state: list
+      namespace: test
+    register: cmout
+
+  - debug: var=cmout
+
+  - name: assert configmaptest exists
+    assert:
+      that: "'\"configmaptest\" not found' in cmout.results.stderr"
diff --git a/roles/lib_openshift/src/test/integration/oc_user.yml b/roles/lib_openshift/src/test/integration/oc_user.yml
new file mode 100755
index 000000000..ad1f9d188
--- /dev/null
+++ b/roles/lib_openshift/src/test/integration/oc_user.yml
@@ -0,0 +1,240 @@
+#!/usr/bin/ansible-playbook --module-path=../../../library/
+#
+# ./oc_user.yml -e "cli_master_test=$OPENSHIFT_MASTER
+#
+---
+- hosts: "{{ cli_master_test }}"
+  gather_facts: no
+  user: root
+
+  vars:
+    test_user: testuser@email.com
+    test_user_fullname: "Test User"
+  pre_tasks:
+  - name: ensure needed vars are defined
+    fail:
+      msg: "{{ item }} no defined"
+    when: "{{ item}} is not defined"
+    with_items:
+    - cli_master_test  # ansible inventory instance to run playbook against
+
+  tasks:
+  - name: delete test user (so future tests work)
+    oc_user:
+      state: absent
+      username: "{{ test_user }}"
+
+  - name: get user list
+    oc_user:
+      state: list
+      username: "{{ test_user }}"
+    register: user_out
+  - name: "assert test user does not exist"
+    assert:
+      that: user_out['results'][0] == {}
+      msg: "{{ user_out }}"
+
+  - name: get all list
+    oc_user:
+      state: list
+    register: user_out
+  #- debug: var=user_out
+
+  - name: add test user
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      full_name: "{{ test_user_fullname }}"
+    register: user_out
+  - name: assert result set to changed
+    assert:
+      that: user_out['changed'] == True
+      msg: "{{ user_out }}"
+
+  - name: check test user actually added
+    oc_user:
+      state: list
+      username: "{{ test_user }}"
+    register: user_out
+  - name: assert user actually added
+    assert:
+      that: user_out['results'][0]['metadata']['name'] == "{{ test_user }}" and
+            user_out['results'][0]['fullName'] == "{{ test_user_fullname }}"
+      msg: "{{ user_out }}"
+
+  - name: re-add test user
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      full_name: "{{ test_user_fullname }}"
+    register: user_out
+  - name: assert re-add result set to not changed
+    assert:
+      that: user_out['changed'] == False
+      msg: "{{ user_out }}"
+
+  - name: modify existing user
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      full_name: 'Something Different'
+    register: user_out
+  - name: assert modify existing user result set to changed
+    assert:
+      that: user_out['changed'] == True
+      msg: "{{ user_out }}"
+
+  - name: check modify test user
+    oc_user:
+      state: list
+      username: "{{ test_user }}"
+    register: user_out
+  - name: assert modification successful
+    assert:
+      that: user_out['results'][0]['metadata']['name'] == "{{ test_user }}" and
+            user_out['results'][0]['fullName'] == 'Something Different'
+      msg: "{{ user_out }}"
+
+  - name: delete test user
+    oc_user:
+      state: absent
+      username: "{{ test_user }}"
+    register: user_out
+  - name: assert delete marked changed
+    assert:
+      that: user_out['changed'] == True
+      msg: "{{ user_out }}"
+
+  - name: check delete user
+    oc_user:
+      state: list
+      username: "{{ test_user }}"
+    register: user_out
+  - name: assert deletion successful
+    assert:
+      that: user_out['results'][0] == {}
+      msg: "{{ user_out }}"
+
+  - name: re-delete test user
+    oc_user:
+      state: absent
+      username: "{{ test_user }}"
+    register: user_out
+  - name: check re-delete marked not changed
+    assert:
+      that: user_out['changed'] == False
+      msg: "{{ user_out }}"
+
+  - name: delete test group
+    oc_obj:
+      kind: group
+      state: absent
+      name: integration-test-group
+
+  - name: create test group
+    command: oadm groups new integration-test-group
+
+  - name: check group creation
+    oc_obj:
+      kind: group
+      state: list
+      name: integration-test-group
+    register: user_out
+  - name: assert test group created
+    assert:
+      that: user_out['results']['results'][0]['metadata']['name'] == "integration-test-group"
+      msg: "{{ user_out }}"
+
+  - name: create user with group membership
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      groups:
+      - "integration-test-group"
+    register: user_out
+  - debug: var=user_out
+  - name: get group user members
+    oc_obj:
+      kind: group
+      state: list
+      name: integration-test-group
+    register: user_out
+  - name: assert user group membership
+    assert:
+      that: "'{{ test_user }}' in user_out['results']['results'][0]['users'][0]"
+      msg: "{{ user_out }}"
+
+  - name: delete second test group
+    oc_obj:
+      kind: group
+      state: absent
+      name: integration-test-group2
+
+  - name: create empty second group
+    command: oadm groups new integration-test-group2
+
+  - name: update user with second group membership
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      groups:
+      - "integration-test-group"
+      - "integration-test-group2"
+    register: user_out
+  - name: assert adding more group changed
+    assert:
+      that: user_out['changed'] == True
+
+  - name: get group memberships
+    oc_obj:
+      kind: group
+      state: list
+      name: "{{ item }}"
+    with_items:
+    - integration-test-group
+    - integration-test-group2
+    register: user_out
+  - name: assert user member of above groups
+    assert:
+      that: "'{{ test_user }}' in user_out['results'][0]['results']['results'][0]['users'] and \
+            '{{ test_user }}' in user_out['results'][1]['results']['results'][0]['users']"
+      msg: "{{ user_out }}"
+
+  - name: update user with only one group
+    oc_user:
+      state: present
+      username: "{{ test_user }}"
+      groups:
+      - "integration-test-group2"
+    register: user_out
+  - assert:
+      that: user_out['changed'] == True
+
+  - name: get group memberships
+    oc_obj:
+      kind: group
+      state: list
+      name: "{{ item }}"
+    with_items:
+    - "integration-test-group"
+    - "integration-test-group2"
+    register: user_out
+  - debug: var=user_out
+  - name: assert proper user membership
+    assert:
+      that: "'{{ test_user }}' not in user_out['results'][0]['results']['results'][0]['users'] and \
+             '{{ test_user }}' in user_out['results'][1]['results']['results'][0]['users']"
+
+  - name: clean up test groups
+    oc_obj:
+      kind: group
+      state: absent
+      name: "{{ item }}"
+    with_items:
+    - "integration-test-group"
+    - "integration-test-group2"
+
+  - name: clean up test user
+    oc_user:
+      state: absent
+      username: "{{ test_user }}"
diff --git a/roles/lib_openshift/src/test/unit/test_oc_configmap.py b/roles/lib_openshift/src/test/unit/test_oc_configmap.py
new file mode 100755
index 000000000..318fd6167
--- /dev/null
+++ b/roles/lib_openshift/src/test/unit/test_oc_configmap.py
@@ -0,0 +1,239 @@
+'''
+ Unit tests for oc configmap
+'''
+
+import copy
+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,wrong-import-position
+# 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_configmap import OCConfigMap, locate_oc_binary  # noqa: E402
+
+
+class OCConfigMapTest(unittest.TestCase):
+    '''
+     Test class for OCConfigMap
+    '''
+    params = {'kubeconfig': '/etc/origin/master/admin.kubeconfig',
+              'state': 'present',
+              'debug': False,
+              'name': 'configmap',
+              'from_file': {},
+              'from_literal': {},
+              'namespace': 'test'}
+
+    @mock.patch('oc_configmap.Utils._write')
+    @mock.patch('oc_configmap.Utils.create_tmpfile_copy')
+    @mock.patch('oc_configmap.OCConfigMap._run')
+    def test_create_configmap(self, mock_run, mock_tmpfile_copy, mock_write):
+        ''' Testing a configmap create '''
+        # TODO
+        return
+        params = copy.deepcopy(OCConfigMapTest.params)
+        params['from_file'] = {'test': '/root/file'}
+        params['from_literal'] = {'foo': 'bar'}
+
+        configmap = '''{
+                "apiVersion": "v1",
+                "data": {
+                    "foo": "bar",
+                    "test": "this is a file\\n"
+                },
+                "kind": "ConfigMap",
+                "metadata": {
+                    "creationTimestamp": "2017-03-20T20:24:35Z",
+                    "name": "configmap",
+                    "namespace": "test"
+                }
+            }'''
+
+        mock_run.side_effect = [
+            (1, '', 'Error from server (NotFound): configmaps "configmap" not found'),
+            (0, '', ''),
+            (0, configmap, ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCConfigMap.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+        self.assertEqual(results['results']['results'][0]['metadata']['name'], 'configmap')
+
+    @mock.patch('oc_configmap.Utils._write')
+    @mock.patch('oc_configmap.Utils.create_tmpfile_copy')
+    @mock.patch('oc_configmap.OCConfigMap._run')
+    def test_update_configmap(self, mock_run, mock_tmpfile_copy, mock_write):
+        ''' Testing a configmap create '''
+        params = copy.deepcopy(OCConfigMapTest.params)
+        params['from_file'] = {'test': '/root/file'}
+        params['from_literal'] = {'foo': 'bar', 'deployment_type': 'online'}
+
+        configmap = '''{
+                "apiVersion": "v1",
+                "data": {
+                    "foo": "bar",
+                    "test": "this is a file\\n"
+                },
+                "kind": "ConfigMap",
+                "metadata": {
+                    "creationTimestamp": "2017-03-20T20:24:35Z",
+                    "name": "configmap",
+                    "namespace": "test"
+
+                }
+            }'''
+
+        mod_configmap = '''{
+                "apiVersion": "v1",
+                "data": {
+                    "foo": "bar",
+                    "deployment_type": "online",
+                    "test": "this is a file\\n"
+                },
+                "kind": "ConfigMap",
+                "metadata": {
+                    "creationTimestamp": "2017-03-20T20:24:35Z",
+                    "name": "configmap",
+                    "namespace": "test"
+
+                }
+            }'''
+
+        mock_run.side_effect = [
+            (0, configmap, ''),
+            (0, mod_configmap, ''),
+            (0, configmap, ''),
+            (0, '', ''),
+            (0, mod_configmap, ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCConfigMap.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+        self.assertEqual(results['results']['results'][0]['metadata']['name'], 'configmap')
+        self.assertEqual(results['results']['results'][0]['data']['deployment_type'], 'online')
+
+    @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_pvc.py b/roles/lib_openshift/src/test/unit/test_oc_pvc.py
new file mode 100755
index 000000000..82187917d
--- /dev/null
+++ b/roles/lib_openshift/src/test/unit/test_oc_pvc.py
@@ -0,0 +1,366 @@
+'''
+ Unit tests for oc pvc
+'''
+
+import copy
+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,wrong-import-position
+# 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_pvc import OCPVC, locate_oc_binary  # noqa: E402
+
+
+class OCPVCTest(unittest.TestCase):
+    '''
+     Test class for OCPVC
+    '''
+    params = {'kubeconfig': '/etc/origin/master/admin.kubeconfig',
+              'state': 'present',
+              'debug': False,
+              'name': 'mypvc',
+              'namespace': 'test',
+              'volume_capacity': '1G',
+              'access_modes': 'ReadWriteMany'}
+
+    @mock.patch('oc_pvc.Utils.create_tmpfile_copy')
+    @mock.patch('oc_pvc.OCPVC._run')
+    def test_create_pvc(self, mock_run, mock_tmpfile_copy):
+        ''' Testing a pvc create '''
+        params = copy.deepcopy(OCPVCTest.params)
+
+        pvc = '''{"kind": "PersistentVolumeClaim",
+               "apiVersion": "v1",
+               "metadata": {
+                   "name": "mypvc",
+                   "namespace": "test",
+                   "selfLink": "/api/v1/namespaces/test/persistentvolumeclaims/mypvc",
+                   "uid": "77597898-d8d8-11e6-aea5-0e3c0c633889",
+                   "resourceVersion": "126510787",
+                   "creationTimestamp": "2017-01-12T15:04:50Z",
+                   "labels": {
+                       "mypvc": "database"
+                   },
+                   "annotations": {
+                       "pv.kubernetes.io/bind-completed": "yes",
+                       "pv.kubernetes.io/bound-by-controller": "yes",
+                       "v1.2-volume.experimental.kubernetes.io/provisioning-required": "volume.experimental.kubernetes.io/provisioning-completed"
+                   }
+               },
+               "spec": {
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                   "resources": {
+                       "requests": {
+                           "storage": "1Gi"
+                       }
+                   },
+                   "volumeName": "pv-aws-ow5vl"
+               },
+               "status": {
+                  "phase": "Bound",
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                    "capacity": {
+                      "storage": "1Gi"
+                    }
+               }
+              }'''
+
+        mock_run.side_effect = [
+            (1, '', 'Error from server: persistentvolumeclaims "mypvc" not found'),
+            (1, '', 'Error from server: persistentvolumeclaims "mypvc" not found'),
+            (0, '', ''),
+            (0, pvc, ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCPVC.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+        self.assertEqual(results['results']['results'][0]['metadata']['name'], 'mypvc')
+
+    @mock.patch('oc_pvc.Utils.create_tmpfile_copy')
+    @mock.patch('oc_pvc.OCPVC._run')
+    def test_update_pvc(self, mock_run, mock_tmpfile_copy):
+        ''' Testing a pvc create '''
+        params = copy.deepcopy(OCPVCTest.params)
+        params['access_modes'] = 'ReadWriteMany'
+
+        pvc = '''{"kind": "PersistentVolumeClaim",
+               "apiVersion": "v1",
+               "metadata": {
+                   "name": "mypvc",
+                   "namespace": "test",
+                   "selfLink": "/api/v1/namespaces/test/persistentvolumeclaims/mypvc",
+                   "uid": "77597898-d8d8-11e6-aea5-0e3c0c633889",
+                   "resourceVersion": "126510787",
+                   "creationTimestamp": "2017-01-12T15:04:50Z",
+                   "labels": {
+                       "mypvc": "database"
+                   },
+                   "annotations": {
+                       "pv.kubernetes.io/bind-completed": "yes",
+                       "pv.kubernetes.io/bound-by-controller": "yes",
+                       "v1.2-volume.experimental.kubernetes.io/provisioning-required": "volume.experimental.kubernetes.io/provisioning-completed"
+                   }
+               },
+               "spec": {
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                   "resources": {
+                       "requests": {
+                           "storage": "1Gi"
+                       }
+                   },
+                   "volumeName": "pv-aws-ow5vl"
+               },
+               "status": {
+                  "phase": "Bound",
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                    "capacity": {
+                      "storage": "1Gi"
+                    }
+               }
+              }'''
+
+        mod_pvc = '''{"kind": "PersistentVolumeClaim",
+               "apiVersion": "v1",
+               "metadata": {
+                   "name": "mypvc",
+                   "namespace": "test",
+                   "selfLink": "/api/v1/namespaces/test/persistentvolumeclaims/mypvc",
+                   "uid": "77597898-d8d8-11e6-aea5-0e3c0c633889",
+                   "resourceVersion": "126510787",
+                   "creationTimestamp": "2017-01-12T15:04:50Z",
+                   "labels": {
+                       "mypvc": "database"
+                   },
+                   "annotations": {
+                       "pv.kubernetes.io/bind-completed": "yes",
+                       "pv.kubernetes.io/bound-by-controller": "yes",
+                       "v1.2-volume.experimental.kubernetes.io/provisioning-required": "volume.experimental.kubernetes.io/provisioning-completed"
+                   }
+               },
+               "spec": {
+                   "accessModes": [
+                       "ReadWriteMany"
+                   ],
+                   "resources": {
+                       "requests": {
+                           "storage": "1Gi"
+                       }
+                   },
+                   "volumeName": "pv-aws-ow5vl"
+               },
+               "status": {
+                  "phase": "Bound",
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                    "capacity": {
+                      "storage": "1Gi"
+                    }
+               }
+              }'''
+
+        mock_run.side_effect = [
+            (0, pvc, ''),
+            (0, pvc, ''),
+            (0, '', ''),
+            (0, mod_pvc, ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCPVC.run_ansible(params, False)
+
+        self.assertFalse(results['changed'])
+        self.assertEqual(results['results']['msg'], '##### - This volume is currently bound.  Will not update - ####')
+
+    @mock.patch('oc_pvc.Utils.create_tmpfile_copy')
+    @mock.patch('oc_pvc.OCPVC._run')
+    def test_delete_pvc(self, mock_run, mock_tmpfile_copy):
+        ''' Testing a pvc create '''
+        params = copy.deepcopy(OCPVCTest.params)
+        params['state'] = 'absent'
+
+        pvc = '''{"kind": "PersistentVolumeClaim",
+               "apiVersion": "v1",
+               "metadata": {
+                   "name": "mypvc",
+                   "namespace": "test",
+                   "selfLink": "/api/v1/namespaces/test/persistentvolumeclaims/mypvc",
+                   "uid": "77597898-d8d8-11e6-aea5-0e3c0c633889",
+                   "resourceVersion": "126510787",
+                   "creationTimestamp": "2017-01-12T15:04:50Z",
+                   "labels": {
+                       "mypvc": "database"
+                   },
+                   "annotations": {
+                       "pv.kubernetes.io/bind-completed": "yes",
+                       "pv.kubernetes.io/bound-by-controller": "yes",
+                       "v1.2-volume.experimental.kubernetes.io/provisioning-required": "volume.experimental.kubernetes.io/provisioning-completed"
+                   }
+               },
+               "spec": {
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                   "resources": {
+                       "requests": {
+                           "storage": "1Gi"
+                       }
+                   },
+                   "volumeName": "pv-aws-ow5vl"
+               },
+               "status": {
+                  "phase": "Bound",
+                   "accessModes": [
+                       "ReadWriteOnce"
+                   ],
+                    "capacity": {
+                      "storage": "1Gi"
+                    }
+               }
+              }'''
+
+        mock_run.side_effect = [
+            (0, pvc, ''),
+            (0, '', ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCPVC.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+
+    @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_user.py b/roles/lib_openshift/src/test/unit/test_oc_user.py
new file mode 100755
index 000000000..f7a17cc2c
--- /dev/null
+++ b/roles/lib_openshift/src/test/unit/test_oc_user.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python2
+'''
+ Unit tests for oc user
+'''
+# To run
+# ./oc_user.py
+#
+# ..
+# ----------------------------------------------------------------------
+# Ran 2 tests in 0.003s
+#
+# 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 oc_user import OCUser  # noqa: E402
+
+
+class OCUserTest(unittest.TestCase):
+    '''
+     Test class for OCUser
+    '''
+
+    def setUp(self):
+        ''' setup method will create a file and set to known configuration '''
+        pass
+
+    @mock.patch('oc_user.Utils.create_tmpfile_copy')
+    @mock.patch('oc_user.OCUser._run')
+    def test_state_list(self, mock_cmd, mock_tmpfile_copy):
+        ''' Testing a user list '''
+        params = {'username': 'testuser@email.com',
+                  'state': 'list',
+                  'kubeconfig': '/etc/origin/master/admin.kubeconfig',
+                  'full_name': None,
+                  'groups': [],
+                  'debug': False}
+
+        user = '''{
+               "kind": "User",
+               "apiVersion": "v1",
+               "metadata": {
+                   "name": "testuser@email.com",
+                   "selfLink": "/oapi/v1/users/testuser@email.com",
+                   "uid": "02fee6c9-f20d-11e6-b83b-12e1a7285e80",
+                   "resourceVersion": "38566887",
+                   "creationTimestamp": "2017-02-13T16:53:58Z"
+               },
+               "fullName": "Test User",
+               "identities": null,
+               "groups": null
+           }'''
+
+        mock_cmd.side_effect = [
+            (0, user, ''),
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCUser.run_ansible(params, False)
+
+        self.assertFalse(results['changed'])
+        self.assertTrue(results['results'][0]['metadata']['name'] == "testuser@email.com")
+
+    @mock.patch('oc_user.Utils.create_tmpfile_copy')
+    @mock.patch('oc_user.OCUser._run')
+    def test_state_present(self, mock_cmd, mock_tmpfile_copy):
+        ''' Testing a user list '''
+        params = {'username': 'testuser@email.com',
+                  'state': 'present',
+                  'kubeconfig': '/etc/origin/master/admin.kubeconfig',
+                  'full_name': 'Test User',
+                  'groups': [],
+                  'debug': False}
+
+        created_user = '''{
+                          "kind": "User",
+                          "apiVersion": "v1",
+                          "metadata": {
+                              "name": "testuser@email.com",
+                              "selfLink": "/oapi/v1/users/testuser@email.com",
+                              "uid": "8d508039-f224-11e6-b83b-12e1a7285e80",
+                              "resourceVersion": "38646241",
+                              "creationTimestamp": "2017-02-13T19:42:28Z"
+                          },
+                          "fullName": "Test User",
+                          "identities": null,
+                          "groups": null
+                      }'''
+
+        mock_cmd.side_effect = [
+            (1, '', 'Error from server: users "testuser@email.com" not found'),  # get
+            (1, '', 'Error from server: users "testuser@email.com" not found'),  # get
+            (0, 'user "testuser@email.com" created', ''),  # create
+            (0, created_user, ''),  # get
+        ]
+
+        mock_tmpfile_copy.side_effect = [
+            '/tmp/mocked_kubeconfig',
+        ]
+
+        results = OCUser.run_ansible(params, False)
+
+        self.assertTrue(results['changed'])
+        self.assertTrue(results['results']['results'][0]['metadata']['name'] ==
+                        "testuser@email.com")
+
+    def tearDown(self):
+        '''TearDown method'''
+        pass
+
+
+if __name__ == "__main__":
+    unittest.main()