Moving to APIV2 Work in Progress

diff --git a/ucs2-afb/ucs_apihat.c b/ucs2-afb/ucs_apihat.c
deleted file mode 100644 (file)
index fd5d88f..0000000
--- a/ucs2-afb/ucs_apihat.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <math.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-#include "ucs_binding.h"
-
-const struct afb_binding_interface *afbIface;
-struct afb_service afbSrv;
-
-/*
- * array of the verbs exported to afb-daemon
- */
-static const struct afb_verb_desc_v1 binding_verbs[] = {
-  /* VERB'S NAME            SESSION MANAGEMENT          FUNCTION TO CALL         SHORT DESCRIPTION */
-  { .name= "initialise", .session= AFB_SESSION_NONE,  .callback= ucs2Init,      .info= "Parse XML & initialise Unicens " },
-  { .name= "setvol"    , .session= AFB_SESSION_NONE,  .callback= ucs2SetVol,    .info= "Set Volume" },
- //  { .name= "monitor"   , .session= AFB_SESSION_NONE,  .callback= ucs2Monitor,   .info= "Subscribe to network error" },
-
-
-  { .name= NULL } /* marker for end of the array */
-};
-
-/*
- * description of the binding for afb-daemon
- */
-static const struct afb_binding binding_description = {
-  /* description conforms to VERSION 1 */
-  .type= AFB_BINDING_VERSION_1,
-  .v1= {
-    .prefix= "UNICENS",
-    .info= "UNICENS MOST Control API",
-    .verbs = binding_verbs
-  }
-};
-
-// this is call when after all bindings are loaded
- int afbBindingV1ServiceInit(struct afb_service service) {
-   afbSrv =  service;
-   return (0);
-}
-
-/*
- * activation function for registering the binding called by afb-daemon
- */
- const struct afb_binding *afbBindingV1Register(const struct afb_binding_interface *itf) {
-    afbIface= itf;
-
-    return &binding_description;       /* returns the description of the binding */
-}
-

diff --git a/ucs2-interface/ucs_api_def.json b/ucs2-interface/ucs_api_def.json
deleted file mode 100644 (file)
index 9b99843..0000000
--- a/ucs2-interface/ucs_api_def.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "description": "",
-    "title": "monitor",
-    "version": "1.0",
-    "x-binding-c-generator": {
-      "api": "monitor",
-      "version": 2,
-      "prefix": "f_",
-      "postfix": "",
-      "preinit": null,
-      "init": null,
-      "onevent": null,
-      "scope": "static",
-      "private": true
-    }
-  },
-  "servers": [
-    {
-      "url": "ws://{host}:{port}/api/monitor",
-      "description": "The API server.",
-      "variables": {
-        "host": {
-          "default": "localhost"
-        },
-        "port": {
-          "default": "1234"
-        }
-      },
-      "x-afb-events": [
-        {
-          "$ref": "#/components/schemas/afb-event"
-        }
-      ]
-    }
-  ],
-  "components": {
-    "schemas": {
-      "afb-reply": {
-        "$ref": "#/components/schemas/afb-reply-v1"
-      },
-      "afb-event": {
-        "$ref": "#/components/schemas/afb-event-v1"
-      },
-      "afb-reply-v1": {
-        "title": "Generic response.",
-        "type": "object",
-        "required": [ "jtype", "request" ],
-        "properties": {
-          "jtype": {
-            "type": "string",
-            "const": "afb-reply"
-          },
-          "request": {
-            "type": "object",
-            "required": [ "status" ],
-            "properties": {
-              "status": { "type": "string" },
-              "info": { "type": "string" },
-              "token": { "type": "string" },
-              "uuid": { "type": "string" },
-              "reqid": { "type": "string" }
-            }
-          },
-          "response": { "type": "object" }
-        }
-      },
-      "afb-event-v1": {
-        "type": "object",
-        "required": [ "jtype", "event" ],
-        "properties": {
-          "jtype": {
-            "type": "string",
-            "const": "afb-event"
-          },
-          "event": { "type": "string" },
-          "data": { "type": "object" }
-        }
-      },
-      "set-verbosity": {
-        "anyOf": [
-          { "$ref": "#/components/schemas/verbosity-map" },
-          { "$ref": "#/components/schemas/verbosity-level" }
-        ]
-      },
-      "get-request": {
-        "type": "object",
-        "properties": {
-          "verbosity": { "$ref": "#/components/schemas/get-verbosity" },
-          "apis": { "$ref": "#/components/schemas/get-apis" }
-        }
-      },
-      "get-response": {
-        "type": "object",
-        "properties": {
-          "verbosity": { "$ref": "#/components/schemas/verbosity-map" },
-          "apis": { "type": "object" }
-        }
-      },
-      "get-verbosity": {
-        "anyOf": [
-          { "type": "boolean" },
-          { "type": "array", "items": { "type": "string" } },
-          { "type": "object" }
-        ]
-      },
-      "get-apis": {
-        "anyOf": [
-          { "type": "boolean" },
-          { "type": "array", "items": { "type": "string" } },
-          { "type": "object" }
-        ]
-      },
-      "verbosity-map": {
-        "type": "object",
-        "patternProperties": { "^.*$": { "$ref": "#/components/schemas/verbosity-level" } }
-      },
-      "verbosity-level": {
-        "enum": [ "debug", 3, "info", 2, "notice", "warning", 1, "error", 0 ]
-      }
-    },
-    "x-permissions": {
-        "set": {
-          "permission": "urn:AGL:permission:monitor:public:set"
-        },
-        "get": {
-          "permission": "urn:AGL:permission:monitor:public:get"
-        },
-        "get-or-set": {
-          "anyOf": [
-            { "$ref": "#/components/x-permissions/get" },
-            { "$ref": "#/components/x-permissions/set" }
-          ]
-        }
-    }
-  },
-  "paths": {
-    "/get": {
-      "description": "Get monitoring data.",
-      "get": {
-        "x-permissions": {
-          "$ref": "#/components/x-permissions/get-or-set"
-        },
-        "parameters": [
-          {
-            "in": "query",
-            "name": "verbosity",
-            "required": false,
-            "schema": { "$ref": "#/components/schemas/get-verbosity" }
-          },
-          {
-            "in": "query",
-            "name": "apis",
-            "required": false,
-            "schema": { "$ref": "#/components/schemas/get-apis" }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A complex object array response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/afb-reply"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/set": {
-      "description": "Set monitoring actions.",
-      "get": {
-        "x-permissions": {
-          "$ref": "#/components/x-permissions/set"
-        },
-        "parameters": [
-          {
-            "in": "query",
-            "name": "verbosity",
-            "required": false,
-            "schema": { "$ref": "#/components/schemas/set-verbosity" }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A complex object array response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/afb-reply"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}