Skip to content

Commit 8254ac0

Browse files
Removed YAML
1 parent a2d5d48 commit 8254ac0

15 files changed

+7
-661
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "3rdparty/paho.mqtt.cpp"]
55
path = 3rdparty/paho.mqtt.cpp
66
url = https://github.com/eclipse/paho.mqtt.cpp.git
7-
[submodule "3rdparty/mini-yaml"]
8-
path = 3rdparty/mini-yaml
9-
url = https://github.com/jimmiebergmann/mini-yaml.git
107
[submodule "3rdparty/curl"]
118
path = 3rdparty/curl
129
url = https://github.com/curl/curl.git

.ort.yml

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ excludes:
2424
- pattern: "3rdparty/googletest/**"
2525
reason: "TEST_OF"
2626
comment: "Google test framework, not included in production release."
27-
- pattern: "3rdparty/mini-yaml/test/**"
28-
reason: "TEST_OF"
29-
comment: "Mini yaml test setup, not included in production release."
3027
- pattern: "3rdparty/openssl/wycheproof/**"
3128
reason: "TEST_OF"
3229
comment: "Crypto library testing, not included in production release."

3rdparty/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ add_subdirectory(./paho.mqtt.cpp)
1212
add_dependencies(paho-mqttpp3 paho-mqtt3a)
1313
add_dependencies(paho-mqttpp3 paho-mqtt3c)
1414

15-
add_library(mini-yaml SHARED ./mini-yaml/yaml/Yaml.cpp)
16-
install(TARGETS mini-yaml LIBRARY DESTINATION lib)
17-
1815
set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/lib/pkgconfig)
1916
find_package(OpenSSL REQUIRED)
2017
set(CURL_USE_OPENSSL ON)

3rdparty/mini-yaml

-1
This file was deleted.

Dockerfile.amd64

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ COPY --from=build /work/dist_amd64/bin/sdv-self-update-agent /sua/bin/sdv-self-u
6060
COPY --from=build /work/dist_amd64/lib/libpaho-mqttpp3.so.1 /sua/lib/
6161
COPY --from=build /work/dist_amd64/lib/libpaho-mqtt3a.so.1 /sua/lib/
6262
COPY --from=build /work/dist_amd64/lib/libpaho-mqtt3c.so.1 /sua/lib/
63-
COPY --from=build /work/dist_amd64/lib/libmini-yaml.so /sua/lib/
6463
COPY --from=build /work/dist_amd64/lib/libcurl.so /sua/lib/
6564
COPY --from=build /work/dist_amd64/lib/libcrypto.so.3 /sua/lib/
6665
COPY --from=build /work/dist_amd64/lib/libssl.so.3 /sua/lib/

Dockerfile.arm64

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ COPY --from=build /work/dist_arm64/bin/sdv-self-update-agent /sua/bin/sdv-self-u
6060
COPY --from=build /work/dist_arm64/lib/libpaho-mqttpp3.so.1 /sua/lib/
6161
COPY --from=build /work/dist_arm64/lib/libpaho-mqtt3a.so.1 /sua/lib/
6262
COPY --from=build /work/dist_arm64/lib/libpaho-mqtt3c.so.1 /sua/lib/
63-
COPY --from=build /work/dist_arm64/lib/libmini-yaml.so /sua/lib/
6463
COPY --from=build /work/dist_arm64/lib/libcurl.so /sua/lib/
6564
COPY --from=build /work/dist_arm64/lib/libcrypto.so.3 /sua/lib/
6665
COPY --from=build /work/dist_arm64/lib/libssl.so.3 /sua/lib/

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ MQTT communication is done over 4 MQTT topics:
107107
|------| -------- | ----------- |
108108
| selfupdate/desiredstatefeedback | OUT | This message is being sent by SUA to share current progress of triggered update process. This is the *OUT* counterpart of *selfupdate/desiredstate* input message. |
109109

110-
SUA supports 2 protocols depending on configuration: [link](docs/k8s.md) for Kubernetes-based Custom Objects or [link](docs/bfb.md) for Update Agent API.Default protocol is bfb.
110+
Detailed description of Update Agent API can be found here: [link](docs/bfb.md).
111111

112112
# Checkout
113113
SUA links to some 3rd party libraries, which are fetched as submodules, therefore the cloning shall be performed with recursive option:

docs/testing/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ python3 -m http.server --bind 127.0.0.1 5555
5252

5353
## Simulate sending the MQTT Start messages
5454

55-
The content of the yaml file shall be adjusted, so that url of hosted bundle is valid.
55+
The content of the json file shall be adjusted, so that url of hosted bundle is valid.
5656

5757
```
58-
mosquitto_pub -t "selfupdate/desiredstate" -f docs/testing/mqtt/start.yaml
58+
mosquitto_pub -t "selfupdate/desiredstate" -f docs/testing/mqtt/start.json
59+
mosquitto_pub -t "selfupdate/desiredstate/command" -f docs/testing/mqtt/command-download.json
5960
```
6061

6162
## Subscribe to MQTT feedback messages
@@ -98,7 +99,7 @@ docker build -t host .
9899
docker run -it --network=my-network -p 5555:5555 --name fileserver host
99100
```
100101

101-
The bundle file will be available under: `fileserver:5555/bundle` url, so the value in `start.yaml` shall be adjusted.
102+
The bundle file will be available under: `fileserver:5555/bundle` url, so the value in `start.json` shall be adjusted.
102103

103104
## Deploy SUA
104105

@@ -137,7 +138,7 @@ and locate the `IPAddress` value.
137138
# HowTo send the Start signal to trigger the process
138139

139140
```
140-
mosquitto_pub -t "selfupdate/desiredstate" -f docs/testing/mqtt/start.yaml -h ipAddress_of_mosquitto_container
141+
mosquitto_pub -t "selfupdate/desiredstate" -f docs/testing/mqtt/start.json -h ipAddress_of_mosquitto_container
141142
```
142143

143144
After sending this signal, you should be able to observe the SUA behavior on the console.

project.spdx.yml

-14
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,6 @@ packages:
8686
packageFileName: "3rdparty/curl"
8787
name: "curl"
8888
originator: "Organization: Kungliga Tekniska Högskolan"
89-
- SPDXID: "SPDXRef-Package-mini-yaml"
90-
description: "Single header YAML 1.0 C++11 serializer/deserializer."
91-
copyrightText: "Copyright(c) 2018 Jimmie Bergmann"
92-
downloadLocation: "git+ssh://github.com/jimmiebergmann/mini-yaml.git"
93-
filesAnalyzed: false
94-
homepage: "https://github.com/jimmiebergmann/mini-yaml"
95-
licenseConcluded: "MIT"
96-
licenseDeclared: "MIT"
97-
packageFileName: "3rdparty/mini-yaml"
98-
name: "mini-yaml"
99-
originator: "Person: Jimmie Bergmann"
10089
- SPDXID: "SPDXRef-Package-googletest"
10190
description: "GoogleTest and GoogleMock testing framework."
10291
copyrightText: "Copyright 2008, Google Inc."
@@ -141,9 +130,6 @@ relationships:
141130
- spdxElementId: "SPDXRef-Package-sdv-self-update-agent"
142131
relationshipType: "DEPENDS_ON"
143132
relatedSpdxElement: "SPDXRef-Package-curl"
144-
- spdxElementId: "SPDXRef-Package-sdv-self-update-agent"
145-
relationshipType: "DEPENDS_ON"
146-
relatedSpdxElement: "SPDXRef-Package-mini-yaml"
147133
- spdxElementId: "SPDXRef-Package-googletest"
148134
relationshipType: "TEST_OF"
149135
relatedSpdxElement: "SPDXRef-Package-sdv-self-update-agent"

src/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ include_directories(
2525
${CMAKE_SOURCE_DIR}/3rdparty/spdlog/include
2626
${CMAKE_SOURCE_DIR}/3rdparty/paho.mqtt.c/src
2727
${CMAKE_SOURCE_DIR}/3rdparty/paho.mqtt.cpp/src
28-
${CMAKE_SOURCE_DIR}/3rdparty/mini-yaml
2928
${CMAKE_SOURCE_DIR}/3rdparty/glib
3029
${CMAKE_SOURCE_DIR}/3rdparty/glib/glib
3130
${CMAKE_SOURCE_DIR}/3rdparty/glib/gmodule
@@ -50,7 +49,6 @@ target_link_libraries(${PROJECT_NAME}
5049
curl_lib
5150
paho-mqttpp3
5251
paho-mqtt3a
53-
mini-yaml
5452
gio_lib
5553
gobject_lib
5654
gmodule_lib

src/Mqtt/MqttMessagingProtocolYAML.cpp

-207
This file was deleted.

src/Mqtt/MqttMessagingProtocolYAML.h

-37
This file was deleted.

0 commit comments

Comments
 (0)