Introduce scenario modifiers
Before this patch, scenarios were only used to select resources with
specific attributes. This commit introduces "modifiers" in scenarios,
which allows setting or modifing config attributes of resources once
they have been reserved. This way same test can be run selecting same
resources but modifying its configuration, allowing for instance running
different number of TRX, different timeslot configuration, etc.
Modifiers are described by placing a "modifiers" dictionary in any
scenario file, similar to the current "resources" one used to select
requird resources. The "modifiers" dictionary is overlaid on top of the
"resources" one resulting from combining all the "resources" dictionary
of all scenario files.
Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index c712a75..fa86f96 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -71,6 +71,7 @@
self.objects_to_clean_up = None
self.test_import_modules_to_clean_up = []
self._resource_requirements = None
+ self._resource_modifiers = None
self._config = None
self._processes = None
self._run_dir = None
@@ -154,6 +155,11 @@
self._resource_requirements = self.combined('resources')
return self._resource_requirements
+ def resource_modifiers(self):
+ if self._resource_modifiers is None:
+ self._resource_modifiers = self.combined('modifiers')
+ return self._resource_modifiers
+
def config(self):
if self._config is None:
self._config = self.combined('config')
@@ -163,7 +169,7 @@
if self.reserved_resources:
raise RuntimeError('Attempt to reserve resources twice for a SuiteRun')
self.log('reserving resources in', self.resources_pool.state_dir, '...')
- self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements())
+ self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements(), self.resource_modifiers())
def run_tests(self, names=None):
suite_libdir = os.path.join(self.definition.suite_dir, 'lib')