From 2a4e2483eec39885d07568ce85814d29138bbf10 Mon Sep 17 00:00:00 2001 From: bk160f Date: Sun, 19 Aug 2018 04:16:29 -0500 Subject: [PATCH] Changes to tap service and flow update tests in taas Client Add tempest tests for the tap service and flow update Change-Id: Ibba64c78e5e244599c8b6d8defb33d77330ba563 --- .../tests/tempest_plugin/services/client.py | 4 ++-- .../tempest_plugin/tests/api/test_taas.py | 23 +++++++++++++++++++ .../tests/tempest_plugin/tests/taas_client.py | 18 +++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/neutron_taas/tests/tempest_plugin/services/client.py b/neutron_taas/tests/tempest_plugin/services/client.py index a720412..73c8e86 100644 --- a/neutron_taas/tests/tempest_plugin/services/client.py +++ b/neutron_taas/tests/tempest_plugin/services/client.py @@ -24,7 +24,7 @@ class TapServicesClient(base.BaseNetworkClient): return self.create_resource(uri, post_data) def update_tap_service(self, tap_service_id, **kwargs): - uri = '/taas/tap_services' + uri = '/taas/tap_services/%s' % tap_service_id post_data = {'tap_service': kwargs} return self.update_resource(uri, post_data) @@ -49,7 +49,7 @@ class TapFlowsClient(base.BaseNetworkClient): return self.create_resource(uri, post_data) def update_tap_flow(self, tap_flow_id, **kwargs): - uri = '/taas/tap_flows' + uri = '/taas/tap_flows/%s' % tap_flow_id post_data = {'tap_flow': kwargs} return self.update_resource(uri, post_data) diff --git a/neutron_taas/tests/tempest_plugin/tests/api/test_taas.py b/neutron_taas/tests/tempest_plugin/tests/api/test_taas.py index db027fb..b5af856 100644 --- a/neutron_taas/tests/tempest_plugin/tests/api/test_taas.py +++ b/neutron_taas/tests/tempest_plugin/tests/api/test_taas.py @@ -47,3 +47,26 @@ class TaaSExtensionTestJSON(base.BaseTaaSTest): # delete port self.ports_client.delete_port(port['id']) self.tap_services_client.delete_tap_service(tap_service['id']) + + @decorators.idempotent_id('687089b8-b045-496d-86bf-030b380039d1') + def test_update_tap_service(self): + network = self.create_network() + port = self.create_port(network) + tap_service = self.create_tap_service(port_id=port['id']) + # Update description of the tap service + self.update_tap_service( + tap_service['id'], + description='Tap Service Description Updated') + + @decorators.idempotent_id('bb4d5482-37fc-46b5-85a5-5867e9adbfae') + def test_update_tap_flow(self): + network = self.create_network() + port = self.create_port(network) + tap_service = self.create_tap_service(port_id=port['id']) + tap_flow = self.create_tap_flow( + tap_service_id=tap_service['id'], + direction='BOTH', source_port=port['id']) + # Update description of the tap flow + self.update_tap_flow( + tap_flow['id'], + description='Tap Flow Description Updated') diff --git a/neutron_taas/tests/tempest_plugin/tests/taas_client.py b/neutron_taas/tests/tempest_plugin/tests/taas_client.py index 561f097..8a53a1a 100644 --- a/neutron_taas/tests/tempest_plugin/tests/taas_client.py +++ b/neutron_taas/tests/tempest_plugin/tests/taas_client.py @@ -64,3 +64,21 @@ class TaaSClientMixin(object): self.tap_flows_client.delete_tap_flow, tap_flow['id']) return tap_flow + + def update_tap_service(self, tap_service_id, **kwargs): + body = self.tap_services_client.update_tap_service( + tap_service_id, + **kwargs) + tap_service = body['tap_service'] + self.addCleanup(test_utils.call_and_ignore_notfound_exc, + self.tap_services_client.delete_tap_service, + tap_service['id']) + + def update_tap_flow(self, tap_flow_id, **kwargs): + body = self.tap_flows_client.update_tap_flow( + tap_flow_id, + **kwargs) + tap_flow = body['tap_flow'] + self.addCleanup(test_utils.call_and_ignore_notfound_exc, + self.tap_flows_client.delete_tap_flow, + tap_flow['id'])