From a459dee88ba00d6f8283232ce2159594ae23d22a Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Sat, 24 Mar 2018 17:07:21 +0100 Subject: Use different config files depending on version We can read the openstack version from the env variables and then use a different config. The reason we use this is because openstack API changed from Pike to Queens and Pike is the official version for OPNFV Fraser release Change-Id: I8a94e71224d2ba0aa75a6438f3d7b03929acbbef Signed-off-by: Manuel Buil --- sfc/lib/config.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'sfc/lib') diff --git a/sfc/lib/config.py b/sfc/lib/config.py index 8cc1efb4..a4f5d67b 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -43,7 +43,21 @@ class CommonConfig(object): self.vnffgd_dir = os.path.join(self.sfc_test_dir, "vnffgd-templates") self.functest_results_dir = os.path.join( getattr(config.CONF, 'dir_results'), "odl-sfc") - self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") + + # We need to know the openstack version in order to use one config or + # another. For Pike we will use config-pike.yaml. Queens and Rocky + # will use config.yaml + if 'OPENSTACK_OSA_VERSION' in os.environ: + if os.environ['OPENSTACK_OSA_VERSION'] == 'stable/pike': + self.config_file = os.path.join(self.sfc_test_dir, + "config-pike.yaml") + else: + self.config_file = os.path.join(self.sfc_test_dir, + "config.yaml") + else: + self.config_file = os.path.join(self.sfc_test_dir, + "config-pike.yaml") + self.vim_file = os.path.join(self.sfc_test_dir, "register-vim.json") self.installer_type = env.get('INSTALLER_TYPE') -- cgit 1.2.3-korg