Change in ...osmo-remsim[master]: remsim-apitool: Fix slotmap-create (integer needed, not string!)

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/15506


Change subject: remsim-apitool: Fix slotmap-create (integer needed, not string!)
......................................................................

remsim-apitool: Fix slotmap-create (integer needed, not string!)

Change-Id: If3237de7cf08be49645dfac2e3f7173d43a47e53
---
M contrib/remsim-apitool.py
M src/server/rest_api.c
2 files changed, 11 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/06/15506/1

diff --git a/contrib/remsim-apitool.py b/contrib/remsim-apitool.py
index 35c8826..dd62e5e 100755
--- a/contrib/remsim-apitool.py
+++ b/contrib/remsim-apitool.py
@@ -103,7 +103,8 @@
             rest_get("/slotmaps/" + str(args.show_slotmaps))
         return
     if args.create_slotmap:
-        slotmap_create(args.create_slotmap[0],args.create_slotmap[1],args.create_slotmap[2],args.create_slotmap[3])
+        slotmap_create(int(args.create_slotmap[0]), int(args.create_slotmap[1]),
+                       int(args.create_slotmap[2]), int(args.create_slotmap[3]))
         return
     if args.delete_slotmap:
         slotmap_delete(args.delete_slotmap[0],args.delete_slotmap[1])
diff --git a/src/server/rest_api.c b/src/server/rest_api.c
index abd46b9..fc7144e 100644
--- a/src/server/rest_api.c
+++ b/src/server/rest_api.c
@@ -76,14 +76,20 @@
 {
 	json_t *jbank_id, *jslot_nr;
 
-	if (!json_is_object(in))
+	if (!json_is_object(in)) {
+		printf("%s: bank is not a JSON object\n", __func__);
 		return -EINVAL;
+	}
 	jbank_id = json_object_get(in, "bankId");
-	if (!jbank_id || !json_is_integer(jbank_id))
+	if (!jbank_id || !json_is_integer(jbank_id)) {
+		printf("%s: error parsing bankId\n", __func__);
 		return -EINVAL;
+	}
 	jslot_nr = json_object_get(in, "slotNr");
-	if (!jslot_nr || !json_is_integer(jslot_nr))
+	if (!jslot_nr || !json_is_integer(jslot_nr)) {
+		printf("%s: error parsing slotNd\n", __func__);
 		return -EINVAL;
+	}
 	bslot->bank_id = json_integer_value(jbank_id);
 	bslot->slot_nr = json_integer_value(jslot_nr);
 	return 0;

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

Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: If3237de7cf08be49645dfac2e3f7173d43a47e53
Gerrit-Change-Number: 15506
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at gnumonks.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190912/5c58bbfe/attachment.htm>