<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17703">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">config.py: Allow escaping commas in parametrized scenario names<br><br>comma character ',' is used in the command line to split between<br>parameters, which means a parameter value itself couldn't contain it.<br>This commit allows passing a comma inside a character value by escaping<br>it with '\,'.<br><br>Change-Id: Ic0bd9a029137a59e8c4a32b807eba7a64fcfa51f<br>---<br>M src/osmo_gsm_tester/config.py<br>1 file changed, 45 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/03/17703/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/config.py</span><br><span>index 5016018..9333601 100644</span><br><span>--- a/src/osmo_gsm_tester/config.py</span><br><span>+++ b/src/osmo_gsm_tester/config.py</span><br><span>@@ -201,6 +201,49 @@</span><br><span> self.path = path</span><br><span> self.param_list = param_list</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ @classmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def count_cont_char_backward(cls, str, before_pos, c):</span><br><span style="color: hsl(120, 100%, 40%);">+ n = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ i = before_pos - 1</span><br><span style="color: hsl(120, 100%, 40%);">+ while i >= 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if str[i] != c:</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ n += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ i -= 1</span><br><span style="color: hsl(120, 100%, 40%);">+ return n</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @classmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def split_scenario_parameters(cls, str):</span><br><span style="color: hsl(120, 100%, 40%);">+ cur_pos = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ param_li = []</span><br><span style="color: hsl(120, 100%, 40%);">+ saved = ''</span><br><span style="color: hsl(120, 100%, 40%);">+ # Split into a list, but we want to escape '\,' to avoid splitting parameters containing commas.</span><br><span style="color: hsl(120, 100%, 40%);">+ while True:</span><br><span style="color: hsl(120, 100%, 40%);">+ prev_pos = cur_pos</span><br><span style="color: hsl(120, 100%, 40%);">+ cur_pos = str.find(',', prev_pos)</span><br><span style="color: hsl(120, 100%, 40%);">+ if cur_pos == -1:</span><br><span style="color: hsl(120, 100%, 40%);">+ param_li.append(str[prev_pos:])</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ if cur_pos == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ param_li.append('')</span><br><span style="color: hsl(120, 100%, 40%);">+ elif cur_pos != 0 and str[cur_pos - 1] == '\\' and cls.count_cont_char_backward(str, cur_pos, '\\') % 2 == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ saved += str[prev_pos:cur_pos - 1] + ','</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ param_li.append(saved + str[prev_pos:cur_pos])</span><br><span style="color: hsl(120, 100%, 40%);">+ saved = ''</span><br><span style="color: hsl(120, 100%, 40%);">+ cur_pos += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ # Also escape '\\' -> '\'</span><br><span style="color: hsl(120, 100%, 40%);">+ while i < len(param_li):</span><br><span style="color: hsl(120, 100%, 40%);">+ param_li[i] = param_li[i].replace('\\\\', '\\')</span><br><span style="color: hsl(120, 100%, 40%);">+ i += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ return param_li</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @classmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def from_param_list_str(cls, name, path, param_list_str):</span><br><span style="color: hsl(120, 100%, 40%);">+ param_list = cls.split_scenario_parameters(param_list_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ return cls(name, path, param_list)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def read_from_file(self, validation_schema):</span><br><span> with open(self.path, 'r') as f:</span><br><span> config_str = f.read()</span><br><span>@@ -228,6 +271,7 @@</span><br><span> if not is_parametrized_file:</span><br><span> if not os.path.isfile(path):</span><br><span> raise RuntimeError('No such scenario file: %r' % path)</span><br><span style="color: hsl(120, 100%, 40%);">+ sc = Scenario(name, path)</span><br><span> else: # parametrized scenario:</span><br><span> # Allow first matching complete matching names (eg: scenario@param1,param2.conf),</span><br><span> # this allows setting specific content in different files for specific values.</span><br><span>@@ -240,8 +284,7 @@</span><br><span> # At this point, we have existing file path. Let's now scrap the parameter(s):</span><br><span> # get param1,param2 str from scenario@param1,param2.conf</span><br><span> param_list_str = name.split('@', 1)[1][:-len('.conf')]</span><br><span style="color: hsl(0, 100%, 40%);">- param_list = param_list_str.split(',')</span><br><span style="color: hsl(0, 100%, 40%);">- sc = Scenario(name, path, param_list)</span><br><span style="color: hsl(120, 100%, 40%);">+ sc = Scenario.from_param_list_str(name, path, param_list_str)</span><br><span> sc.read_from_file(validation_schema)</span><br><span> return sc</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17703">change 17703</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17703"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic0bd9a029137a59e8c4a32b807eba7a64fcfa51f </div>
<div style="display:none"> Gerrit-Change-Number: 17703 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>