From 6218b9938b523c545a7610a3c77d6a19aea81e1a Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 19 Jan 2017 12:24:52 -0500
Subject: Adding version to lib_openshift

---
 .../src/test/integration/oc_route.yml              | 77 ++++++++++++++++++++++
 .../src/test/integration/oc_version.yml            | 17 +++++
 roles/lib_openshift/src/test/integration/route.yml | 58 ----------------
 3 files changed, 94 insertions(+), 58 deletions(-)
 create mode 100755 roles/lib_openshift/src/test/integration/oc_route.yml
 create mode 100755 roles/lib_openshift/src/test/integration/oc_version.yml
 delete mode 100644 roles/lib_openshift/src/test/integration/route.yml

(limited to 'roles/lib_openshift/src/test/integration')

diff --git a/roles/lib_openshift/src/test/integration/oc_route.yml b/roles/lib_openshift/src/test/integration/oc_route.yml
new file mode 100755
index 000000000..620d5d5e7
--- /dev/null
+++ b/roles/lib_openshift/src/test/integration/oc_route.yml
@@ -0,0 +1,77 @@
+#!/usr/bin/ansible-playbook --module-path=../../../library/
+# ./oc_route.yml -M ../../../library -e "cli_master_test=$OPENSHIFT_MASTER
+---
+- hosts: "{{ cli_master_test }}"
+  gather_facts: no
+  user: root
+  tasks:
+  - name: create route
+    oc_route:
+      name: test
+      namespace: default
+      tls_termination: edge
+      cert_content: testing cert
+      cacert_content: testing cacert
+      key_content: key content
+      service_name: test
+      host: test.example
+    register: routeout
+  - debug: var=routeout
+
+  - assert:
+      that: "routeout.results.results[0]['metadata']['name'] == 'test'"
+      msg: route create failed
+
+  - name: get route
+    oc_route:
+      state: list
+      name: test
+      namespace: default
+    register: routeout
+  - debug: var=routeout
+
+  - assert:
+      that: "routeout.results[0]['metadata']['name'] == 'test'"
+      msg: get route failed
+
+  - name: delete route
+    oc_route:
+      state: absent
+      name: test
+      namespace: default
+    register: routeout
+  - debug: var=routeout
+
+  - assert:
+      that: "routeout.results.returncode == 0"
+      msg: delete route failed
+
+  - name: create route
+    oc_route:
+      name: test
+      namespace: default
+      tls_termination: edge
+      cert_content: testing cert
+      cacert_content: testing cacert
+      key_content: testing key
+      service_name: test
+      host: test.example
+    register: routeout
+  - debug: var=routeout
+
+  - name: create route noop
+    oc_route:
+      name: test
+      namespace: default
+      tls_termination: edge
+      cert_content: testing cert
+      cacert_content: testing cacert
+      key_content: testing key
+      service_name: test
+      host: test.example
+    register: routeout
+  - debug: var=routeout
+
+  - assert:
+      that: "routeout.changed == False"
+      msg: Route create not idempotent
diff --git a/roles/lib_openshift/src/test/integration/oc_version.yml b/roles/lib_openshift/src/test/integration/oc_version.yml
new file mode 100755
index 000000000..52336d8da
--- /dev/null
+++ b/roles/lib_openshift/src/test/integration/oc_version.yml
@@ -0,0 +1,17 @@
+#!/usr/bin/ansible-playbook --module-path=../../../library/
+# ./oc_version.yml -e "cli_master_test=$OPENSHIFT_MASTER
+---
+- hosts: "{{ cli_master_test }}"
+  gather_facts: no
+  user: root
+  tasks:
+  - name: Get openshift version
+    oc_version:
+    register: versionout
+
+  - debug: var=versionout
+
+  - assert:
+      that:
+      - "'oc_numeric' in versionout.results.keys()"
+      msg: "Did not find 'oc_numeric' in version results."
diff --git a/roles/lib_openshift/src/test/integration/route.yml b/roles/lib_openshift/src/test/integration/route.yml
deleted file mode 100644
index 6a96b334f..000000000
--- a/roles/lib_openshift/src/test/integration/route.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/ansible-playbook
-# ./route.yml -M ../../../library -e "cli_master_test=$OPENSHIFT_MASTER
----
-- hosts: "{{ cli_master_test }}"
-  gather_facts: no
-  user: root
-  tasks:
-  - name: create route
-    oc_route:
-      name: test
-      namespace: test
-      tls_termination: edge
-      cert_content: testing cert
-      cacert_content: testing cacert
-      service_name: test
-      host: test.example
-    register: routeout
-  - debug: var=routeout
-
-  - name: get route
-    oc_route:
-      state: list
-      name: test
-      namespace: default
-    register: routeout
-  - debug: var=routeout
-
-  - name: delete route
-    oc_route:
-      state: absent
-      name: test
-      namespace: default
-    register: routeout
-  - debug: var=routeout
-
-  - name: create route
-    oc_route:
-      name: test
-      namespace: test
-      tls_termination: edge
-      cert_content: testing cert
-      cacert_content: testing cacert
-      service_name: test
-      host: test.example
-    register: routeout
-  - debug: var=routeout
-
-  - name: create route noop
-    oc_route:
-      name: test
-      namespace: test
-      tls_termination: edge
-      cert_content: testing cert
-      cacert_content: testing cacert
-      service_name: test
-      host: test.example
-    register: routeout
-  - debug: var=routeout
-- 
cgit v1.2.3