Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update villas version #245

Merged
merged 7 commits into from
Oct 11, 2023
Merged

Update villas version #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00c48af
Adapted Dockerfile for cloning the latest VILLASnode version
pipeacosta Sep 29, 2023
2e22614
Modified InterfaceWorkerVillas's open method according to the latest …
pipeacosta Sep 29, 2023
67558d6
Using a specific VILLASnode commit version in the Dockerfile
pipeacosta Oct 5, 2023
1e8be6c
Updated VILLASnode version in Dockerfile.manylinux
pipeacosta Oct 6, 2023
6da46dc
Removed libwebsockets installation from source
pipeacosta Oct 8, 2023
9e9afda
Update python command to python3 in test-villas-examples actions
pipeacosta Oct 9, 2023
a8ef100
fix dockerfile spacing code smell
dinkelbachjan Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build_test_linux_fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ jobs:
container_commands: |
docker exec dpsim-compose_dpsim_1 /bin/bash -c "pip install paho-mqtt"
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "/dpsim-mqtt" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-mqtt-producer.py"&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-mqtt.py"
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-producer.py"&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt.py"

test-villas-examples-2:
name: Run dpsim-mqtt-import-export VILLASnode example
Expand All @@ -280,7 +280,7 @@ jobs:
compose_file_path: examples/villas/docker-compose-tests
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-mqtt-import-export.py"
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export.py"

test-villas-examples-3:
name: Run dpsim-mqtt-import-export-MIMO VILLASnode example
Expand All @@ -291,7 +291,7 @@ jobs:
continue_on_error: true
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-mqtt-import-export-MIMO.py"
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export-MIMO.py"

test-villas-examples-4:
name: Run dpsim-file VILLASnode example
Expand All @@ -302,7 +302,7 @@ jobs:
continue_on_error: true
container_commands: |
docker exec dpsim-compose_dpsim_1 /bin/bash -c "sleep 3 && tail -f /dpsim/logs/output.csv"&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-file.py"
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-file.py"

test-villas-examples-5:
name: Run mqtt-cigre-mv-pf-profiles VILLASnode example
Expand All @@ -312,4 +312,4 @@ jobs:
compose_file_path: examples/villas/docker-compose-tests
container_commands: |
docker exec dpsim-compose_mqtt_1 mosquitto_sub -t "#" -u wildcard -v&
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python /dpsim/examples/villas/dpsim-mqtt-cigre-mv-pf-profiles.py"
docker exec dpsim-compose_dpsim_1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-cigre-mv-pf-profiles.py"
4 changes: 1 addition & 3 deletions dpsim-villas/src/InterfaceWorkerVillas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ void InterfaceWorkerVillas::open() {
mNode = node::NodeFactory::make(nodeTypeString);

int ret = 0;
uuid_t fakeSuperNodeUUID;
uuid_generate_random(fakeSuperNodeUUID);
ret = mNode->parse(config, fakeSuperNodeUUID);
ret = mNode->parse(config);
if (ret < 0) {
SPDLOG_LOGGER_ERROR(mLog, "Error: Node in InterfaceVillas failed to parse config. Parse returned code {}", ret);
std::exit(1);
Expand Down
10 changes: 5 additions & 5 deletions packaging/Docker/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM fedora:36 AS base

ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
ARG VILLAS_VERSION=c976cd62d8c6667a078be0785ca3e623a05f7456
ARG VILLAS_VERSION=5185c25ba7442c3e9264f4225f9a46829956732c

ARG CMAKE_OPTS
ARG MAKE_OPTS=-j4

LABEL \
org.opencontainers.image.title = "DPsim" \
org.opencontainers.image.licenses = "MPL 2.0" \
org.opencontainers.image.url = "http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source = "https://github.com/sogno-platform/dpsim"
org.opencontainers.image.title="DPsim" \
org.opencontainers.image.licenses="MPL 2.0" \
org.opencontainers.image.url="http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source="https://github.com/sogno-platform/dpsim"

RUN dnf -y update

Expand Down
21 changes: 5 additions & 16 deletions packaging/Docker/Dockerfile.dev-rocky
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ARG CMAKE_OPTS
ARG MAKE_OPTS=-j4

LABEL \
org.opencontainers.image.title = "DPsim" \
org.opencontainers.image.licenses = "MPL 2.0" \
org.opencontainers.image.url = "http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source = "https://github.com/sogno-platform/dpsim"
org.opencontainers.image.title="DPsim" \
org.opencontainers.image.licenses="MPL 2.0" \
org.opencontainers.image.url="http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source="https://github.com/sogno-platform/dpsim"

RUN dnf -y update && \
dnf install -y epel-release dnf-plugins-core && \
Expand Down Expand Up @@ -54,6 +54,7 @@ RUN dnf -y install \
openssl-devel \
libuuid-devel \
libconfig-devel \
libwebsockets-devel \
libnl3-devel \
libcurl-devel \
jansson-devel \
Expand All @@ -79,18 +80,6 @@ RUN git clone --branch 3.0 --recurse-submodules --depth 1 https://git.rwth-aache
ENV PATH="$PWD/cricket/bin:${PATH}"
ENV LD_LIBRARY_PATH="$PWD/cricket/bin:${LD_LIBRARY_PATH}"

# Install Libwebsockets from source because the repo variant is not suitable
RUN git clone --branch v4.3-stable --depth 1 https://libwebsockets.org/repo/libwebsockets && \
mkdir -p libwebsockets/build && \
pushd libwebsockets/build && \
cmake ${CMAKE_OPTS} .. \
-DLWS_WITH_IPV6=ON \
-DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_EXTENSIONS=OFF \
-DLWS_WITH_SERVER_STATUS=ON && \
make ${MAKE_OPTS} ${TARGET} && \
popd

# Profiling dependencies
RUN dnf -y install \
graphviz \
Expand Down
10 changes: 5 additions & 5 deletions packaging/Docker/Dockerfile.manylinux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
FROM quay.io/pypa/manylinux_2_28_x86_64

ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
ARG VILLAS_VERSION=c976cd62d8c6667a078be0785ca3e623a05f7456
ARG VILLAS_VERSION=5185c25ba7442c3e9264f4225f9a46829956732c

ARG CMAKE_OPTS
ARG MAKE_OPTS=-j4

ENV PLAT=manylinux_2_28_x86_64

LABEL \
org.opencontainers.image.title = "DPsim" \
org.opencontainers.image.licenses = "MPL 2.0" \
org.opencontainers.image.url = "http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source = "https://github.com/sogno-platform/dpsim"
org.opencontainers.image.title="DPsim" \
org.opencontainers.image.licenses="MPL 2.0" \
org.opencontainers.image.url="http://dpsim.fein-aachen.org/" \
org.opencontainers.image.source="https://github.com/sogno-platform/dpsim"

RUN dnf -y update
RUN yum install -y epel-release
Expand Down
Loading