Compare commits

...

8 Commits

Author SHA1 Message Date
Ivan Chvets
26b9a96506 fix: updated internal switch schema
https://telecominfraproject.atlassian.net/browse/OLS-433

Summary of changes:
- Updated internal switch schema.

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>
2024-12-10 08:53:01 -05:00
i-chvets
5ce8dae9ec Merge pull request #393 from Telecominfraproject/OLS-433-fix-switch-schema-sync
OLS-433: fix: updated internal switch schema
2024-12-04 15:49:07 -05:00
i-chvets
7da135c1e5 Merge pull request #394 from Telecominfraproject/OLS-380-fix-file-upload
OSL-380: fix: modified code for file upload transactions
2024-12-04 15:48:47 -05:00
Carsten Schafer
50ee4ba5cb Merge pull request #395 from Telecominfraproject/version_update
fix: release 3.2.1 version update
2024-12-04 12:17:39 -05:00
Ivan Chvets
3a8109d7ad fix: release 3.2.1 version update
https://telecominfraproject.atlassian.net/browse/WIFI-14165

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>
2024-12-04 12:10:44 -05:00
Ivan Chvets
56232966ec fix: modified code for file upload transactions
https://telecominfraproject.atlassian.net/browse/OLS-380

Summary of changes:
- Modified code to have two distinct transaction in storage file upload.

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>
2024-11-29 13:09:34 -05:00
Ivan Chvets
1ecf98d712 fix: updated internal switch schema
https://telecominfraproject.atlassian.net/browse/OLS-433

Summary of changes:
- Updated internal switch schema.

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>
2024-11-29 11:56:05 -05:00
Gopi Raga
f5b60ced61 Merge pull request #392 from Telecominfraproject/WIFI-14292-fix-json-parse-error
WIFI-14292: fix: json parsing error
2024-11-17 11:20:00 +05:30
3 changed files with 31 additions and 23 deletions

View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(owgw VERSION 3.2.0) project(owgw VERSION 3.2.1)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_STANDARD_REQUIRED True)

View File

@@ -376,6 +376,8 @@ static std::string DefaultAPSchema = R"foo(
"properties": { "properties": {
"port-mirror": { "port-mirror": {
"description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.", "description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
"type": "array",
"items": {
"type": "object", "type": "object",
"properties": { "properties": {
"monitor-ports": { "monitor-ports": {
@@ -390,6 +392,7 @@ static std::string DefaultAPSchema = R"foo(
"type": "string" "type": "string"
} }
} }
}
}, },
"loop-detection": { "loop-detection": {
"description": "Enable loop detection on the L2 switches/bridge.", "description": "Enable loop detection on the L2 switches/bridge.",
@@ -4652,18 +4655,24 @@ static std::string DefaultSWITCHSchema = R"foo(
"type": "object", "type": "object",
"properties": { "properties": {
"port-mirror": { "port-mirror": {
"description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
"type": "array",
"items": {
"type": "object", "type": "object",
"properties": { "properties": {
"monitor-ports": { "monitor-ports": {
"description": "The list of ports that we want to mirror.",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"analysis-port": { "analysis-port": {
"description": "The port that mirror'ed packets should be sent to.",
"type": "string" "type": "string"
} }
} }
}
}, },
"loop-detection": { "loop-detection": {
"type": "object", "type": "object",

View File

@@ -644,8 +644,6 @@ namespace OpenWifi {
uint64_t Size = FileContent.str().size(); uint64_t Size = FileContent.str().size();
Poco::Data::Session Sess = Pool_->get(); Poco::Data::Session Sess = Pool_->get();
Sess.begin();
Poco::Data::Statement Statement(Sess);
if (Size < FileUploader()->MaxSize()) { if (Size < FileUploader()->MaxSize()) {
@@ -668,9 +666,10 @@ namespace OpenWifi {
} else { } else {
poco_warning(Logger(), fmt::format("File {} is too large.", UUID)); poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
} }
Sess.commit();
// update CommandList here to ensure that file us uploaded // update CommandList here to ensure that file us uploaded
Sess.begin();
Poco::Data::Statement Statement(Sess);
std::string StatementStr; std::string StatementStr;
StatementStr = StatementStr =
"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?"; "UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";