Change in osmo-gsm-tester[master]: ctrl: increment message IDs for CTRL commands

[neels]

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21519 )

Change subject: ctrl: increment message IDs for CTRL commands
......................................................................

ctrl: increment message IDs for CTRL commands

Implicitly use distinct IDs for CTRL commands. This is a prerequisite
for matching GET_REPLY IDs to GET IDs, to correctly handle CTRL
responses without counting on being lucky.

Rather use 'use_id' as var name instead of overloading the 'id' keyword.

Change-Id: I698faa013eb14f88759685d50d925f5d82d80aa0
---
M src/osmo_gsm_tester/obj/osmo_ctrl.py
1 file changed, 16 insertions(+), 4 deletions(-)

Approvals:
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/obj/osmo_ctrl.py b/src/osmo_gsm_tester/obj/osmo_ctrl.py
index 891cc48..c2dd7e3 100644
--- a/src/osmo_gsm_tester/obj/osmo_ctrl.py
+++ b/src/osmo_gsm_tester/obj/osmo_ctrl.py
@@ -33,6 +33,12 @@
         self.host = host
         self.port = port
         self.sck = None
+        self._next_id = 0
+
+    def next_id(self):
+        ret = self._next_id
+        self._next_id += 1
+        return ret
 
     def prefix_ipa_ctrl_header(self, data):
         if isinstance(data, str):
@@ -72,13 +78,19 @@
         self.dbg('Receiving', data=data)
         return data
 
-    def do_set(self, var, value, id=0):
-        setmsg = "SET %s %s %s" %(id, var, value)
+    def do_set(self, var, value, use_id=None):
+        if use_id is None:
+            use_id = self.next_id()
+        setmsg = "SET %s %s %s" %(use_id, var, value)
         self._send(setmsg)
+        return use_id
 
-    def do_get(self, var, id=0):
-        getmsg = "GET %s %s" %(id, var)
+    def do_get(self, var, use_id=None):
+        if use_id is None:
+            use_id = self.next_id()
+        getmsg = "GET %s %s" %(use_id, var)
         self._send(getmsg)
+        return use_id
 
     def __enter__(self):
         self.connect()

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21519
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I698faa013eb14f88759685d50d925f5d82d80aa0
Gerrit-Change-Number: 21519
Gerrit-PatchSet: 4
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201210/e3012d04/attachment.htm>