X json: Move inactivity_timer to cell from enb

software/ors-amarisoft/cell/common.json

@@ -53,6 +53,12 @@
       "type": "integer",
       "default": 204
     },
+    "inactivity_timer": {
+      "title": "Inactivity Timer",
+      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
+      "type": "number",
+      "default": 10000
+    },
     "ru": {
       "$ref": "#/$defs/ru-of-cell",
       "propertyOrder": 9999

software/ors-amarisoft/instance-enb-input-schema.json

@@ -151,12 +151,6 @@
       "description": "Activates websocket for remote control and sets password",
       "type": "string"
     },
-    "inactivity_timer": {
-      "title": "Inactivity Timer  XXX",
-      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
-      "type": "number",
-      "default": 10000
-    },
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-ors-enb-input-schema.json

@@ -152,9 +152,7 @@
       "$ref": "instance-enb-input-schema.json#/properties/websocket_password"
     },
     "inactivity_timer": {
-      "title": "Inactivity Timer",
-      "description": "Send RRC connection release after this time (in ms) of network inactivity.",
-      "type": "number",
+      "$ref": "cell/common.json#/properties/inactivity_timer",
       "default": 10000
     },
     "log_phy_debug": {

software/ors-amarisoft/slaplte.jinja2

@@ -15,7 +15,6 @@
     it should be kept in sync with "default" in json schemas
 
     TODO automatically load defaults from JSON schemas  #}
-{#- XXX add inactivity timer to cell schemas #}
 {%- set defaults = {
       'ru': {
         'txrx_active': 'INACTIVE',