merging missing Ochre.command functionality in helics_goss_bridge.py

.github/workflows/main.yml

@@ -0,0 +1,124 @@
+on: 
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Build with Gradle
+        run: ./gradlew export
+
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          name: gridappsd-artifact
+#          path: gov.pnnl.goss.gridappsd/generated/distributions/executable/run.bnd.jar
+#
+#  push:
+#    runs-on: ubuntu-latest
+#    name: Build and push the docker container
+#    needs: build
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - uses: actions/download-artifact@v2
+#        with:
+#          name: gridappsd-artifact
+
+      - name: Checking environment
+        env:
+          DOCKER_IMAGE_NAME: ${{ secrets.DOCKER_IMAGE_NAME }}
+        run: |
+          if [ "x${{ env.DOCKER_IMAGE_NAME }}" == "x" ]; then
+            echo "Error: missing DOCKER_IMAGE_NAME"
+            exit 1
+          fi
+
+      - name: Log in to docker
+        run: |
+          if [ -n "${{ secrets.DOCKER_USERNAME }}" -a -n "${{ secrets.DOCKER_TOKEN }}" ]; then
+
+            echo " "
+            echo "Connecting to docker"
+            echo "${{ secrets.DOCKER_TOKEN }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+            status=$?
+            if [ $status -ne 0 ]; then
+              echo "Error: status $status"
+              exit 1
+            fi
+          fi
+
+      - name: Build the image
+        env:
+          DOCKER_IMAGE_NAME: ${{ secrets.DOCKER_IMAGE_NAME }}
+        if: env.DOCKER_IMAGE_NAME != null
+        run: |
+          TAG="${GITHUB_REF#refs/heads/}"
+          TAG="${TAG#refs/tags/}"
+          TAG="${TAG//\//_}"
+          ORG=`echo "${{ secrets.DOCKER_PROJECT }}" | tr '[:upper:]' '[:lower:]'`
+          ORG="${ORG:-gridappsd}"
+          ORG="${ORG:+${ORG}/}"
+          IMAGE="${ORG}${{ env.DOCKER_IMAGE_NAME }}"
+          TIMESTAMP=`date +'%y%m%d%H'`
+          GITHASH=`git log -1 --pretty=format:"%h"`
+          BUILD_VERSION="${TIMESTAMP}_${GITHASH}${BRANCH:+:$TAG}"
+          echo "BUILD_VERSION $BUILD_VERSION"
+          echo "TAG ${IMAGE}:${TIMESTAMP}_${GITHASH}"
+          docker build --build-arg VERSION="${TAG}" --build-arg TIMESTAMP="${BUILD_VERSION}" -t ${IMAGE}:${TIMESTAMP}_${GITHASH} .
+          status=$?
+          if [ $status -ne 0 ]; then
+            echo "Error: status $status"
+            exit 1
+          fi
+
+      - name: Push the image
+        env:
+          DOCKER_IMAGE_NAME: ${{ secrets.DOCKER_IMAGE_NAME }}
+        if: env.DOCKER_IMAGE_NAME != null
+        run: |
+          TAG="${GITHUB_REF#refs/heads/}"
+          TAG="${TAG#refs/tags/}"
+          TAG="${TAG//\//_}"
+          ORG=`echo "${{ secrets.DOCKER_PROJECT }}" | tr '[:upper:]' '[:lower:]'`
+          ORG="${ORG:-gridappsd}"
+          ORG="${ORG:+${ORG}/}"
+          IMAGE="${ORG}${{ env.DOCKER_IMAGE_NAME }}"
+          if [ -n "${{ secrets.DOCKER_USERNAME }}" -a -n "${{ secrets.DOCKER_TOKEN }}" ]; then
+
+            if [ -n "$TAG" -a -n "$ORG" ]; then
+              # Get the built container name
+              CONTAINER=`docker images --format "{{.Repository}}:{{.Tag}}" ${IMAGE}`
+
+              echo "docker push ${CONTAINER}"
+              docker push "${CONTAINER}"
+              status=$?
+              if [ $status -ne 0 ]; then
+                echo "Error: status $status"
+                exit 1
+              fi
+
+              echo "docker tag ${CONTAINER} ${IMAGE}:$TAG"
+              docker tag ${CONTAINER} ${IMAGE}:$TAG
+              status=$?
+              if [ $status -ne 0 ]; then
+                echo "Error: status $status"
+                exit 1
+              fi
+
+              echo "docker push ${IMAGE}:$TAG"
+              docker push ${IMAGE}:$TAG
+              status=$?
+              if [ $status -ne 0 ]; then
+                echo "Error: status $status"
+                exit 1
+              fi
+            fi
+
+          fi

.travis.yml

@@ -25,8 +25,8 @@ services:
 # prepare the machine before any code
 # installation scripts
 before_install:
-  - './.travis/main.sh'
+#  - './.travis/main.sh'
 
 script:
-  - './gradlew export'
-  - './.travis/build-docker.sh'
+#  - './gradlew export'
+#  - './.travis/build-docker.sh'

Dockerfile

@@ -1,53 +1,94 @@
-ARG GRIDAPPSD_BASE_VERSION=:master
+ARG GRIDAPPSD_BASE_VERSION=:develop
 FROM gridappsd/gridappsd_base${GRIDAPPSD_BASE_VERSION}
 
 ARG TIMESTAMP
 
-# Get the gridappsd-python from the proper repository
-RUN cd ${TEMP_DIR} \
-  && git clone https://github.com/GRIDAPPSD/gridappsd-python -b develop \
-  && cd gridappsd-python \
-  && pip3 install -r requirements.txt \
-  && pip3 install . \
-  && rm -rf /root/.cache/pip/wheels
-
 # Get the gridappsd-sensor-simulator from the proper repository
-RUN cd ${TEMP_DIR} \
+RUN if [ ! -d ${TEMP_DIR} ]; then mkdir ${TEMP_DIR}; fi \
+  && cd ${TEMP_DIR} \
   && git clone https://github.com/GRIDAPPSD/gridappsd-sensor-simulator -b develop  \
   && cd gridappsd-sensor-simulator \
   && pip3 install -r requirements.txt \
   && mkdir -p /gridappsd/services/gridappsd-sensor-simulator \
   && rm .git -rf \ 
   && cp -r * /gridappsd/services/gridappsd-sensor-simulator \
   && cp /gridappsd/services/gridappsd-sensor-simulator/sensor_simulator.config /gridappsd/services/ \
-  && rm -rf /root/.cache/pip/wheels
+  && rm -rf /root/.cache/pip/wheels \
+  && cd \ 
+  && rm -rf ${TEMP_DIR}
 
 # Get the gridappsd-voltage-violation from the proper repository
-RUN cd ${TEMP_DIR} \
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
   && git clone https://github.com/GRIDAPPSD/gridappsd-voltage-violation -b develop \
   && cd gridappsd-voltage-violation \
   && mkdir -p /gridappsd/services/gridappsd-voltage-violation \
   && rm .git -rf \ 
   && cp -r * /gridappsd/services/gridappsd-voltage-violation \
-  && cp /gridappsd/services/gridappsd-voltage-violation/voltage-violation.config /gridappsd/services/ 
+  && cp /gridappsd/services/gridappsd-voltage-violation/voltage-violation.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
 
 # Get the gridappsd-dnp3 from the proper repository
-RUN cd ${TEMP_DIR} \
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
   && git clone https://github.com/GRIDAPPSD/gridappsd-dnp3 -b develop \
   && cd gridappsd-dnp3 \
   && mkdir -p /gridappsd/services/gridappsd-dnp3 \
   && rm .git -rf \ 
   && cp -r dnp3/* /gridappsd/services/gridappsd-dnp3 \
-  && cp /gridappsd/services/gridappsd-dnp3/dnp3.config /gridappsd/services/ 
+  && cp /gridappsd/services/gridappsd-dnp3/dnp3.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
 
 # Get the gridappsd-alarms from the proper repository
-RUN cd ${TEMP_DIR} \
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
   && git clone https://github.com/GRIDAPPSD/gridappsd-alarms -b develop \
   && cd gridappsd-alarms \
   && mkdir -p /gridappsd/services/gridappsd-alarms \
   && rm .git -rf \ 
   && cp -r * /gridappsd/services/gridappsd-alarms \
-  && cp /gridappsd/services/gridappsd-alarms/gridappsd-alarms.config /gridappsd/services/ 
+  && cp /gridappsd/services/gridappsd-alarms/gridappsd-alarms.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
+
+# Get the topology-processor from the proper repository
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
+  && git clone https://github.com/GRIDAPPSD/topology-processor -b main gridappsd-topology-background-service\
+  && cd gridappsd-topology-background-service/ \
+  && mkdir -p /gridappsd/services/gridappsd-topology-background-service \
+  && rm .git -rf \ 
+  && cp -r * /gridappsd/services/gridappsd-topology-background-service \
+  && cp /gridappsd/services/gridappsd-topology-background-service/topo_background.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
+
+# Get the gridappsd-toolbox from the proper repository
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
+  && git clone https://github.com/GRIDAPPSD/gridappsd-toolbox -b main \
+  && cd gridappsd-toolbox \
+  && mkdir -p /gridappsd/services/gridappsd-toolbox \
+  && rm .git -rf \ 
+  && cp -r * /gridappsd/services/gridappsd-toolbox \
+  && cp /gridappsd/services/gridappsd-toolbox/static-ybus/gridappsd-static-ybus-service.config /gridappsd/services/ \
+  && cp /gridappsd/services/gridappsd-toolbox/dynamic-ybus/gridappsd-dynamic-ybus-service.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
+
+# Get the gridapspd-distributed-ybus-service from the proper repository
+RUN mkdir ${TEMP_DIR} \
+  && cd ${TEMP_DIR} \
+  && git clone https://github.com/GRIDAPPSD/gridappsd-distributed-static-ybus-service.git -b main \
+  && cd gridappsd-distributed-static-ybus-service \
+  && mkdir -p /gridappsd/services/gridappsd-distributed-static-ybus-service \
+  && rm .git -rf \ 
+  && cp -r * /gridappsd/services/gridappsd-distributed-static-ybus-service \
+  && cp /gridappsd/services/gridappsd-distributed-static-ybus-service/gridappsd-distributed-static-ybus-service.config /gridappsd/services/ \
+  && cd \
+  && rm -rf ${TEMP_DIR}
 
 # Copy initial applications and services into the container.
 # 
@@ -81,7 +122,7 @@ RUN chmod +x /usr/local/bin/opendsscmd && \
 # before executing this script.
 COPY ./gov.pnnl.goss.gridappsd/generated/distributions/executable/run.bnd.jar /gridappsd/lib/run.bnd.jar
 
-RUN pip install -r /gridappsd/requirements.txt && \
+RUN pip install --pre -r /gridappsd/requirements.txt && \
   pip install -r /gridappsd/services/fncsgossbridge/requirements.txt && \
   rm -rf /root/.cache/pip/wheels
 

build-docker.sh

@@ -5,4 +5,4 @@ rm -rf gov.pnnl.goss/gridappsd/generated
 
 #copy built jar to docker
 echo "copying run.bnd.jar into container"
-docker cp gov.pnnl.goss.gridappsd/generated/distributions/executable/run.bnd.jar gridappsddocker_gridappsd_1:/gridappsd/lib/run.bnd.jar
+docker cp gov.pnnl.goss.gridappsd/generated/distributions/executable/run.bnd.jar gridappsd:/gridappsd/lib/run.bnd.jar

build-gridappsd-container

@@ -1,7 +1,67 @@
-docker pull gridappsd/gridappsd_base:master
+#!/usr/bin/env python3
 
-./gradlew clean
-rm -rf gov.pnnl.goss/gridappsd/generated
-./gradlew export
+"""
+Script for building the gridappsd container.
 
-docker build --no-cache --network=host -t gridappsd:local .
+This script pulls the gridappsd_base docker image, cleans the project, exports the project, and builds the gridappsd container.
+
+Usage:
+    python build-gridappsd-container <base_version> [--output_version <output_version>]
+
+Arguments:
+    base_version (str): The version of the gridappsd_base docker image.
+    output_version (str, optional): The output tag version for local development. Default is "local".
+
+Example:
+    python build-gridappsd-container.py 2.3.0 --output_version 2.3.1
+
+"""
+
+import argparse
+import subprocess
+import shutil
+
+
+def execute(cmd: str | list[str]):
+    """
+    Executes a command in the shell and prints the output.
+
+    Args:
+        cmd (str | list[str]): The command to execute. If a string, it will be split into a list of arguments.
+
+    Raises:
+        subprocess.CalledProcessError: If the command returns a non-zero exit code.
+
+    """
+    if isinstance(cmd, str):
+        cmd = cmd.split(" ")
+
+    with subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) as p:
+        for line in iter(p.stdout.readline, ""):
+            if line.strip():
+                print(line.strip())
+
+    p.wait()
+    if p.returncode:
+        raise subprocess.CalledProcessError(p.returncode, cmd=" ".join(cmd))
+
+
+
+if __name__ == '__main__':
+
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument("base_version",
+                        help="The gridappsd_base docker image version")
+    parser.add_argument("--output_version", default="local",
+                        help="The output tag version for local development")
+
+    opts = parser.parse_args()
+
+    base_version = opts.base_version
+
+    execute(f"docker pull gridappsd/gridappsd_base:{opts.base_version}")
+    execute("./gradlew clean")
+    shutil.rmtree("gov.pnnl.goss/gridappsd/generated", ignore_errors=True)
+    execute("./gradlew export")
+    execute(f"docker build --build-arg GRIDAPPSD_BASE_VERSION=:{opts.base_version} --no-cache --network=host -t gridappsd:{opts.output_version} .")

entrypoint.sh

@@ -11,9 +11,14 @@ if [ "$1" = "gridappsd" ]; then
     sudo pip install -q --disable-pip-version-check -r $reqfile
   done
 
-  # Run tail -f /dev/null to keep the container running and waiting for connection
-  echo "[Entrypoint] Waiting for connection"
-  tail -f /dev/null
+
+  if [ "${AUTOSTART:-0}" != "0" ]; then
+    /gridappsd/run-gridappsd.sh
+  else
+    # Run tail -f /dev/null to keep the container running and waiting for connection
+    echo "[Entrypoint] Waiting for connection"
+     tail -f /dev/null
+  fi
 elif [ "$1" = "version" -o "$1" = "-v" -o "$1" = "--version" ]; then
   echo -n "version: "
   cat /gridappsd/dockerbuildversion.txt

gov.pnnl.goss.gridappsd/bnd.bnd

@@ -29,13 +29,18 @@
 	osgi.enroute.base.api,\
 	org.mockito.mockito-all,\
 	httpcore,\
-	cimhub.lib;version=0.2.4,\
+	cimhub.lib;version=2.0.3,\
 	httpclient,\
 	com.bigdata.rdf,\
-    proven-client;version=0.3,\
-    proven-message;version=0.4,\
-	com.nimbusds.nimbus-jose-jwt-dependencies
-
+	org.glassfish.jersey.core.jersey-client;version=2.26,\
+	org.glassfish.jersey.core.jersey-common;version=2.26,\
+	org.glassfish.jersey.media.jersey-media-json-jackson;version=2.26.0,\
+	proven-client;version=0.2.5,\
+	proven-message;version=0.5,\
+	com.nimbusds.nimbus-jose-jwt-dependencies,\
+	org.apache.servicemix.bundles.poi;version=3.17,\
+	org.apache.commons.commons-collections4;version=4.4
+
 -plugin org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug
 
 -sub: *.bnd

gov.pnnl.goss.gridappsd/conf/org.ops4j.pax.logging.cfg

@@ -28,3 +28,5 @@ log4j.additivity.org.apache.activemq = false
 log4j.logger.org.apache.http = WARN, file
 log4j.additivity.org.apache.http = false
 
+log4j.category.pnnl.goss.core.security = WARN, file
+