From 51afcb3a1e566c7c9dd7efc6f8dd225b4d64be0a Mon Sep 17 00:00:00 2001
From: Jakob Olsson <Jakob Olsson>
Date: Mon, 25 Nov 2019 13:21:15 +0100
Subject: [PATCH] update wifi.ap.json to new input/output format

---
 ubus/wifi.ap.json | 445 ++++++++++++++++++++++++++--------------------
 1 file changed, 250 insertions(+), 195 deletions(-)

diff --git a/ubus/wifi.ap.json b/ubus/wifi.ap.json
index 09c1090..9c230e1 100644
--- a/ubus/wifi.ap.json
+++ b/ubus/wifi.ap.json
@@ -90,42 +90,231 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "https://www.iopsys.eu/wifi.ap",
     "properties": {
-        "output": {
+        "add_neighbor": {
             "type": "object",
             "properties": {
-                "add_neighbor": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "bssid",
+                        "channel",
+                        "bssid_info",
+                        "reg",
+                        "phy"
+                    ],
+                    "properties": {
+                        "bssid": {
+                            "$ref": "#/definitions/macaddr_t"
+                        },
+                        "channel": {
+                            "oneOf": [
+                                {
+                                    "$ref": "#/definitions/channel_2_t"
+                                },
+                                {
+                                    "$ref": "#/definitions/channel_5_t"
+                                }
+                            ]
+                        },
+                        "bssid_info": {
+                            "type": "string"
+                        },
+                        "reg": {
+                            "type": "integer",
+                            "minimum": 0
+                        },
+                        "phy": {
+                            "type": "integer",
+                            "minimum": 0
+                        }
+                    }
+                },
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "del_neighbor": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "bssid"
+                    ],
+                    "properties": {
+                        "bssid": {
+                            "$ref": "#/definitions/macaddr_t"
+                        }
+                    }
                 },
-                "del_neighbor": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "request_neighbor": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "client"
+                    ],
+                    "properties": {
+                        "ssid": {
+                            "$ref": "#/definitions/ssid_t"
+                        },
+                        "client": {
+                            "$ref": "#/definitions/macaddr_t"
+                        }
+                    }
                 },
-                "request_neighbor": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "request_transition": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "client",
+                        "bssid"
+                    ],
+                    "properties": {
+                        "client": {
+                            "$ref": "#/definitions/macaddr_t"
+                        },
+                        "bssid": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/macaddr_t"
+                            }
+                        },
+                        "timeout": {
+                            "type": "integer"
+                        }
+                    }
                 },
-                "request_transition": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "monitor": {
+            "type": "object",
+            "properties": {
+                "intput": {
+                    "type": "object",
+                    "required": [
+                        "sta"
+                    ],
+                    "properties": {
+                        "sta": {
+                            "$ref": "#/definitions/macaddr_t"
+                        },
+                        "get": {
+                            "type": "integer"
+                        }
+                    }
                 },
-                "monitor": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "add_vendor_ie": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "mgmt",
+                        "oui",
+                        "data"
+                    ],
+                    "properties": {
+                        "mgmt": {
+                            "type": "integer"
+                        },
+                        "oui": {
+                            "$ref": "#/definitions/oui_t"
+                        },
+                        "data": {
+                            "$ref": "#/definitions/data_t"
+                        }
+                    }
                 },
-                "add_vendor_ie": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "del_vendor_ie": {
+            "type": "object",
+            "properties": {
+                "intput": {
+                    "type": "object",
+                    "required": [
+                        "mgmt",
+                        "oui",
+                        "data"
+                    ],
+                    "properties": {
+                        "mgmt": {
+                            "type": "integer"
+                        },
+                        "oui": {
+                            "$ref": "#/definitions/oui_t"
+                        },
+                        "data": {
+                            "$ref": "#/definitions/data_t"
+                        }
+                    }
                 },
-                "del_vendor_ie": {
+                "output": {
                     "type": "object",
                     "properties": {}
+                }
+            }
+        },
+        "disconnect": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "required": [
+                        "sta"
+                    ],
+                    "properties": {
+                        "sta": {
+                            "$ref": "#/definitions/macaddr_t"
+                        }
+                    }
                 },
-                "disconnect": {
+                "output": {
+                    "type": "object",
+                    "properties": {}
+                }
+            }
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "input": {
                     "type": "object",
                     "properties": {}
                 },
-                "status": {
+                "output": {
                     "type": "object",
                     "required": [
                         "ifname",
@@ -314,8 +503,17 @@
                             }
                         }
                     }
+                }
+            }
+        },
+        "stats": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "properties": {}
                 },
-                "stats": {
+                "output": {
                     "type": "object",
                     "required": [
                         "tx_bytes",
@@ -405,8 +603,21 @@
                             "$ref": "#/definitions/rxtx_t"
                         }
                     }
+                }
+            }
+        },
+        "stations": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "properties": {
+                        "sta": {
+                            "$ref": "#/definitions/macaddr_t"
+                        }
+                    }
                 },
-                "stations": {
+                "output": {
                     "type": "object",
                     "required": [
                         "stations"
@@ -715,8 +926,24 @@
                             }
                         }
                     }
+                }
+            }
+        },
+        "list_neighbor": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "properties": {
+                        "ssid": {
+                            "$ref": "#/definitions/ssid_t"
+                        },
+                        "client": {
+                            "$ref": "#/definitions/macaddr_t"
+                        }
+                    }
                 },
-                "list_neighbor": {
+                "output": {
                     "type": "object",
                     "required": [
                         "neighbors"
@@ -764,8 +991,17 @@
                             }
                         }
                     }
+                }
+            }
+        },
+        "assoclist": {
+            "type": "object",
+            "properties": {
+                "input": {
+                    "type": "object",
+                    "properties": {}
                 },
-                "assoclist": {
+                "output": {
                     "type": "object",
                     "required": [
                         "assoclist"
@@ -792,187 +1028,6 @@
                     }
                 }
             }
-        },
-        "input": {
-            "type": "object",
-            "properties": {
-                "status": {
-                    "type": "object",
-                    "properties": {}
-                },
-                "stats": {
-                    "type": "object",
-                    "properties": {}
-                },
-                "assoclist": {
-                    "type": "object",
-                    "properties": {}
-                },
-                "stations": {
-                    "type": "object",
-                    "properties": {
-                        "sta": {
-                            "$ref": "#/definitions/macaddr_t"
-                        }
-                    }
-                },
-                "disconnect": {
-                    "type": "object",
-                    "required": [
-                        "sta"
-                    ],
-                    "properties": {
-                        "sta": {
-                            "$ref": "#/definitions/macaddr_t"
-                        }
-                    }
-                },
-                "monitor": {
-                    "type": "object",
-                    "required": [
-                        "sta"
-                    ],
-                    "properties": {
-                        "sta": {
-                            "$ref": "#/definitions/macaddr_t"
-                        },
-                        "get": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "add_neighbor": {
-                    "type": "object",
-                    "required": [
-                        "bssid",
-                        "channel",
-                        "bssid_info",
-                        "reg",
-                        "phy"
-                    ],
-                    "properties": {
-                        "bssid": {
-                            "$ref": "#/definitions/macaddr_t"
-                        },
-                        "channel": {
-                            "oneOf": [
-                                {
-                                    "$ref": "#/definitions/channel_2_t"
-                                },
-                                {
-                                    "$ref": "#/definitions/channel_5_t"
-                                }
-                            ]
-                        },
-                        "bssid_info": {
-                            "type": "string"
-                        },
-                        "reg": {
-                            "type": "integer",
-                            "minimum": 0
-                        },
-                        "phy": {
-                            "type": "integer",
-                            "minimum": 0
-                        }
-                    }
-                },
-                "del_neighbor": {
-                    "type": "object",
-                    "required": [
-                        "bssid"
-                    ],
-                    "properties": {
-                        "bssid": {
-                            "$ref": "#/definitions/macaddr_t"
-                        }
-                    }
-                },
-                "list_neighbor": {
-                    "type": "object",
-                    "properties": {
-                        "ssid": {
-                            "$ref": "#/definitions/ssid_t"
-                        },
-                        "client": {
-                            "$ref": "#/definitions/macaddr_t"
-                        }
-                    }
-                },
-                "request_neighbor": {
-                    "type": "object",
-                    "required": [
-                        "client"
-                    ],
-                    "properties": {
-                        "ssid": {
-                            "$ref": "#/definitions/ssid_t"
-                        },
-                        "client": {
-                            "$ref": "#/definitions/macaddr_t"
-                        }
-                    }
-                },
-                "request_transition": {
-                    "type": "object",
-                    "required": [
-                        "client",
-                        "bssid"
-                    ],
-                    "properties": {
-                        "client": {
-                            "$ref": "#/definitions/macaddr_t"
-                        },
-                        "bssid": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/macaddr_t"
-                            }
-                        },
-                        "timeout": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "add_vendor_ie": {
-                    "type": "object",
-                    "required": [
-                        "mgmt",
-                        "oui",
-                        "data"
-                    ],
-                    "properties": {
-                        "mgmt": {
-                            "type": "integer"
-                        },
-                        "oui": {
-                            "$ref": "#/definitions/oui_t"
-                        },
-                        "data": {
-                            "$ref": "#/definitions/data_t"
-                        }
-                    }
-                },
-                "del_vendor_ie": {
-                    "type": "object",
-                    "required": [
-                        "mgmt",
-                        "oui",
-                        "data"
-                    ],
-                    "properties": {
-                        "mgmt": {
-                            "type": "integer"
-                        },
-                        "oui": {
-                            "$ref": "#/definitions/oui_t"
-                        },
-                        "data": {
-                            "$ref": "#/definitions/data_t"
-                        }
-                    }
-                }
-            }
         }
     }
 }
\ No newline at end of file
-- 
GitLab