From 69a31b00c6ad3d9e1f2f30bc788461b89e0d932e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 11 Jul 2016 23:21:51 +0200 Subject: [PATCH] bump api and guhd version --- debian/changelog | 13 ++++ guh.pri | 2 +- tests/auto/api.json | 161 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 174 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93ff6a3c..00df9814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +guh (0.7.5) xenial; urgency=medium + + * Configuration API and server settings + + -- Simon Stürz Thu, 11 Jul 2016 23:15:13 +0200 + +guh (0.7.4) xenial; urgency=medium + + * Add cloud connection + * Add guhd configuration + + -- Simon Stürz Thu, 17 Jun 2016 18:35:02 +0200 + guh (0.7.3) xenial; urgency=medium * Add plugin property recommendations for client applications diff --git a/guh.pri b/guh.pri index 1468f3d7..ab494e17 100644 --- a/guh.pri +++ b/guh.pri @@ -2,7 +2,7 @@ GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') # define protocol versions -JSON_PROTOCOL_VERSION=42 +JSON_PROTOCOL_VERSION=43 REST_API_VERSION=1 DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \ diff --git a/tests/auto/api.json b/tests/auto/api.json index 6399051d..e0bc5b79 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -41 +43 { "methods": { "Actions.ExecuteAction": { @@ -31,6 +31,129 @@ } } }, + "Cloud.Authenticate": { + "description": "Connect and authenticate the cloud connection with the given username and password.", + "params": { + "password": "String", + "username": "String" + }, + "returns": { + "cloudError": "$ref:CloudError" + } + }, + "Cloud.Disable": { + "description": "Disable the cloud connection.", + "params": { + }, + "returns": { + "cloudError": "$ref:CloudError" + } + }, + "Cloud.Enable": { + "description": "Enable the cloud connection.", + "params": { + }, + "returns": { + "cloudError": "$ref:CloudError" + } + }, + "Cloud.GetConnectionStatus": { + "description": "Get the current status of the cloud connection.", + "params": { + }, + "returns": { + "active": "Bool", + "authenticated": "Bool", + "connected": "Bool", + "enabled": "Bool" + } + }, + "Configuration.GetConfigurations": { + "description": "Get all configuration parameters of the server.", + "params": { + }, + "returns": { + "basicConfiguration": { + "serverName": "String", + "serverTime": "Uint", + "serverUuid": "Uuid", + "timeZone": "String" + }, + "sslConfiguration": { + "enabled": "Bool" + }, + "tcpServerConfiguration": { + "host": "String", + "port": "Uint" + }, + "webServerConfiguration": { + "host": "String", + "port": "Uint" + }, + "webSocketServerConfiguration": { + "host": "String", + "port": "Uint" + } + } + }, + "Configuration.GetTimeZones": { + "description": "Get the list of available timezones.", + "params": { + }, + "returns": { + "timeZones": [ + "String" + ] + } + }, + "Configuration.SetServerName": { + "description": "Set the name of the server. Default is guhIO.", + "params": { + "serverName": "String" + }, + "returns": { + "configurationError": "$ref:ConfigurationError" + } + }, + "Configuration.SetTcpServerConfiguration": { + "description": "Configure the TCP interface of the server. Note: if you are using the TCP server for this call you will loose the connection.", + "params": { + "host": "String", + "port": "Uint" + }, + "returns": { + "configurationError": "$ref:ConfigurationError" + } + }, + "Configuration.SetTimeZone": { + "description": "Set the time zone of the server. See also: \"GetTimeZones\"", + "params": { + "timeZone": "String" + }, + "returns": { + "configurationError": "$ref:ConfigurationError" + } + }, + "Configuration.SetWebServerConfiguration": { + "description": "Configure the web server of the server.", + "params": { + "host": "String", + "port": "Uint" + }, + "returns": { + "configurationError": "$ref:ConfigurationError" + } + }, + "Configuration.SetWebSocketServerConfiguration": { + "description": "Configure the web socket interface of the server. Note: if you are using the web socket server for this call you will loose the connection.", + "params": { + "host": "String", + "port": "Uint" + }, + "returns": { + "configurationError": "$ref:ConfigurationError" + } + }, "Devices.AddConfiguredDevice": { "description": "Add a configured device with a setupMethod of SetupMethodJustAdd. For devices with a setupMethod different than SetupMethodJustAdd, use PairDevice. Use deviceDescriptorId or deviceParams, depending on the createMethod of the device class. CreateMethodJustAdd takes the parameters you want to have with that device. CreateMethodDiscovery requires the use of a deviceDescriptorId.", "params": { @@ -463,6 +586,34 @@ } }, "notifications": { +<<<<<<< HEAD +======= + "Cloud.ConnectionStatusChanged": { + "description": "Emitted whenever the status of the cloud connection changed. The cloud connection is active if a cloud client is talking with the server.", + "params": { + "active": "Bool", + "authenticated": "Bool", + "connected": "Bool", + "enabled": "Bool" + } + }, + "Configuration.BasicConfigurationChanged": { + "description": "Emitted whenever the basic configuration of this server changes.", + "params": { + "serverName": "String", + "serverTime": "Uint", + "serverUuid": "Uuid", + "timeZone": "String" + } + }, + "Configuration.TcpServerConfigurationChanged": { + "description": "Emitted whenever the TCP server configuration changes.", + "params": { + "host": "String", + "port": "Uint" + } + }, +>>>>>>> bump api and guhd version "Devices.DeviceAdded": { "description": "Emitted whenever a Device was added.", "params": { @@ -594,6 +745,14 @@ "CloudErrorProxyServerNotReachable", "CloudErrorLoginCredentialsMissing" ], + "ConfigurationError": [ + "ConfigurationErrorNoError", + "ConfigurationErrorInvalidTimeZone", + "ConfigurationErrorInvalidStationName", + "ConfigurationErrorInvalidPort", + "ConfigurationErrorInvalidHostAddress", + "ConfigurationErrorInvalidCertificate" + ], "CreateMethod": [ "CreateMethodUser", "CreateMethodAuto",