Add AWS cloud support to agl-service-cloudproxy.needlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0

Bug-AGL: SPEC-3481
Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com>
Change-Id: I071d94a9dc2e1f455119124c1185bf135f4c5b78

3 files changed, 0 insertions, 405 deletions

diff --git a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp
deleted file mode 100755
index 0a30446..0000000
--- a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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.
- */
-
-#include <thread>
-#include <algorithm>
-
-#include "cloudproxyclient.h"
-#include "hmi-debug.h"
-
-
-static const char API_name[] = "cloudproxy";
-
-const std::vector<std::string> CloudProxyClient::m_api_list {
-        std::string("ping"),
-        std::string("createConnection"),
-        std::string("sendMessage"),
-        std::string("destroyConnection")
-    };
-
-const std::vector<std::string> CloudProxyClient::m_event_list {
-        std::string("sendMessageConfirmation"),
-        std::string("receivedMessage")
-    };
-
-static void event_loop_run(sd_event* loop)
-{
-    sd_event_loop(loop);
-    sd_event_unref(loop);
-}
-
-static void on_hangup(void *closure, afb_wsj1 *wsj)
-{
-    HMI_DEBUG("cloudproxyclient", "called");
-    (void)closure;
-    (void)wsj;
-}
-
-static void on_call(void *closure, const char *api, const char *verb, afb_wsj1_msg *msg)
-{
-    HMI_ERROR("cloudproxyclient", "this method should not be called");
-    (void)closure;
-    (void)api;
-    (void)verb;
-    (void)msg;
-}
-
-static void on_event(void* closure, const char* event, afb_wsj1_msg *msg)
-{
-    HMI_DEBUG("cloudproxyclient", "event [%s]", (event ? event: ""));
-    (void)closure;
-
-    static_cast<CloudProxyClient*>(closure)->on_event(nullptr, event, msg);
-}
-
-static void on_reply(void *closure, afb_wsj1_msg *msg)
-{
-    HMI_DEBUG("cloudproxyclient", "called");
-    (void)closure;
-    (void)msg;
-}
-
-
-CloudProxyClient::CloudProxyClient()
-{
-}
-
-CloudProxyClient::~CloudProxyClient()
-{
-    if(m_websock)
-    {
-        afb_wsj1_unref(m_websock);
-    }
-    if(m_loop)
-    {
-        sd_event_exit(m_loop, 0);
-    }
-}
-
-int CloudProxyClient::init(const int port, const std::string& token)
-{
-    int ret = 0;
-    if(port <= 0 && token.size() == 0)
-    {
-        HMI_ERROR("cloudproxyclient","port and token should be > 0, Initial port and token uses.");
-        return -1;
-    }
-
-    {
-        m_loop = nullptr;
-        int ret = sd_event_new(&m_loop);
-        if(ret < 0)
-        {
-            HMI_ERROR("cloudproxyclient","Failed to create event loop");
-            return -1;
-        }
-
-        {
-            // enforce context to avoid initialization/goto error
-            std::thread th(event_loop_run, m_loop);
-            th.detach();
-        }
-
-        /* Initialize interface from websocket */
-        m_itf.on_hangup = ::on_hangup;
-        m_itf.on_call = ::on_call;
-        m_itf.on_event = ::on_event;
-
-        m_uri += "ws://localhost:" + std::to_string(port) + "/api?token=" + token;
-
-        m_websock = afb_ws_client_connect_wsj1(m_loop, m_uri.c_str(), &m_itf, this);
-        if(!m_websock)
-        {
-            HMI_ERROR("cloudproxyclient","Failed to create websocket connection");
-            return -1;
-        }
-    }
-
-    HMI_DEBUG("cloudproxyclient", "Initialized");
-
-    return ret;
-}
-
-
-int CloudProxyClient::call(const std::string& verb, json_object* arg)
-{
-    int ret;
-    if(!m_websock)
-    {
-        return -1;
-    }
-
-    if (verb.empty() || m_api_list.end() == std::find(m_api_list.begin(), m_api_list.end(), verb))
-    {
-        HMI_ERROR("cloudproxyclient","verb [%s] doesn't exit", verb.c_str());
-        return -1;
-    }
-
-    ret = afb_wsj1_call_j(m_websock, API_name, verb.c_str(), arg, ::on_reply, this);
-    if (ret < 0)
-    {
-        HMI_ERROR("cloudproxyclient", "Failed to call verb:%s", verb.c_str());
-    }
-
-    return ret;
-}
-
-
-int CloudProxyClient::sendMessage(const std::string& data)
-{
-    if(!m_websock)
-        return -1;
-
-    json_object* j_obj = json_object_new_object();
-    json_object_object_add(j_obj, "data", json_object_new_string(data.c_str()));
-
-    return this->call("sendMessage", j_obj);
-}
-
-void CloudProxyClient::set_event_handler(enum EventType et, handler_func f)
-{
-    if (et > Event_Min && et < Event_Max)
-    {
-        switch (et)
-        {
-            case Event_SendMessageConfirmation:
-                this->subscribe(CloudProxyClient::m_event_list[0]);
-                break;
-            case Event_ReceivedMessage:
-                this->subscribe(CloudProxyClient::m_event_list[1]);
-                break;
-            default:
-                break;
-        }
-
-        this->handlers[et] = std::move(f);
-    }
-}
-
-int CloudProxyClient::subscribe(const std::string& event_name)
-{
-    if(!m_websock)
-        return -1;
-
-    json_object* j_obj = json_object_new_object();
-    json_object_object_add(j_obj, "event", json_object_new_string(event_name.c_str()));
-
-    int ret = afb_wsj1_call_j(m_websock, API_name, "subscribe", j_obj, ::on_reply, this);
-    if (ret < 0)
-        HMI_ERROR("cloudproxyclient", "subscribe filed for '%s'", event_name.c_str());
-
-    return ret;
-}
-
-int CloudProxyClient::unsubscribe(const std::string& event_name)
-{
-    if(!m_websock)
-        return -1;
-
-    json_object* j_obj = json_object_new_object();
-    json_object_object_add(j_obj, "event", json_object_new_string(event_name.c_str()));
-
-    int ret = afb_wsj1_call_j(m_websock, API_name, "unsubscribe", j_obj, ::on_reply, this);
-    if (ret < 0)
-        HMI_ERROR("cloudproxyclient", "unsubscribe filed for '%s'", event_name.c_str());
-
-    return ret;
-}
-
-void CloudProxyClient::on_event(void *closure, const char *event, afb_wsj1_msg *msg)
-{
-    HMI_DEBUG("cloudproxyclient", "event: (%s) msg: (%s).", event, afb_wsj1_msg_object_s(msg));
-    (void) closure;
-
-    if (strstr(event, API_name) == nullptr)
-        return;
-
-
-    json_object* ev_contents = afb_wsj1_msg_object_j(msg);
-    json_object *json_data;
-    if(!json_object_object_get_ex(ev_contents, "data", &json_data))
-    {
-        HMI_ERROR("cloudproxyclient", "got ev_contents error.");
-        return;
-    }
-
-    const char* event_type = nullptr;
-    json_object *json_event_type;
-    if(!json_object_object_get_ex(json_data, "type", &json_event_type) ||
-       (event_type = json_object_get_string(json_event_type)) == nullptr)
-    {
-        HMI_ERROR("cloudproxyclient", "event_type is null.");
-        return;
-    }
-
-    const std::string et{event_type};
-    if (CloudProxyClient::m_event_list[0] == et)
-    {
-        auto i = this->handlers.find(Event_SendMessageConfirmation);
-        if (i != this->handlers.end())
-            i->second(json_data);
-    }
-    else if (CloudProxyClient::m_event_list[1] == et)
-    {
-        auto i = this->handlers.find(Event_ReceivedMessage);
-        if (i != this->handlers.end())
-            i->second(json_data);
-    }
-}
diff --git a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h
deleted file mode 100755
index b333a14..0000000
--- a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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.
- */
-
-#pragma once
-
-#include <vector>
-#include <map>
-#include <string>
-#include <functional>
-#include <json-c/json.h>
-#include <systemd/sd-event.h>
-
-extern "C"
-{
-#include <afb/afb-wsj1.h>
-#include <afb/afb-ws-client.h>
-}
-
-class CloudProxyClient
-{
-public:
-    using handler_func = std::function<void(json_object*)>;
-
-    enum EventType {
-        Event_Min,
-        Event_SendMessageConfirmation = 1,
-        Event_ReceivedMessage,
-        Event_Max
-    };
-
-
-    CloudProxyClient();
-    ~CloudProxyClient();
-
-    CloudProxyClient(const CloudProxyClient &) = delete;
-    CloudProxyClient &operator=(const CloudProxyClient &) = delete;
-
-    int init(const int port, const std::string& token);
-
-    int sendMessage(const std::string& data);
-
-    void set_event_handler(enum EventType et, handler_func f);
-
-    void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg);
-
-    int subscribe(const std::string& event_name);
-    int unsubscribe(const std::string& event_name);
-
-private:
-    int call(const std::string& verb, struct json_object* arg);
-
-private:
-    static const std::vector<std::string> m_api_list;
-    static const std::vector<std::string> m_event_list;
-
-    std::map<EventType, handler_func> handlers;
-    struct afb_wsj1_itf m_itf;
-    struct afb_wsj1* m_websock{nullptr};
-    sd_event* m_loop{nullptr};
-    std::string m_uri;
-};
diff --git a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h
deleted file mode 100755
index 674f5df..0000000
--- a/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
- *
- * 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.
- */
-
-#ifndef __HMI_DEBUG_H__
-#define __HMI_DEBUG_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-enum LOG_LEVEL{
-    LOG_LEVEL_NONE = 0,
-    LOG_LEVEL_ERROR,
-    LOG_LEVEL_WARNING,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_DEBUG,
-    LOG_LEVEL_MAX = LOG_LEVEL_DEBUG
-};
-
-#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-
-#define HMI_ERROR(prefix, args,...) _HMI_LOG(LOG_LEVEL_ERROR, __FILENAME__, __FUNCTION__, __LINE__, prefix, args, ##__VA_ARGS__)
-#define HMI_WARNING(prefix, args,...) _HMI_LOG(LOG_LEVEL_WARNING, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_NOTICE(prefix, args,...) _HMI_LOG(LOG_LEVEL_NOTICE, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_INFO(prefix, args,...)  _HMI_LOG(LOG_LEVEL_INFO, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_DEBUG(prefix, args,...) _HMI_LOG(LOG_LEVEL_DEBUG, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-
-static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"};
-
-static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, const char* prefix, const char* log, ...)
-{
-    const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG"));
-    if(log_level < level)
-    {
-        return;
-    }
-
-    char *message;
-    struct timespec tp;
-    unsigned int time;
-
-    clock_gettime(CLOCK_REALTIME, &tp);
-    time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000);
-
-    va_list args;
-    va_start(args, log);
-    if (log == NULL || vasprintf(&message, log, args) < 0)
-        message = NULL;
-    fprintf(stderr,  "[%10.3f] [%s %s] [%s, %s(), Line:%d] >>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, message);
-    va_end(args);
-    free(message);
-}
-
-#endif  //__HMI_DEBUG_H__