Skip to content

Commit c8c95d6

Browse files
committed
[schema] Improved ordering and titles of wireless properties
1 parent 526c2d1 commit c8c95d6

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

netjsonconfig/backends/openwrt/schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"type": "string",
7676
"$ref": "#/definitions/interface_settings/properties/network"
7777
},
78-
"propertyOrder": 10
78+
"propertyOrder": 19
7979
}
8080
}
8181
}

netjsonconfig/schema.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -276,31 +276,34 @@
276276
"mode",
277277
],
278278
"properties": {
279-
"radio": {
279+
"mode": {
280280
"type": "string",
281-
"minLength": 2,
282281
"propertyOrder": 1,
283282
},
284-
"mode": {
283+
"radio": {
285284
"type": "string",
285+
"minLength": 2,
286286
"propertyOrder": 2,
287287
},
288288
"ack_distance": {
289289
"type": "integer",
290+
"title": "ACK distance",
290291
"minimum": 1,
291-
"propertyOrder": 7,
292+
"propertyOrder": 10,
292293
},
293294
"rts_threshold": {
294295
"type": "integer",
296+
"title": "RTS threshold",
295297
"minimum": 0,
296298
"maximum": 2346,
297-
"propertyOrder": 8,
299+
"propertyOrder": 11,
298300
},
299301
"frag_threshold": {
300302
"type": "integer",
303+
"title": "fragmentation threshold",
301304
"minimum": 0,
302305
"maximum": 2346,
303-
"propertyOrder": 9,
306+
"propertyOrder": 12,
304307
}
305308
}
306309
},
@@ -310,8 +313,9 @@
310313
"properties": {
311314
"ssid": {
312315
"type": "string",
316+
"title": "SSID",
313317
"maxLength": 32,
314-
"propertyOrder": 4,
318+
"propertyOrder": 3,
315319
}
316320
}
317321
},
@@ -320,9 +324,10 @@
320324
"properties": {
321325
"hidden": {
322326
"type": "boolean",
327+
"title": "hide SSID",
323328
"default": False,
324329
"format": "checkbox",
325-
"propertyOrder": 5,
330+
"propertyOrder": 4,
326331
}
327332
}
328333
},
@@ -332,9 +337,10 @@
332337
"properties": {
333338
"bssid": {
334339
"type": "string",
335-
"propertyOrder": 6,
340+
"title": "BSSID",
336341
"minLength": 17,
337342
"maxLength": 17,
343+
"propertyOrder": 4,
338344
},
339345
}
340346
},
@@ -346,7 +352,7 @@
346352
"type": "boolean",
347353
"default": False,
348354
"format": "checkbox",
349-
"propertyOrder": 3,
355+
"propertyOrder": 5,
350356
}
351357
}
352358
},
@@ -356,7 +362,7 @@
356362
"properties": {
357363
"mesh_id": {
358364
"type": "string",
359-
"title": "mesh id",
365+
"title": "mesh ID",
360366
"pattern": "^[^\\s]*$",
361367
"propertyOrder": 3,
362368
},

0 commit comments

Comments
 (0)