Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages

2019-01-14 Thread Vadim Yanitskiy 
Vadim Yanitskiy has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12546 )

Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages
..

trx_toolkit/fake_trx.py: enrich TRX logging messages

Since fake_trx.py can handle multiple transceivers, it makes sense
to print some info in logging messages about transceivers they
belong to. This acvieved by defining __str__() for Transceiver.

Some examples:

  [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd
  [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver...

  [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd
  [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER

Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624
---
M src/target/trx_toolkit/ctrl_if_trx.py
M src/target/trx_toolkit/fake_trx.py
M src/target/trx_toolkit/transceiver.py
3 files changed, 41 insertions(+), 30 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/target/trx_toolkit/ctrl_if_trx.py 
b/src/target/trx_toolkit/ctrl_if_trx.py
index 83d55db..0d4935d 100644
--- a/src/target/trx_toolkit/ctrl_if_trx.py
+++ b/src/target/trx_toolkit/ctrl_if_trx.py
@@ -59,19 +59,19 @@

# Power control
if self.verify_cmd(request, "POWERON", 0):
-   log.debug("Recv POWERON CMD")
+   log.debug("(%s) Recv POWERON CMD" % self.trx)

# Ensure transceiver isn't working
if self.trx.running:
-   log.error("Transceiver already started")
+   log.error("(%s) Transceiver already started" % 
self.trx)
return -1

# Ensure RX / TX freq. are set
if (self.trx.rx_freq is None) or (self.trx.tx_freq is 
None):
-   log.error("RX / TX freq. are not set")
+   log.error("(%s) RX / TX freq. are not set" % 
self.trx)
return -1

-   log.info("Starting transceiver...")
+   log.info("(%s) Starting transceiver..." % self.trx)
self.trx.running = True

# Notify transceiver about that
@@ -80,9 +80,9 @@
return 0

elif self.verify_cmd(request, "POWEROFF", 0):
-   log.debug("Recv POWEROFF cmd")
+   log.debug("(%s) Recv POWEROFF cmd" % self.trx)

-   log.info("Stopping transceiver...")
+   log.info("(%s) Stopping transceiver..." % self.trx)
self.trx.running = False

# Notify transceiver about that
@@ -92,26 +92,27 @@

# Tuning Control
elif self.verify_cmd(request, "RXTUNE", 1):
-   log.debug("Recv RXTUNE cmd")
+   log.debug("(%s) Recv RXTUNE cmd" % self.trx)

# TODO: check freq range
self.trx.rx_freq = int(request[1]) * 1000
return 0

elif self.verify_cmd(request, "TXTUNE", 1):
-   log.debug("Recv TXTUNE cmd")
+   log.debug("(%s) Recv TXTUNE cmd" % self.trx)

# TODO: check freq range
self.trx.tx_freq = int(request[1]) * 1000
return 0

elif self.verify_cmd(request, "SETSLOT", 2):
-   log.debug("Recv SETSLOT cmd")
+   log.debug("(%s) Recv SETSLOT cmd" % self.trx)

# Obtain TS index
ts = int(request[1])
if ts not in range(0, 8):
-   log.error("TS index should be in range: 0..7")
+   log.error("(%s) TS index should be in "
+   "range: 0..7" % self.trx)
return -1

# Parse TS type
@@ -132,13 +133,13 @@

# Power measurement
if self.verify_cmd(request, "MEASURE", 1):
-   log.debug("Recv MEASURE cmd")
+   log.debug("(%s) Recv MEASURE cmd" % self.trx)

# Power Measurement interface is optional
# for Transceiver, thus may be uninitialized
if self.trx.pwr_meas is None:
-   log.error("Power Measurement interface "
-   "is not initialized => rejecting 
command")
+

Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages

2019-01-14 Thread Vadim Yanitskiy 
Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/12546

to look at the new patch set (#3).

Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages
..

trx_toolkit/fake_trx.py: enrich TRX logging messages

Since fake_trx.py can handle multiple transceivers, it makes sense
to print some info in logging messages about transceivers they
belong to. This acvieved by defining __str__() for Transceiver.

Some examples:

  [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd
  [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver...

  [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd
  [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER

Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624
---
M src/target/trx_toolkit/ctrl_if_trx.py
M src/target/trx_toolkit/fake_trx.py
M src/target/trx_toolkit/transceiver.py
3 files changed, 41 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/12546/3
--
To view, visit https://gerrit.osmocom.org/12546
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624
Gerrit-Change-Number: 12546
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages

2019-01-14 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12546 )

Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12546
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624
Gerrit-Change-Number: 12546
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Mon, 14 Jan 2019 12:53:41 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: enrich TRX logging messages

2019-01-13 Thread Vadim Yanitskiy 
Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/12546


Change subject: trx_toolkit/fake_trx.py: enrich TRX logging messages
..

trx_toolkit/fake_trx.py: enrich TRX logging messages

Since fake_trx.py can handle multiple transceivers, it makes sense
to print some info in logging messages about transceivers they
belong to. This acvieved by defining __str__() for Transceiver.

Some examples:

  [DEBUG] ctrl_if_trx.py:83 (127.0.0.1:5700) Recv POWEROFF cmd
  [INFO] ctrl_if_trx.py:85 (127.0.0.1:5700) Stopping transceiver...

  [DEBUG] ctrl_if_trx.py:95 (127.0.0.1:5700/1) Recv RXTUNE cmd
  [DEBUG] ctrl_if_trx.py:102 (127.0.0.1:5700/1) Recv TXTUNE cmd
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETTSC
  [DEBUG] ctrl_if_trx.py:155 (127.0.0.1:5700/1) Ignore CMD SETPOWER

Change-Id: I1f706790a2da226f1418f89d2cfbb55baa6ea624
---
M src/target/trx_toolkit/ctrl_if_trx.py
M src/target/trx_toolkit/fake_trx.py
M src/target/trx_toolkit/transceiver.py
3 files changed, 41 insertions(+), 30 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/12546/1

diff --git a/src/target/trx_toolkit/ctrl_if_trx.py 
b/src/target/trx_toolkit/ctrl_if_trx.py
index 83d55db..0d4935d 100644
--- a/src/target/trx_toolkit/ctrl_if_trx.py
+++ b/src/target/trx_toolkit/ctrl_if_trx.py
@@ -59,19 +59,19 @@

# Power control
if self.verify_cmd(request, "POWERON", 0):
-   log.debug("Recv POWERON CMD")
+   log.debug("(%s) Recv POWERON CMD" % self.trx)

# Ensure transceiver isn't working
if self.trx.running:
-   log.error("Transceiver already started")
+   log.error("(%s) Transceiver already started" % 
self.trx)
return -1

# Ensure RX / TX freq. are set
if (self.trx.rx_freq is None) or (self.trx.tx_freq is 
None):
-   log.error("RX / TX freq. are not set")
+   log.error("(%s) RX / TX freq. are not set" % 
self.trx)
return -1

-   log.info("Starting transceiver...")
+   log.info("(%s) Starting transceiver..." % self.trx)
self.trx.running = True

# Notify transceiver about that
@@ -80,9 +80,9 @@
return 0

elif self.verify_cmd(request, "POWEROFF", 0):
-   log.debug("Recv POWEROFF cmd")
+   log.debug("(%s) Recv POWEROFF cmd" % self.trx)

-   log.info("Stopping transceiver...")
+   log.info("(%s) Stopping transceiver..." % self.trx)
self.trx.running = False
 
# Notify transceiver about that
@@ -92,26 +92,27 @@

# Tuning Control
elif self.verify_cmd(request, "RXTUNE", 1):
-   log.debug("Recv RXTUNE cmd")
+   log.debug("(%s) Recv RXTUNE cmd" % self.trx)

# TODO: check freq range
self.trx.rx_freq = int(request[1]) * 1000
return 0

elif self.verify_cmd(request, "TXTUNE", 1):
-   log.debug("Recv TXTUNE cmd")
+   log.debug("(%s) Recv TXTUNE cmd" % self.trx)

# TODO: check freq range
self.trx.tx_freq = int(request[1]) * 1000
return 0

elif self.verify_cmd(request, "SETSLOT", 2):
-   log.debug("Recv SETSLOT cmd")
+   log.debug("(%s) Recv SETSLOT cmd" % self.trx)

# Obtain TS index
ts = int(request[1])
if ts not in range(0, 8):
-   log.error("TS index should be in range: 0..7")
+   log.error("(%s) TS index should be in "
+   "range: 0..7" % self.trx)
return -1

# Parse TS type
@@ -132,13 +133,13 @@

# Power measurement
if self.verify_cmd(request, "MEASURE", 1):
-   log.debug("Recv MEASURE cmd")
+   log.debug("(%s) Recv MEASURE cmd" % self.trx)

# Power Measurement interface is optional
# for Transceiver, thus may be uninitialized
if self.trx.pwr_meas is None:
-   log.error("Power Measurement interface "
-   "is not initialized => rejecting 
command")
+