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/lib/config.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'sfc/lib') diff --git a/sfc/lib/config.py b/sfc/lib/config.py index 69e1769d..e6149081 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -103,6 +103,19 @@ class CommonConfig(object): "defaults.image_format", self.config_file) self.image_url = ft_utils.get_parameter_from_yaml( "defaults.image_url", self.config_file) + try: + self.vnf_image_name = ft_utils.get_parameter_from_yaml( + "defaults.vnf_image_name", self.config_file) + self.vnf_image_url = ft_utils.get_parameter_from_yaml( + "defaults.vnf_image_url", self.config_file) + self.vnf_image_format = ft_utils.get_parameter_from_yaml( + "defaults.vnf_image_format", self.config_file) + except ValueError: + # If the parameter does not exist we use the default + self.vnf_image_name = self.image_name + self.vnf_image_url = self.image_url + self.vnf_image_format = self.image_format + self.dir_functest_data = getattr(config.CONF, 'dir_functest_data') -- cgit 1.2.3-korg