From 8237eebd0d24ed8577d8360bea220af70807d073 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Sun, 29 Jan 2017 14:21:29 -0500 Subject: Adding oc_service to lib_openshift. --- .../src/test/integration/oc_service.yml | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 roles/lib_openshift/src/test/integration/oc_service.yml (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/integration/oc_service.yml b/roles/lib_openshift/src/test/integration/oc_service.yml new file mode 100755 index 000000000..4222d32b2 --- /dev/null +++ b/roles/lib_openshift/src/test/integration/oc_service.yml @@ -0,0 +1,91 @@ +#!/usr/bin/ansible-playbook --module-path=../../../library/ +# ./oc_service.yml -M ../../../library -e "cli_master_test=$OPENSHIFT_MASTER +--- +- hosts: "{{ cli_master_test }}" + gather_facts: no + user: root + tasks: + - name: create the default registry service + oc_service: + namespace: default + name: test-registry + ports: + - name: 9000-tcp + port: 9000 + protocol: TCP + targetPort: 9000 + selector: + test-registtry: default + session_affinity: ClientIP + service_type: ClusterIP + register: svcout + + - assert: + that: "svcout.results.results[0]['metadata']['name'] == 'test-registry'" + msg: route create failed + + - name: oc_service + oc_service: + name: test-registry + namespace: default + state: list + register: svc_out + + - assert: + that: "svcout.results.results[0]['metadata']['name'] == 'test-registry'" + 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 -- cgit v1.2.3 From 494f7e410df1641eb598e81f65153867071d5fee Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 30 Jan 2017 14:32:29 -0500 Subject: Adding integration tests. --- .../src/test/integration/oc_service.yml | 154 +++++++++++++-------- 1 file changed, 96 insertions(+), 58 deletions(-) (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/integration/oc_service.yml b/roles/lib_openshift/src/test/integration/oc_service.yml index 4222d32b2..a76fd746c 100755 --- a/roles/lib_openshift/src/test/integration/oc_service.yml +++ b/roles/lib_openshift/src/test/integration/oc_service.yml @@ -18,11 +18,55 @@ test-registtry: default session_affinity: ClientIP service_type: ClusterIP - register: svcout + register: svc_out + - debug: var=svc_out + + - assert: + that: + - "svc_out.results.results[0]['metadata']['name'] == 'test-registry'" + - svc_out.changed + msg: service create failed. + + # Test idempotent create + - name: NOOP create the default registry service + oc_service: + namespace: default + name: test-registry + ports: + - name: 9000-tcp + port: 9000 + protocol: TCP + targetPort: 9000 + selector: + test-registtry: default + session_affinity: ClientIP + service_type: ClusterIP + register: svc_out + + - assert: + that: + - "svc_out.results.results[0]['metadata']['name'] == 'test-registry'" + - svc_out.changed == False + msg: service create failed. No changes expected + + - name: create the default registry service + oc_service: + namespace: default + name: test-registry + ports: + - name: 9000-tcp + port: 9000 + protocol: TCP + targetPort: 9000 + selector: + test-registtry: default + session_affinity: ClientIP + service_type: ClusterIP + register: svc_out - assert: - that: "svcout.results.results[0]['metadata']['name'] == 'test-registry'" - msg: route create failed + that: "svc_out.results.results[0]['metadata']['name'] == 'test-registry'" + msg: service create failed - name: oc_service oc_service: @@ -32,60 +76,54 @@ register: svc_out - assert: - that: "svcout.results.results[0]['metadata']['name'] == 'test-registry'" - msg: route create failed + that: "svc_out.results.results[0]['metadata']['name'] == 'test-registry'" + msg: service create failed + + - name: create the default registry service + oc_service: + namespace: default + name: test-registry + ports: + - name: 9001-tcp + port: 9001 + protocol: TCP + targetPort: 9001 + selector: + test-registtry: default + session_affinity: ClientIP + service_type: ClusterIP + register: svc_out + - assert: + that: "svc_out.results.results[0]['spec']['ports'][0]['name'] == '9001-tcp'" + msg: service update failed + + - name: oc delete service + oc_service: + name: test-registry + namespace: default + state: absent + register: svc_out + - debug: var=svc_out + + - assert: + that: + - "svc_out.results['returncode'] == 0" + - "svc_out.results.results == ''" + msg: service delete failed + + - name: oc get service + oc_service: + name: test-registry + namespace: default + state: list + register: svc_out + - debug: var=svc_out + + - assert: + that: + - svc_out.changed == False + - svc_out.results.returncode == 1 + - "'not found' in svc_out.results.stderr" + msg: service get 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 -- cgit v1.2.3 From a4cf9c4119623ad2023aefbe652a424cb567383c Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 30 Jan 2017 16:08:35 -0500 Subject: Adding unit test for oc_service. Added environment fix for non-standard oc installs. --- roles/lib_openshift/src/test/unit/oc_service.py | 206 ++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100755 roles/lib_openshift/src/test/unit/oc_service.py (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/unit/oc_service.py b/roles/lib_openshift/src/test/unit/oc_service.py new file mode 100755 index 000000000..69f7dd49c --- /dev/null +++ b/roles/lib_openshift/src/test/unit/oc_service.py @@ -0,0 +1,206 @@ +#!/usr/bin/env python2 +''' + Unit tests for oc service +''' +# 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 oc_service import OCService # noqa: E402 + + +# pylint: disable=too-many-public-methods +class OCServiceTest(unittest.TestCase): + ''' + Test class for OCService + ''' + + def setUp(self): + ''' setup method will create a file and set to known configuration ''' + pass + + @mock.patch('oc_service.OCService._run') + def test_state_list(self, mock_cmd): + ''' Testing a get ''' + params = {'name': 'router', + 'namespace': 'default', + 'ports': None, + 'state': 'list', + 'labels': None, + 'clusterip': None, + 'portalip': None, + 'selector': None, + 'session_affinity': None, + 'service_type': None, + 'kubeconfig': '/etc/origin/master/admin.kubeconfig', + 'debug': False} + + service = '''{ + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "router", + "namespace": "default", + "selfLink": "/api/v1/namespaces/default/services/router", + "uid": "fabd2440-e3d8-11e6-951c-0e3dd518cefa", + "resourceVersion": "3206", + "creationTimestamp": "2017-01-26T15:06:14Z", + "labels": { + "router": "router" + } + }, + "spec": { + "ports": [ + { + "name": "80-tcp", + "protocol": "TCP", + "port": 80, + "targetPort": 80 + }, + { + "name": "443-tcp", + "protocol": "TCP", + "port": 443, + "targetPort": 443 + }, + { + "name": "1936-tcp", + "protocol": "TCP", + "port": 1936, + "targetPort": 1936 + }, + { + "name": "5000-tcp", + "protocol": "TCP", + "port": 5000, + "targetPort": 5000 + } + ], + "selector": { + "router": "router" + }, + "clusterIP": "172.30.129.161", + "type": "ClusterIP", + "sessionAffinity": "None" + }, + "status": { + "loadBalancer": {} + } + }''' + mock_cmd.side_effect = [ + (0, service, '') + ] + + results = OCService.run_ansible(params, False) + + self.assertFalse(results['changed']) + self.assertEqual(results['results']['results'][0]['metadata']['name'], 'router') + + @mock.patch('oc_service.OCService._run') + def test_create(self, mock_cmd): + ''' Testing a create service ''' + params = {'name': 'router', + 'namespace': 'default', + 'ports': {'name': '9000-tcp', + 'port': 9000, + 'protocol': 'TCP', + 'targetPOrt': 9000}, + 'state': 'present', + 'labels': None, + 'clusterip': None, + 'portalip': None, + 'selector': {'router': 'router'}, + 'session_affinity': 'ClientIP', + 'service_type': 'ClusterIP', + 'kubeconfig': '/etc/origin/master/admin.kubeconfig', + 'debug': False} + + service = '''{ + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "router", + "namespace": "default", + "selfLink": "/api/v1/namespaces/default/services/router", + "uid": "fabd2440-e3d8-11e6-951c-0e3dd518cefa", + "resourceVersion": "3206", + "creationTimestamp": "2017-01-26T15:06:14Z", + "labels": { + "router": "router" + } + }, + "spec": { + "ports": [ + { + "name": "80-tcp", + "protocol": "TCP", + "port": 80, + "targetPort": 80 + }, + { + "name": "443-tcp", + "protocol": "TCP", + "port": 443, + "targetPort": 443 + }, + { + "name": "1936-tcp", + "protocol": "TCP", + "port": 1936, + "targetPort": 1936 + }, + { + "name": "5000-tcp", + "protocol": "TCP", + "port": 5000, + "targetPort": 5000 + } + ], + "selector": { + "router": "router" + }, + "clusterIP": "172.30.129.161", + "type": "ClusterIP", + "sessionAffinity": "None" + }, + "status": { + "loadBalancer": {} + } + }''' + mock_cmd.side_effect = [ + (1, '', 'Error from server: services "router" not found'), + (1, '', 'Error from server: services "router" not found'), + (0, service, ''), + (0, service, '') + ] + + results = OCService.run_ansible(params, False) + + self.assertTrue(results['changed']) + self.assertTrue(results['results']['returncode'] == 0) + self.assertEqual(results['results']['results'][0]['metadata']['name'], 'router') + + def tearDown(self): + '''TearDown method''' + pass + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 7767df1e42e71f992b706e225e677b666a032141 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 30 Jan 2017 16:18:07 -0500 Subject: Fixing for tox tests. (flake8|pylint) --- roles/lib_openshift/src/test/integration/oc_service.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/integration/oc_service.yml b/roles/lib_openshift/src/test/integration/oc_service.yml index a76fd746c..616694382 100755 --- a/roles/lib_openshift/src/test/integration/oc_service.yml +++ b/roles/lib_openshift/src/test/integration/oc_service.yml @@ -126,4 +126,3 @@ - svc_out.results.returncode == 1 - "'not found' in svc_out.results.stderr" msg: service get failed - -- cgit v1.2.3