Adapted to take averaged RTT values; Workers are no longer deactivated by local RM

parent d1176ee8
......@@ -4,7 +4,7 @@ FROM maven:3.6.1-jdk-8-alpine
WORKDIR /root
ADD ./src /root/nfrtool-comms/src
ADD ./pom.xml /root/nfrtool-comms/pom.xml
ADD ./files /root/nfrtool-comms/files
ADD ./files /root/files
ADD entrypoint.sh /entrypoint.sh
RUN apk add --no-cache --update tini && \
chmod +x /entrypoint.sh && \
......
......@@ -54,7 +54,7 @@ public class NFRTool {
// Node 1 definition:
// String ipWifi = "172.17.46.244";
//String ipWifi = "192.168.67.88";
String ipWifi = "192.168.67.81";
String ipWifi = "10.0.2.15";
String ipLte = "172.10.0.2";
//String ipEth = "192.168.137.17"; // TODO: check value
String ipEth = "10.0.2.15"; // TODO: check value
......
......@@ -205,7 +205,7 @@ public class ResourceManagerCommsTask extends ResourceManager implements MqttCal
private static class InterfaceInformationModel {
private @JsonProperty String ip;
private @JsonProperty String mac;
private @JsonProperty("rtt_ms") Map<String, Float> roundTripTime;
private @JsonProperty("rtt_avg") Map<String, Float> roundTripTime;
private @JsonProperty double rx_MB;
private @JsonProperty int rx_lost_packets;
private @JsonProperty int rx_packets;
......
......@@ -8,6 +8,8 @@ docker-compose -f model/dataclay/docker-compose.yml up -d
rm -rf ./app/stubs
docker run -it --rm --network dataclay_default -v $PWD/model/cfgfiles:/home/dataclayusr/dataclay/cfgfiles bscdataclay/client:2.5.dev WaitForDataClayToBeAlive 5 1
docker run -it --rm --network dataclay_default -v $PWD/model/cfgfiles:/home/dataclayusr/dataclay/cfgfiles bscdataclay/client:2.5.dev NewAccount ElasticUser ElasticPass
docker run -it --rm --network dataclay_default -v $PWD/model/cfgfiles:/home/dataclayusr/dataclay/cfgfiles bscdataclay/client:2.5.dev NewDataContract ElasticUser ElasticPass ElasticDS ElasticUser
......@@ -18,5 +20,6 @@ docker run -it --rm --network dataclay_default -v $PWD/model/cfgfiles:/home/data
cd ./app/stubs && \
jar cf stubs.jar es/bsc/compss/nfr/model && \
mvn install:install-file -Dfile=stubs.jar -DgroupId=es.bsc.compss -DartifactId=nfrtool-dataclay-stubs -Dversion=2.0 -Dpackaging=jar -DcreateChecksum=true && \
su jjvmelastic -c "mvn install:install-file -Dfile=stubs.jar -DgroupId=es.bsc.compss -DartifactId=nfrtool-dataclay-stubs -Dversion=2.0 -Dpackaging=jar -DcreateChecksum=true" && \
chown -R jjvmelastic:jjvmelastic $PWD
cd -
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment