Target host address was removed from Control App

diff --git a/control_app/iot-manager-service/inc/network/network_manager.h b/control_app/iot-manager-service/inc/network/network_manager.h
index 444a8a8..3857aae 100644 (file)
--- a/control_app/iot-manager-service/inc/network/network_manager.h
+++ b/control_app/iot-manager-service/inc/network/network_manager.h
@@ -29,7 +29,7 @@ public:
 
     typedef NM_ErrorCode (*InitFunc)(NM_hContext*);
     typedef void (*CleanUpFunc)(NM_hContext*);
-    typedef NM_ErrorCode (*SignInFunc)(NM_hContext, const char* host, const char* user, const char* pass);
+    typedef NM_ErrorCode (*SignInFunc)(NM_hContext, const char* user, const char* pass);
     typedef void (*SignOutFunc)(NM_hContext);
     typedef SignInState (*GetSessionStateFunc)(NM_hContext);
     typedef NM_ErrorCode (*SubscribeDevStateChangedFunc)(NM_hContext, DeviceStateChangedCallback, void*);

diff --git a/control_app/iot-manager-service/inc/network/nm_types.h b/control_app/iot-manager-service/inc/network/nm_types.h
index e81c4f3..e11235e 100644 (file)
--- a/control_app/iot-manager-service/inc/network/nm_types.h
+++ b/control_app/iot-manager-service/inc/network/nm_types.h
@@ -46,9 +46,9 @@ inline ErrorCode GetCorrespondingErrorCode(NM_ErrorCode code)
     {
         return ErrorCode::ConnectionTimedOut;
     }
-    case NM_ErrorCode::EC_IOTIVITY_ERROR:
+    case NM_ErrorCode::EC_UNAUTHORIZED: case  NM_ErrorCode::EC_IOTIVITY_ERROR:
     {
-        return ErrorCode::NoConnection; //TODO: no eto ne tochno
+        return ErrorCode::NoConnection;
     }
     default:
     {

diff --git a/control_app/iot-manager-service/src/network/network_manager.cpp b/control_app/iot-manager-service/src/network/network_manager.cpp
index eedb5d3..9ab7f26 100644 (file)
--- a/control_app/iot-manager-service/src/network/network_manager.cpp
+++ b/control_app/iot-manager-service/src/network/network_manager.cpp
@@ -18,8 +18,6 @@
 #include <dlfcn.h>
 
 #define NMLIB_MODULE_NAME "/usr/lib/libnmlib.so"
-#define HOSTNAME "coap+tcp://52.71.167.178:5683" //amazon
-//#define HOSTNAME "coap+tcp://106.125.46.44:5683" //local
 
 #define NM_INIT_FUNC_NAME                   "NM_init"
 #define NM_CLEANUP_FUNC_NAME                "NM_cleanup"
@@ -358,7 +356,7 @@ ErrorCode NetworkManager::LogIn(const UserInfo& userInfo,
 
     NM_ErrorCode res;
 
-    if ((res = m_moduleSymbols.m_nmSignInFunc(m_context, HOSTNAME, userInfo.GetUserLogin().c_str(), psswd.c_str()))
+    if ((res = m_moduleSymbols.m_nmSignInFunc(m_context, userInfo.GetUserLogin().c_str(), psswd.c_str()))
         != NM_ErrorCode::EC_OK)
     {
         LOG_INFO("nnlib returned: %s", std::to_string(res).c_str());

diff --git a/control_app/iot-manager-service/tests/network_manager_test/module_loader_test.cpp b/control_app/iot-manager-service/tests/network_manager_test/module_loader_test.cpp
index 936c7e7..6d48cb3 100644 (file)
--- a/control_app/iot-manager-service/tests/network_manager_test/module_loader_test.cpp
+++ b/control_app/iot-manager-service/tests/network_manager_test/module_loader_test.cpp
@@ -70,7 +70,7 @@ TEST_F(ModuleLoaderTest, SignInOutTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     m_loader.m_nmSignOutFunc(context);
     m_loader.m_nmCleanUpFunc(&context);
@@ -81,7 +81,7 @@ TEST_F(ModuleLoaderTest, GetOwnedDevicesTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;
 
@@ -97,7 +97,7 @@ TEST_F(ModuleLoaderTest, DevListEnumTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;
 
@@ -123,7 +123,7 @@ TEST_F(ModuleLoaderTest, GetDeviceInfoTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;
 
@@ -160,7 +160,7 @@ TEST_F(ModuleLoaderTest, GetUnownedDevicesTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;
 
@@ -176,7 +176,7 @@ TEST_F(ModuleLoaderTest, GetDeviceReportTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, m_loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;
 

diff --git a/control_app/iot-manager-service/tests/network_manager_test/network_manager_test.cpp b/control_app/iot-manager-service/tests/network_manager_test/network_manager_test.cpp
index 7bdd6b1..ef76898 100644 (file)
--- a/control_app/iot-manager-service/tests/network_manager_test/network_manager_test.cpp
+++ b/control_app/iot-manager-service/tests/network_manager_test/network_manager_test.cpp
@@ -61,7 +61,7 @@ TEST_F(NetworkManagerTest, ToDeviceListTest)
     NM_hContext context;
     ASSERT_EQ(NM_ErrorCode::EC_OK, loader.m_nmInitFunc(&context));
 
-    EXPECT_EQ(NM_ErrorCode::EC_OK, loader.m_nmSignInFunc(context, "coap+tcp://106.125.46.44:5683", "login", "password"));
+    EXPECT_EQ(NM_ErrorCode::EC_OK, loader.m_nmSignInFunc(context, "login", "password"));
 
     NM_hDeviceList devList = nullptr;