Merge branch 'master' into development/DictionaryJSONRPC

rdkcentral · Jul 31, 2023 · 528d0be · 528d0be
2 parents 515aa95 + 8061751
commit 528d0be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ProcessContainers/Containers.h b/ProcessContainers/Containers.h
@@ -63,7 +63,7 @@ namespace Plugin {
         uint32_t endpoint_start(const JsonData::Containers::StartParamsData& params);
         uint32_t endpoint_stop(const JsonData::Containers::StopParamsData& params);
         uint32_t get_containers(Core::JSON::ArrayType<Core::JSON::String>& response) const;
-        uint32_t get_networks(const string& index, Core::JSON::ArrayType<JsonData::Containers::NetworksData>& response) const;
+        uint32_t get_networks(const string& index, Core::JSON::ArrayType<JsonData::Containers::NetworksResultDataElem>& response) const;
         uint32_t get_memory(const string& index, JsonData::Containers::MemoryData& response) const;
         uint32_t get_cpu(const string& index, JsonData::Containers::CpuData& response) const;
     };

diff --git a/ProcessContainers/ContainersJsonRpc.cpp b/ProcessContainers/ContainersJsonRpc.cpp
@@ -36,7 +36,7 @@ namespace Plugin {
         Register<StartParamsData,void>(_T("start"), &Containers::endpoint_start, this);
         Register<StopParamsData,void>(_T("stop"), &Containers::endpoint_stop, this);
         Property<Core::JSON::ArrayType<Core::JSON::String>>(_T("containers"), &Containers::get_containers, nullptr, this);
-        Property<Core::JSON::ArrayType<NetworksData>>(_T("networks"), &Containers::get_networks, nullptr, this);
+        Property<Core::JSON::ArrayType<NetworksResultDataElem>>(_T("networks"), &Containers::get_networks, nullptr, this);
         Property<MemoryData>(_T("memory"), &Containers::get_memory, nullptr, this);
         Property<CpuData>(_T("cpu"), &Containers::get_cpu, nullptr, this);
     }
@@ -137,7 +137,7 @@ namespace Plugin {
     // Return codes:
     //  - ERROR_NONE: Success
     //  - ERROR_UNAVAILABLE: Container not found
-    uint32_t Containers::get_networks(const string& index, Core::JSON::ArrayType<NetworksData>& response) const
+    uint32_t Containers::get_networks(const string& index, Core::JSON::ArrayType<NetworksResultDataElem>& response) const
     {
         uint32_t result = Core::ERROR_NONE;
 
@@ -149,7 +149,7 @@ namespace Plugin {
 
             if (iterator != nullptr) {
                 while(iterator->Next() == true) {
-                    NetworksData networkData;
+                    NetworksResultDataElem networkData;
 
                     networkData.Interface = iterator->Name();