2 files changed, 233 insertions, 4 deletions
diff --git a/roles/lib_openshift/src/test/integration/group.yml b/roles/lib_openshift/src/test/integration/group.yml
new file mode 100755
index 000000000..25aa5727b
--- /dev/null
+++ b/roles/lib_openshift/src/test/integration/group.yml
@@ -0,0 +1,229 @@
+#!/usr/bin/ansible-playbook
+---
+- hosts: "{{ cli_master_test }}"
+  gather_facts: no
+  user: root
+
+  vars:
+
+  post_tasks:
+  - name: delete test group (so future tests work)
+    oc_group:
+      state: absent
+      name: jgroup
+
+  - name: delete 2nd test group (so future tests work)
+    oc_group:
+      state: absent
+      name: jgroup2
+
+  - name: delete test user (so future tests work)
+    oc_user:
+      state: absent
+      username: jdiaz@redhat.com
+
+  - name: get group list
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert group 'jgroup' (test group) does not exist
+    assert:
+      that: group_out['results'][0] == {}
+
+  - name: get group list
+    oc_group:
+      state: list
+      name: jgroup2
+    register: group_out
+  #- debug: var=group_out
+  - name: assert group 'jgroup2' (test group) does not exist
+    assert:
+      that: group_out['results'][0] == {}
+
+  - name: get user list
+    oc_user:
+      state: list
+      username: 'jdiaz@redhat.com'
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user 'jdiaz@redhat.com' (test user) does not exist
+    assert:
+      that: group_out['results'][0] == {}
+
+  - name: create group
+    oc_group:
+      state: present
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert creating group marked changed
+    assert:
+      that: group_out['changed'] == True
+
+  - name: list group
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert group actually created
+    assert:
+      that: group_out['results'][0]['metadata']['name'] == 'jgroup'
+
+  - name: re-add group
+    oc_group:
+      state: present
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert re-adding group marked not changed
+    assert:
+      that: group_out['changed'] == False
+
+
+  - name: add user with group membership
+    oc_user:
+      state: present
+      username: jdiaz@redhat.com
+      full_name: Joel Diaz
+      groups:
+      - jgroup
+    register: group_out
+  #- debug: var=group_out
+
+  - name: get group
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  - name: assert user in group
+    assert:
+      that: group_out['results'][0]['users'][0] == 'jdiaz@redhat.com'
+
+  - name: add 2nd group
+    oc_group:
+      state: present
+      name: jgroup2
+
+  - name: change group membership
+    oc_user:
+      state: present
+      username: jdiaz@redhat.com
+      full_name: Joel Diaz
+      groups:
+      - jgroup2
+    register: group_out
+  - name: assert result changed
+    assert:
+      that: group_out['changed'] == True
+
+  - name: check jgroup user membership
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user not present in previous group
+    assert:
+      that: group_out['results'][0]['users'] == []
+
+  - name: check jgroup2 user membership
+    oc_group:
+      state: list
+      name: jgroup2
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user present in new group
+    assert:
+      that: group_out['results'][0]['users'][0] == 'jdiaz@redhat.com'
+
+  - name: multi-group membership
+    oc_user:
+      state: present
+      username: jdiaz@redhat.com
+      full_name: Joel Diaz
+      groups:
+      - jgroup
+      - jgroup2
+    register: group_out
+  - name: assert result changed
+    assert:
+      that: group_out['changed'] == True
+
+  - name: check jgroup user membership
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user present in group
+    assert:
+      that: group_out['results'][0]['users'][0] == 'jdiaz@redhat.com'
+
+  - name: check jgroup2 user membership
+    oc_group:
+      state: list
+      name: jgroup2
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user still present in group
+    assert:
+      that: group_out['results'][0]['users'][0] == 'jdiaz@redhat.com'
+
+  - name: user delete (group cleanup)
+    oc_user:
+      state: absent
+      username: jdiaz@redhat.com
+    register: group_out
+
+  - name: get user list for jgroup
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert that group jgroup has no members
+    assert:
+      that: group_out['results'][0]['users'] == []
+
+  - name: get user list for jgroup2
+    oc_group:
+      state: list
+      name: jgroup2
+    register: group_out
+  #- debug: var=group_out
+  - name: assert that group jgroup2 has no members
+    assert:
+      that: group_out['results'][0]['users'] == []
+
+  - name: user without groups defined
+    oc_user:
+      state: present
+      username: jdiaz@redhat.com
+      full_name: Joel Diaz
+    register: group_out
+  - name: assert result changed
+    assert:
+      that: group_out['changed'] == True
+
+  - name: check jgroup user membership
+    oc_group:
+      state: list
+      name: jgroup
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user not present in group
+    assert:
+      that: group_out['results'][0]['users'] == []
+
+  - name: check jgroup2 user membership
+    oc_group:
+      state: list
+      name: jgroup2
+    register: group_out
+  #- debug: var=group_out
+  - name: assert user not present in group
+    assert:
+      that: group_out['results'][0]['users'] == []
diff --git a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml
index 3ee13a409..1ed2ef11b 100755
--- a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml
+++ b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml
@@ -1,6 +1,6 @@
 #!/usr/bin/ansible-playbook --module-path=../../../library/
 #
-# ./oadm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER
+# ./oc_adm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER
 ---
 - hosts: "{{ cli_master_test }}"
   gather_facts: no
@@ -17,7 +17,7 @@
       node_to_test: "{{ obj_out['results']['results'][0]['items'][0]['metadata']['name'] }}"
 
   - name: list pods from a node
-    oadm_manage_node:
+    oc_adm_manage_node:
       list_pods: True
       node:
       - "{{ node_to_test }}"
@@ -29,7 +29,7 @@
       msg: Pod data was not returned
 
   - name: set node to unschedulable
-    oadm_manage_node:
+    oc_adm_manage_node:
       schedulable: False
       node:
       - "{{ node_to_test }}"
@@ -56,7 +56,7 @@
       that: nodeout.results.results[0]['spec']['unschedulable']
 
   - name: set node to schedulable
-    oadm_manage_node:
+    oc_adm_manage_node:
       schedulable: True
       node:
       - "{{ node_to_test }}"