<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/15506">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remsim-apitool: Fix slotmap-create (integer needed, not string!)<br><br>Change-Id: If3237de7cf08be49645dfac2e3f7173d43a47e53<br>---<br>M contrib/remsim-apitool.py<br>M src/server/rest_api.c<br>2 files changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/06/15506/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/remsim-apitool.py b/contrib/remsim-apitool.py</span><br><span>index 35c8826..dd62e5e 100755</span><br><span>--- a/contrib/remsim-apitool.py</span><br><span>+++ b/contrib/remsim-apitool.py</span><br><span>@@ -103,7 +103,8 @@</span><br><span>             rest_get("/slotmaps/" + str(args.show_slotmaps))</span><br><span>         return</span><br><span>     if args.create_slotmap:</span><br><span style="color: hsl(0, 100%, 40%);">-        slotmap_create(args.create_slotmap[0],args.create_slotmap[1],args.create_slotmap[2],args.create_slotmap[3])</span><br><span style="color: hsl(120, 100%, 40%);">+        slotmap_create(int(args.create_slotmap[0]), int(args.create_slotmap[1]),</span><br><span style="color: hsl(120, 100%, 40%);">+                       int(args.create_slotmap[2]), int(args.create_slotmap[3]))</span><br><span>         return</span><br><span>     if args.delete_slotmap:</span><br><span>         slotmap_delete(args.delete_slotmap[0],args.delete_slotmap[1])</span><br><span>diff --git a/src/server/rest_api.c b/src/server/rest_api.c</span><br><span>index abd46b9..fc7144e 100644</span><br><span>--- a/src/server/rest_api.c</span><br><span>+++ b/src/server/rest_api.c</span><br><span>@@ -76,14 +76,20 @@</span><br><span> {</span><br><span>       json_t *jbank_id, *jslot_nr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (!json_is_object(in))</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!json_is_object(in)) {</span><br><span style="color: hsl(120, 100%, 40%);">+            printf("%s: bank is not a JSON object\n", __func__);</span><br><span>               return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span>    jbank_id = json_object_get(in, "bankId");</span><br><span style="color: hsl(0, 100%, 40%);">-     if (!jbank_id || !json_is_integer(jbank_id))</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!jbank_id || !json_is_integer(jbank_id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                printf("%s: error parsing bankId\n", __func__);</span><br><span>            return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span>    jslot_nr = json_object_get(in, "slotNr");</span><br><span style="color: hsl(0, 100%, 40%);">-     if (!jslot_nr || !json_is_integer(jslot_nr))</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!jslot_nr || !json_is_integer(jslot_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                printf("%s: error parsing slotNd\n", __func__);</span><br><span>            return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span>    bslot->bank_id = json_integer_value(jbank_id);</span><br><span>    bslot->slot_nr = json_integer_value(jslot_nr);</span><br><span>    return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/15506">change 15506</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-remsim/+/15506"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If3237de7cf08be49645dfac2e3f7173d43a47e53 </div>
<div style="display:none"> Gerrit-Change-Number: 15506 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>