From 853b855803dd70bbc371e96fa8582cd0e039db04 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 5 Jun 2018 09:25:36 +0200 Subject: Provide support for VNFs Currently it is not possible to define different images for client/server and VNFs. This functionality is important to have in order to test different VNFs Change-Id: Ibc3b3f1102d52529701748d37f795cdf05269410 Signed-off-by: Manuel Buil --- sfc/tests/functest/config.yaml | 4 ++++ sfc/tests/functest/sfc_parent_function.py | 9 +++++++++ 2 files changed, 13 insertions(+) (limited to 'sfc/tests/functest') diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index d18a0033..9c743553 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -25,6 +25,10 @@ defaults: vnfd-dir: "vnfd-templates" vnfd-default-params-file: "test-vnfd-default-params.yaml" + # [OPTIONAL] Only when deploying VNFs without the default image (vxlan_tool) + # vnf_image_name: xxx + # vnf_image_format: yyy + # vnf_image_url: zzz testcases: sfc_one_chain_two_service_functions: diff --git a/sfc/tests/functest/sfc_parent_function.py b/sfc/tests/functest/sfc_parent_function.py index 336d8d42..a16fa6a7 100644 --- a/sfc/tests/functest/sfc_parent_function.py +++ b/sfc/tests/functest/sfc_parent_function.py @@ -33,6 +33,7 @@ class SfcCommonTestCase(object): self.router = None self.sg = None self.image_creator = None + self.vnf_image_creator = None self.creators = None self.odl_ip = None self.odl_port = None @@ -133,6 +134,14 @@ class SfcCommonTestCase(object): self.sg = openstack_sfc.create_security_group( testcase_config.secgroup_name) + # Image for the vnf is registered + self.vnf_image_creator = openstack_sfc.register_glance_image( + COMMON_CONFIG.vnf_image_name, + COMMON_CONFIG.vnf_image_url, + COMMON_CONFIG.vnf_image_format, + 'public') + + # Image for the client/server is registered self.image_creator = openstack_sfc.register_glance_image( COMMON_CONFIG.image_name, COMMON_CONFIG.image_url, -- cgit 1.2.3-korg