diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-10-15 18:02:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-15 18:02:29 +0000 |
| commit | 5eda2839ca79d4cc82b0940ff6e123db96bfbfbe (patch) | |
| tree | 64908ff605a34601ed5c63d05aecb1757d0c9123 /functest/core/singlevm.py | |
| parent | 520331a06750dd02228f840c346402f52fb864e8 (diff) | |
| parent | 1a00b9de56ef65eef2a0b269a514cb25491ac54b (diff) | |
Merge "Ease configuring extra specs via env vars"
Diffstat (limited to 'functest/core/singlevm.py')
| -rw-r--r-- | functest/core/singlevm.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index b3a1417f6..ec7f967ec 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -155,6 +155,10 @@ class VmReady1(tenantnetwork.TenantNetwork1): self.flavor_disk)) self.__logger.debug("flavor: %s", flavor) flavor_extra_specs = self.flavor_extra_specs.copy() + if env.get('FLAVOR_EXTRA_SPECS'): + flavor_extra_specs.update( + functest_utils.convert_ini_to_dict( + env.get('FLAVOR_EXTRA_SPECS'))) flavor_extra_specs.update( getattr(config.CONF, '{}_flavor_extra_specs'.format(self.case_name), {})) @@ -183,6 +187,10 @@ class VmReady1(tenantnetwork.TenantNetwork1): self.flavor_alt_disk)) self.__logger.debug("flavor: %s", flavor) flavor_alt_extra_specs = self.flavor_alt_extra_specs.copy() + if env.get('FLAVOR_EXTRA_SPECS'): + flavor_alt_extra_specs.update( + functest_utils.convert_ini_to_dict( + env.get('FLAVOR_EXTRA_SPECS'))) flavor_alt_extra_specs.update( getattr(config.CONF, '{}_flavor_alt_extra_specs'.format(self.case_name), {})) |