<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21510">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">log reserved resources<br><br>On non-debug log level, show something like this at the beginning of<br>each suite:<br><br> 03:45:49.439720 tst handover:sysmo+secondbts-trx-b200: RESERVED RESOURCES for handover:<br> bts<br> sysmoBTS 1002<br> Ettus B200<br> ip_address<br> 10.42.42.2<br> 10.42.42.3<br> 10.42.42.4<br> 10.42.42.5<br> 10.42.42.6<br> 10.42.42.7<br> modem<br> sierra_1st<br> sierra_2nd<br><br>In the DBG log, show the full resources dicts.<br><br>Change-Id: Ic23556eafee654c93d13c5ef405028da09bd51d7<br>---<br>M selftest/suite_test/suite_test.ok<br>M src/osmo_gsm_tester/core/resource.py<br>M src/osmo_gsm_tester/core/suite.py<br>3 files changed, 308 insertions(+), 0 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/10/21510/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok</span><br><span>index 150a4e9..a9c337b 100644</span><br><span>--- a/selftest/suite_test/suite_test.ok</span><br><span>+++ b/selftest/suite_test/suite_test.ok</span><br><span>@@ -145,6 +145,63 @@</span><br><span> label: m7802</span><br><span> path: /wavecom_1</span><br><span> tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False></span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: RESERVED RESOURCES for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+bts</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoBTS 1002</span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.1</span><br><span style="color: hsl(120, 100%, 40%);">+modem</span><br><span style="color: hsl(120, 100%, 40%);">+ m7801</span><br><span style="color: hsl(120, 100%, 40%);">+ m7802</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: DBG: reserved resources for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'max_power_red': '3', 'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '0', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '1', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.114',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoBTS 1002',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'sysmo'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.1'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': 'D620F48487B1B782DA55DF6717F08FF9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_0'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_1'}]}</span><br><span> </span><br><span> ----------------------------------------------</span><br><span> trial test_suite hello_world.py</span><br><span>@@ -364,6 +421,63 @@</span><br><span> path: /wavecom_1</span><br><span> [resource.py:[LINENR]]</span><br><span> tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: RESERVED RESOURCES for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+bts</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoBTS 1002</span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.1</span><br><span style="color: hsl(120, 100%, 40%);">+modem</span><br><span style="color: hsl(120, 100%, 40%);">+ m7801</span><br><span style="color: hsl(120, 100%, 40%);">+ m7802 [suite.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: DBG: reserved resources for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'max_power_red': '3', 'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '0', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '1', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.114',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoBTS 1002',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'sysmo'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.1'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': 'D620F48487B1B782DA55DF6717F08FF9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_0'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_1'}]} [suite.py:[LINENR]]</span><br><span> </span><br><span> ----------------------------------------------</span><br><span> trial test_suite hello_world.py</span><br><span>@@ -509,6 +623,63 @@</span><br><span> path: /wavecom_1</span><br><span> [resource.py:[LINENR]]</span><br><span> tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: RESERVED RESOURCES for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+bts</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoBTS 1002</span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.1</span><br><span style="color: hsl(120, 100%, 40%);">+modem</span><br><span style="color: hsl(120, 100%, 40%);">+ m7801</span><br><span style="color: hsl(120, 100%, 40%);">+ m7802 [suite.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: DBG: reserved resources for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'max_power_red': '3', 'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '0', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '1', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.114',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoBTS 1002',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'sysmo'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.1'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': 'D620F48487B1B782DA55DF6717F08FF9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_0'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_1'}]} [suite.py:[LINENR]]</span><br><span> </span><br><span> ----------------------------------------------</span><br><span> trial test_suite hello_world.py</span><br><span>@@ -650,6 +821,63 @@</span><br><span> path: /wavecom_1</span><br><span> [resource.py:[LINENR]]</span><br><span> tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: RESERVED RESOURCES for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+bts</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoBTS 1002</span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.1</span><br><span style="color: hsl(120, 100%, 40%);">+modem</span><br><span style="color: hsl(120, 100%, 40%);">+ m7801</span><br><span style="color: hsl(120, 100%, 40%);">+ m7802 [suite.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: DBG: reserved resources for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'max_power_red': '3', 'nominal_power': '20'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '0', 'nominal_power': '20'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'nominal_power': '20'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '1', 'nominal_power': '20'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.114',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoBTS 1002',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'sysmo'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.1'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': 'D620F48487B1B782DA55DF6717F08FF9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_0'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_1'}]} [suite.py:[LINENR]]</span><br><span> resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span> '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span> 'addr': '10.42.42.53',</span><br><span>@@ -841,6 +1069,63 @@</span><br><span> path: /wavecom_1</span><br><span> [resource.py:[LINENR]]</span><br><span> tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: RESERVED RESOURCES for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+bts</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoCell 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmoBTS 1002</span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.1</span><br><span style="color: hsl(120, 100%, 40%);">+modem</span><br><span style="color: hsl(120, 100%, 40%);">+ m7801</span><br><span style="color: hsl(120, 100%, 40%);">+ m7802 [suite.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_suite: DBG: reserved resources for test_suite: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'max_power_red': '3', 'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '0', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.53',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoCell 5000',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_trx': {'clock_reference': 'external',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'launch_trx': 'False',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_ip': '10.42.42.112'},</span><br><span style="color: hsl(120, 100%, 40%);">+ 'trx_list': [{'nominal_power': '10'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'max_power_red': '1', 'nominal_power': '12'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'osmo-bts-trx'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.114',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'band': 'GSM-1800',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ipa_unit_id': '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'sysmoBTS 1002',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'type': 'sysmo'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.1'}],</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': 'D620F48487B1B782DA55DF6717F08FF9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7801',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_0'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'imsi': '901700000007802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'label': 'm7802',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'path': '/wavecom_1'}]} [suite.py:[LINENR]]</span><br><span> resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',</span><br><span> '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',</span><br><span> 'addr': '10.42.42.53',</span><br><span>@@ -944,6 +1229,13 @@</span><br><span> addr: 10.42.42.2</span><br><span> [resource.py:[LINENR]]</span><br><span> tst suiteC: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst suiteC: RESERVED RESOURCES for suiteC: </span><br><span style="color: hsl(120, 100%, 40%);">+ip_address</span><br><span style="color: hsl(120, 100%, 40%);">+ 10.42.42.2 [suite.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst suiteC: DBG: reserved resources for suiteC: </span><br><span style="color: hsl(120, 100%, 40%);">+resources(suiteC)={'ip_address': [{'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c',</span><br><span style="color: hsl(120, 100%, 40%);">+ '_reserved_by': 'suiteC-[ID_NUM]-[ID_NUM]',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'addr': '10.42.42.2'}]} [suite.py:[LINENR]]</span><br><span> </span><br><span> ----------------------------------------------</span><br><span> trial suiteC test_template_overlay.py</span><br><span>diff --git a/src/osmo_gsm_tester/core/resource.py b/src/osmo_gsm_tester/core/resource.py</span><br><span>index 621522b..223a8f9 100644</span><br><span>--- a/src/osmo_gsm_tester/core/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/core/resource.py</span><br><span>@@ -485,6 +485,18 @@</span><br><span> def __repr__(self):</span><br><span> return 'resources(%s)=%s' % (self.origin.name(), pprint.pformat(self.reserved))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def __str__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return repr(self)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def summary_str(self, prefix=''):</span><br><span style="color: hsl(120, 100%, 40%);">+ lines = []</span><br><span style="color: hsl(120, 100%, 40%);">+ for key, reserved_list in sorted(self.reserved.items()):</span><br><span style="color: hsl(120, 100%, 40%);">+ lines.append(key)</span><br><span style="color: hsl(120, 100%, 40%);">+ for item in reserved_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ label = item.get('label') or item.get('addr') or item.get('type') or item.get('_hash') or '?'</span><br><span style="color: hsl(120, 100%, 40%);">+ lines.append(' ' + label)</span><br><span style="color: hsl(120, 100%, 40%);">+ return prefix + ('\n' + prefix).join(lines)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def get(self, kind, specifics=None):</span><br><span> if specifics is None:</span><br><span> specifics = {}</span><br><span>diff --git a/src/osmo_gsm_tester/core/suite.py b/src/osmo_gsm_tester/core/suite.py</span><br><span>index 3860d19..8f58836 100644</span><br><span>--- a/src/osmo_gsm_tester/core/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/core/suite.py</span><br><span>@@ -160,6 +160,10 @@</span><br><span> raise RuntimeError('Attempt to reserve resources twice for a SuiteRun')</span><br><span> self.log('reserving resources in', self.resources_pool.state_dir, '...')</span><br><span> self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements(), self.resource_modifiers())</span><br><span style="color: hsl(120, 100%, 40%);">+ # short summary of labels</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('RESERVED RESOURCES for ' + self.suite_name() + ':', '\n' + self.reserved_resources.summary_str())</span><br><span style="color: hsl(120, 100%, 40%);">+ # also barf a detailed dict to debug log</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('reserved resources for ' + self.suite_name() + ':', '\n' + repr(self.reserved_resources))</span><br><span> </span><br><span> def get_reserved_resource(self, resource_class_str, specifics):</span><br><span> return self.reserved_resources.get(resource_class_str, specifics=specifics)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21510">change 21510</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/+/21510"/><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: Ic23556eafee654c93d13c5ef405028da09bd51d7 </div>
<div style="display:none"> Gerrit-Change-Number: 21510 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>