From 2c2783db79faa780709ef16c3a1a71378ec2f4e3 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 6 Feb 2017 21:04:59 -0500 Subject: Adding port support for route. --- .../src/test/integration/oc_route.yml | 38 +++ roles/lib_openshift/src/test/unit/oc_route.py | 261 +++++++++++++++++++++ 2 files changed, 299 insertions(+) create mode 100755 roles/lib_openshift/src/test/unit/oc_route.py (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/integration/oc_route.yml b/roles/lib_openshift/src/test/integration/oc_route.yml index 620d5d5e7..489e982ce 100755 --- a/roles/lib_openshift/src/test/integration/oc_route.yml +++ b/roles/lib_openshift/src/test/integration/oc_route.yml @@ -75,3 +75,41 @@ - assert: that: "routeout.changed == False" msg: Route create not idempotent + + - name: delete route + oc_route: + name: test + namespace: default + state: absent + register: routeout + + - name: create route + oc_route: + name: test + namespace: default + tls_termination: passthrough + service_name: test + host: test.example + port: 8443 + register: routeout + + - assert: + that: "routeout.changed == True" + that: "routeout.results['results'][0]['spec']['port']['targetPort'] == 8443" + msg: Route create not idempotent + + - name: create route + oc_route: + name: test + namespace: default + tls_termination: passthrough + service_name: test + host: test.example + port: 8444 + register: routeout + - debug: var=routeout + + - assert: + that: "routeout.changed == True" + that: "routeout.results.results[0]['spec']['port']['targetPort'] == 8444" + msg: Route update not idempotent diff --git a/roles/lib_openshift/src/test/unit/oc_route.py b/roles/lib_openshift/src/test/unit/oc_route.py new file mode 100755 index 000000000..ea3c27b94 --- /dev/null +++ b/roles/lib_openshift/src/test/unit/oc_route.py @@ -0,0 +1,261 @@ +#!/usr/bin/env python2 +''' + Unit tests for oc route +''' +# To run: +# ./oc_serviceaccount.py +# +# . +# Ran 1 test in 0.002s +# +# 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,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_route import OCRoute # noqa: E402 + + +class OCRouteTest(unittest.TestCase): + ''' + Test class for OCServiceAccount + ''' + + def setUp(self): + ''' setup method will create a file and set to known configuration ''' + pass + +# @mock.patch('oc_route.OCRoute._run') +# def test_list_route(self, mock_cmd): +# ''' Testing getting a route ''' +# +# # Arrange +# +# # run_ansible input parameters +# params = { +# 'kubeconfig': '/etc/origin/master/admin.kubeconfig', +# 'state': 'list', +# 'debug': False, +# 'name': 'test', +# 'namespace': 'default', +# 'tls_termination': 'passthrough', +# 'dest_cacert_path': None, +# 'cacert_path': None, +# 'cert_path': None, +# 'key_path': None, +# 'dest_cacert_content': None, +# 'cacert_content': None, +# 'cert_content': None, +# 'key_content': None, +# 'service_name': 'testservice', +# 'host': 'test.openshift.com', +# 'wildcard_policy': None, +# 'weight': None, +# 'port': None +# } +# +# route_result ='''{ +# "kind": "Route", +# "apiVersion": "v1", +# "metadata": { +# "name": "test", +# "namespace": "default", +# "selfLink": "/oapi/v1/namespaces/default/routes/test", +# "uid": "1b127c67-ecd9-11e6-96eb-0e0d9bdacd26", +# "resourceVersion": "439182", +# "creationTimestamp": "2017-02-07T01:59:48Z" +# }, +# "spec": { +# "host": "test.example", +# "to": { +# "kind": "Service", +# "name": "test", +# "weight": 100 +# }, +# "port": { +# "targetPort": 8443 +# }, +# "tls": { +# "termination": "passthrough" +# }, +# "wildcardPolicy": "None" +# }, +# "status": { +# "ingress": [ +# { +# "host": "test.example", +# "routerName": "router", +# "conditions": [ +# { +# "type": "Admitted", +# "status": "True", +# "lastTransitionTime": "2017-02-07T01:59:48Z" +# } +# ], +# "wildcardPolicy": "None" +# } +# ] +# } +# }''' +# +# +# # Return values of our mocked function call. These get returned once per call. +# mock_cmd.side_effect = [ +# # First call to mock +# (0, route_result, ''), +# ] +# +# # Act +# results = OCRoute.run_ansible(params, False) +# +# # Assert +# self.assertFalse(results['changed']) +# self.assertEqual(results['state'], 'list') +# self.assertEqual(results['results'][0]['metadata']['name'], 'test') +# +# # Making sure our mock was called as we expected +# mock_cmd.assert_has_calls([ +# mock.call(['oc', '-n', 'default', 'get', 'route', 'test', '-o', 'json'], None), +# ]) + + @mock.patch('oc_route.Yedit._write') + @mock.patch('oc_route.OCRoute._run') + def test_create_route(self, mock_cmd, mock_write): + ''' Testing getting a route ''' + + # Arrange + + # run_ansible input parameters + params = { + 'kubeconfig': '/etc/origin/master/admin.kubeconfig', + 'state': 'present', + 'debug': True, + #'debug': False, + 'name': 'test', + 'namespace': 'default', + 'tls_termination': 'edge', + 'dest_cacert_path': None, + 'cacert_path': None, + 'cert_path': None, + 'key_path': None, + 'dest_cacert_content': None, + 'cacert_content': 'testing', + 'cert_content': 'testing', + 'key_content': 'testing', + 'service_name': 'testservice', + 'host': 'test.openshift.com', + 'wildcard_policy': None, + 'weight': None, + 'port': None + } + + route_result ='''{ + "apiVersion": "v1", + "kind": "Route", + "metadata": { + "creationTimestamp": "2017-02-07T20:55:10Z", + "name": "test", + "namespace": "default", + "resourceVersion": "517745", + "selfLink": "/oapi/v1/namespaces/default/routes/test", + "uid": "b6f25898-ed77-11e6-9755-0e737db1e63a" + }, + "spec": { + "host": "test.openshift.com", + "tls": { + "caCertificate": "testing", + "certificate": "testing", + "key": "testing", + "termination": "edge" + }, + "to": { + "kind": "Service", + "name": "testservice", + "weight": 100 + }, + "wildcardPolicy": "None" + }, + "status": { + "ingress": [ + { + "conditions": [ + { + "lastTransitionTime": "2017-02-07T20:55:10Z", + "status": "True", + "type": "Admitted" + } + ], + "host": "test.openshift.com", + "routerName": "router", + "wildcardPolicy": "None" + } + ] + } + }''' + + test_route = '''\ +kind: Route +spec: + tls: + caCertificate: testing + termination: edge + certificate: testing + key: testing + to: + kind: Service + name: testservice + weight: 100 + host: test.openshift.com + wildcardPolicy: None +apiVersion: v1 +metadata: + namespace: default + name: test +''' + + + # Return values of our mocked function call. These get returned once per call. + mock_cmd.side_effect = [ + # First call to mock + (1, '', 'Error from server: routes "test" not found'), + (1, '', 'Error from server: routes "test" not found'), + (0, 'route "test" created', ''), + (0, route_result, ''), + ] + + mock_write.assert_has_calls = [ + # First call to mock + mock.call('/tmp/test', test_route) + ] + + # Act + results = OCRoute.run_ansible(params, False) + + # Assert + self.assertTrue(results['changed']) + self.assertEqual(results['state'], 'present') + self.assertEqual(results['results']['results'][0]['metadata']['name'], 'test') + + # Making sure our mock was called as we expected + mock_cmd.assert_has_calls([ + mock.call(['oc', '-n', 'default', 'get', 'route', 'test', '-o', 'json'], None), + mock.call(['oc', '-n', 'default', 'create', '-f', '/tmp/test'], None), + ]) + + def tearDown(self): + '''TearDown method''' + pass + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 1f090ec4a1c1db7f602021ffa95705ebd1464b86 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Tue, 7 Feb 2017 17:03:23 -0500 Subject: Fixing tests for linters. --- .../src/test/integration/oc_route.yml | 10 +- roles/lib_openshift/src/test/unit/oc_route.py | 190 ++++++++++----------- 2 files changed, 100 insertions(+), 100 deletions(-) (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/integration/oc_route.yml b/roles/lib_openshift/src/test/integration/oc_route.yml index 489e982ce..b9d635eaa 100755 --- a/roles/lib_openshift/src/test/integration/oc_route.yml +++ b/roles/lib_openshift/src/test/integration/oc_route.yml @@ -94,8 +94,9 @@ register: routeout - assert: - that: "routeout.changed == True" - that: "routeout.results['results'][0]['spec']['port']['targetPort'] == 8443" + that: + - "routeout.changed == True" + - "routeout.results['results'][0]['spec']['port']['targetPort'] == 8443" msg: Route create not idempotent - name: create route @@ -110,6 +111,7 @@ - debug: var=routeout - assert: - that: "routeout.changed == True" - that: "routeout.results.results[0]['spec']['port']['targetPort'] == 8444" + that: + - "routeout.changed == True" + - "routeout.results.results[0]['spec']['port']['targetPort'] == 8444" msg: Route update not idempotent diff --git a/roles/lib_openshift/src/test/unit/oc_route.py b/roles/lib_openshift/src/test/unit/oc_route.py index ea3c27b94..102903cc1 100755 --- a/roles/lib_openshift/src/test/unit/oc_route.py +++ b/roles/lib_openshift/src/test/unit/oc_route.py @@ -35,98 +35,98 @@ class OCRouteTest(unittest.TestCase): ''' setup method will create a file and set to known configuration ''' pass -# @mock.patch('oc_route.OCRoute._run') -# def test_list_route(self, mock_cmd): -# ''' Testing getting a route ''' -# -# # Arrange -# -# # run_ansible input parameters -# params = { -# 'kubeconfig': '/etc/origin/master/admin.kubeconfig', -# 'state': 'list', -# 'debug': False, -# 'name': 'test', -# 'namespace': 'default', -# 'tls_termination': 'passthrough', -# 'dest_cacert_path': None, -# 'cacert_path': None, -# 'cert_path': None, -# 'key_path': None, -# 'dest_cacert_content': None, -# 'cacert_content': None, -# 'cert_content': None, -# 'key_content': None, -# 'service_name': 'testservice', -# 'host': 'test.openshift.com', -# 'wildcard_policy': None, -# 'weight': None, -# 'port': None -# } -# -# route_result ='''{ -# "kind": "Route", -# "apiVersion": "v1", -# "metadata": { -# "name": "test", -# "namespace": "default", -# "selfLink": "/oapi/v1/namespaces/default/routes/test", -# "uid": "1b127c67-ecd9-11e6-96eb-0e0d9bdacd26", -# "resourceVersion": "439182", -# "creationTimestamp": "2017-02-07T01:59:48Z" -# }, -# "spec": { -# "host": "test.example", -# "to": { -# "kind": "Service", -# "name": "test", -# "weight": 100 -# }, -# "port": { -# "targetPort": 8443 -# }, -# "tls": { -# "termination": "passthrough" -# }, -# "wildcardPolicy": "None" -# }, -# "status": { -# "ingress": [ -# { -# "host": "test.example", -# "routerName": "router", -# "conditions": [ -# { -# "type": "Admitted", -# "status": "True", -# "lastTransitionTime": "2017-02-07T01:59:48Z" -# } -# ], -# "wildcardPolicy": "None" -# } -# ] -# } -# }''' -# -# -# # Return values of our mocked function call. These get returned once per call. -# mock_cmd.side_effect = [ -# # First call to mock -# (0, route_result, ''), -# ] -# -# # Act -# results = OCRoute.run_ansible(params, False) -# -# # Assert -# self.assertFalse(results['changed']) -# self.assertEqual(results['state'], 'list') -# self.assertEqual(results['results'][0]['metadata']['name'], 'test') -# -# # Making sure our mock was called as we expected -# mock_cmd.assert_has_calls([ -# mock.call(['oc', '-n', 'default', 'get', 'route', 'test', '-o', 'json'], None), -# ]) + @mock.patch('oc_route.OCRoute._run') + def test_list_route(self, mock_cmd): + ''' Testing getting a route ''' + + # Arrange + + # run_ansible input parameters + params = { + 'kubeconfig': '/etc/origin/master/admin.kubeconfig', + 'state': 'list', + 'debug': False, + 'name': 'test', + 'namespace': 'default', + 'tls_termination': 'passthrough', + 'dest_cacert_path': None, + 'cacert_path': None, + 'cert_path': None, + 'key_path': None, + 'dest_cacert_content': None, + 'cacert_content': None, + 'cert_content': None, + 'key_content': None, + 'service_name': 'testservice', + 'host': 'test.openshift.com', + 'wildcard_policy': None, + 'weight': None, + 'port': None + } + + route_result ='''{ + "kind": "Route", + "apiVersion": "v1", + "metadata": { + "name": "test", + "namespace": "default", + "selfLink": "/oapi/v1/namespaces/default/routes/test", + "uid": "1b127c67-ecd9-11e6-96eb-0e0d9bdacd26", + "resourceVersion": "439182", + "creationTimestamp": "2017-02-07T01:59:48Z" + }, + "spec": { + "host": "test.example", + "to": { + "kind": "Service", + "name": "test", + "weight": 100 + }, + "port": { + "targetPort": 8443 + }, + "tls": { + "termination": "passthrough" + }, + "wildcardPolicy": "None" + }, + "status": { + "ingress": [ + { + "host": "test.example", + "routerName": "router", + "conditions": [ + { + "type": "Admitted", + "status": "True", + "lastTransitionTime": "2017-02-07T01:59:48Z" + } + ], + "wildcardPolicy": "None" + } + ] + } + }''' + + + # Return values of our mocked function call. These get returned once per call. + mock_cmd.side_effect = [ + # First call to mock + (0, route_result, ''), + ] + + # Act + results = OCRoute.run_ansible(params, False) + + # Assert + self.assertFalse(results['changed']) + self.assertEqual(results['state'], 'list') + self.assertEqual(results['results'][0]['metadata']['name'], 'test') + + # Making sure our mock was called as we expected + mock_cmd.assert_has_calls([ + mock.call(['oc', '-n', 'default', 'get', 'route', 'test', '-o', 'json'], None), + ]) @mock.patch('oc_route.Yedit._write') @mock.patch('oc_route.OCRoute._run') @@ -139,8 +139,7 @@ class OCRouteTest(unittest.TestCase): params = { 'kubeconfig': '/etc/origin/master/admin.kubeconfig', 'state': 'present', - 'debug': True, - #'debug': False, + 'debug': False, 'name': 'test', 'namespace': 'default', 'tls_termination': 'edge', @@ -159,7 +158,7 @@ class OCRouteTest(unittest.TestCase): 'port': None } - route_result ='''{ + route_result = '''{ "apiVersion": "v1", "kind": "Route", "metadata": { @@ -223,7 +222,6 @@ metadata: name: test ''' - # Return values of our mocked function call. These get returned once per call. mock_cmd.side_effect = [ # First call to mock -- cgit v1.2.3 From 28e64664e55c69eaa0a7d87933e1a702cd7ebac7 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Wed, 8 Feb 2017 12:13:38 -0500 Subject: Fixing for flake8 spacing. --- roles/lib_openshift/src/test/unit/oc_route.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/lib_openshift/src/test') diff --git a/roles/lib_openshift/src/test/unit/oc_route.py b/roles/lib_openshift/src/test/unit/oc_route.py index 102903cc1..fcfa88cbf 100755 --- a/roles/lib_openshift/src/test/unit/oc_route.py +++ b/roles/lib_openshift/src/test/unit/oc_route.py @@ -64,7 +64,7 @@ class OCRouteTest(unittest.TestCase): 'port': None } - route_result ='''{ + route_result = '''{ "kind": "Route", "apiVersion": "v1", "metadata": { @@ -108,7 +108,6 @@ class OCRouteTest(unittest.TestCase): } }''' - # Return values of our mocked function call. These get returned once per call. mock_cmd.side_effect = [ # First call to mock -- cgit v1.2.3