Issue617 refactor service with history 2

.env

@@ -1,3 +1,34 @@
-TESTCASE='testcase2'
-
-APP_PATH='/home/user'
+# Performance configuration
+NODE_ENV=production
+BOPTEST_TIMEOUT=900
+BOPTEST_LOGLEVEL=INFO
+
+# Redis configuration
+BOPTEST_REDIS_HOST=redis
+
+# Job queue configuration
+BOPTEST_JOB_QUEUE_URL=http://goaws:4100/queue/local-queue1
+AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxxxxxxx
+AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+MINIO_ROOT_USER=user
+MINIO_ROOT_PASSWORD=password
+
+# Object store (S3) related configuration
+BOPTEST_INTERNAL_S3_URL=http://minio:9000
+BOPTEST_PUBLIC_S3_URL=http://minio:9000
+BOPTEST_S3_BUCKET=boptest
+BOPTEST_REGION=us-west-1
+
+# Provisioning and test configuration
+BOPTEST_SERVER=http://web
+BOPTEST_WS_SERVER=ws://web/ws
+
+BOPTEST_DASHBOARD_SERVER=https://dashboard.boptest.net/
+
+# Testing configuration
+# These fake test accounts will be used in place of BOPTEST_DASHBOARD_SERVER accounts
+BOPTEST_USE_TEST_USERS="true"
+BOPTEST_TEST_USERNAME="canary"
+BOPTEST_TEST_KEY="canarykey"
+BOPTEST_TEST_PRIVILEGED_USERNAME="crusader"
+BOPTEST_TEST_PRIVILEGED_KEY="crusaderkey"

.travis.yml

@@ -1,3 +1,5 @@
+dist: focal
+
 language: python
 
 branches:
@@ -13,20 +15,20 @@ notifications:
 services:
   - docker
 
-env:
-  - DOCKER_COMPOSE_VERSION=1.26.0
-
 before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+  - sudo systemctl stop docker.service && sudo systemctl stop docker.socket
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - yes | sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - sudo systemctl start docker
 
 before_script:
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
 
 jobs:
   include:
+  - script: docker compose up -d web worker provision && sleep 10 && docker compose up test --no-deps --exit-code-from test
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
     script: cd testing && make build_jm_image && make test_parser

bacnet/BopTestProxy.py

@@ -50,7 +50,7 @@
 nextState = None
 g = None
 
-baseurl = "http://localhost:5000"
+baseurl = "http://127.0.0.1:80"
 boptest_measurements = None
 boptest_inputs = None
 
@@ -140,7 +140,7 @@ def update_boptest_data():
     """Read the current simulation data from the API and set the object values."""
     if _debug:
         update_boptest_data._debug("update_boptest_data")
-    global objects, inputs, baseurl
+    global objects, inputs, baseurl, testid
 
     # ask the web service
     # We get results direct from /advance now but you could ask the simulation for historic data
@@ -180,11 +180,7 @@ def update_boptest_data():
 
 
     #print("Advancing with signals: " + str(signals))
-    response = requests.post(
-    #    "http://localhost:5000/advance", json={"oveAct_u": next_oveAct_u, "oveAct_activate": next_oveAct_activate}
-        '{0}/advance'.format(baseurl), json=signals
-
-    )
+    response = requests.post('{0}/advance/{1}'.format(baseurl,testid), json=signals)
     if response.status_code != 200:
         print("Error response: %r" % (response.status_code,))
         return
@@ -228,9 +224,10 @@ def main():
 
     parser = ConfigArgumentParser(description=__doc__)
 
+    parser.add_argument('testcase', type=str, help="Name of BOPTEST test case to deploy")
     parser.add_argument('start_time', type=int, default=0, help="timestamp (in seconds) at which to start the simulation")
     parser.add_argument('warmup_period', type=int, default=0, help="timestamp (in seconds) at which to start the simulation")
-    parser.add_argument('--baseurl', dest='baseurl', type=str, default='http://localhost:5000', help="URL for BOPTest endpoint")
+    parser.add_argument('--baseurl', dest='baseurl', type=str, default='http://127.0.0.1:80', help="URL for BOPTest endpoint")
     # parse the command line arguments
     args = parser.parse_args()
     baseurl = args.baseurl
@@ -243,28 +240,31 @@ def main():
     # TODO: check the results to make sure we acutally get an OK!
     #
     global nextState
+    global testid
 
-    res = requests.put('{0}/initialize'.format(baseurl), json={'start_time':args.start_time, 'warmup_period':args.warmup_period} ).json()
+    testid = requests.post("{0}/testcases/{1}/select".format(baseurl, args.testcase)).json()["testid"]
+    res = requests.put('{0}/initialize/{1}'.format(baseurl,testid), json={'start_time':args.start_time, 'warmup_period':args.warmup_period} ).json()
     nextState = res
 
     global boptest_measurements, boptest_inputs
-    boptest_measurements = requests.get(baseurl + "/measurements").json()
-    boptest_inputs = requests.get(baseurl+"/inputs").json()
+    boptest_measurements = requests.get('{0}/measurements/{1}'.format(baseurl,testid)).json()
+    boptest_inputs = requests.get('{0}/inputs/{1}'.format(baseurl,testid)).json()
 
     # We advance the simulation by 5 seconds at each call to /advance, and APPINTERVAL is also 5 seconds, so the simulationo
     # moves in sync with wallclock time. To see things happen faster, set this time greater than 5 seconds
-    res = requests.put('{0}/step'.format(baseurl), json={'step':5})
+    res = requests.put('{0}/step/{1}'.format(baseurl,testid), json={'step':5})
 
     # make a device object
     this_device = LocalDeviceObject(ini=args.ini)
+    print(args.ini)
     if _debug:
         _log.debug("    - this_device: %r", this_device)
 
     # make a sample application
     this_application = ReadPropertyMultipleApplication(this_device, args.ini.address)
 
     # create the objects and add them to the application
-    test_case_name = requests.get('{0}/name'.format(baseurl)).json()['payload']['name']
+    test_case_name = requests.get('{0}/name/{1}'.format(baseurl,testid)).json()['payload']['name']
     file_name = '../testcases/{0}/models/bacnet.ttl'.format(test_case_name)
     create_objects(this_application, file_name)
 
@@ -276,6 +276,12 @@ def main():
 
     run()
 
+    # shutdown test case when done
+    res = requests.put("{0}/stop/{1}".format(baseurl, testid))
+    if res.status_code == 200:
+        _log.debug('Done shutting down test case.')
+    else:
+        _log.debug('Error shutting down test case.')
     if _debug:
         _log.debug("fini")
 

bacnet/README.md

@@ -24,7 +24,7 @@ The BACnet objects are configured based on a .ttl file for each test case locate
 
 2. Configure ``BACpypes.ini``, particularly the address to define where the BACnet device will sit on the network.
 
-3. In a new terminal, run ``$ python BopTestProxy.py 0 0`` to deploy the BACnet device and objects for the test case and initialize the test case with start time of 0 and warmup period of 0.
+3. In a new terminal, run ``$ python BopTestProxy.py bestest_air 0 0`` to deploy the BACnet device and objects for the test case ``bestest_air`` (or choose another) and initialize it with start time of 0 and warmup period of 0.
 
 4. Use a BACnet application to locate the device and objects on the network and communicate with them.
 

docker-compose.yml

@@ -1,25 +1,111 @@
-version: "3.7"
-
-services:
-  boptest:
-    image: boptest_base
-    build:
-      context: .
-    volumes:
-      - ./testcases/${TESTCASE}/models/wrapped.fmu:${APP_PATH}/models/wrapped.fmu
-      - ./testcases/${TESTCASE}/doc/:${APP_PATH}/doc/
-      - ./restapi.py:${APP_PATH}/restapi.py
-      - ./testcase.py:${APP_PATH}/testcase.py
-      - ./version.txt:${APP_PATH}/version.txt
-      - ./data:${APP_PATH}/data/
-      - ./forecast:${APP_PATH}/forecast/
-      - ./kpis:${APP_PATH}/kpis/
-    ports:
-      - 127.0.0.1:5000:5000
-    networks:
-      - boptest-net
-
-networks:
-  boptest-net:
-    name: boptest-net
-    attachable: true
+services:
+  # A service to provision needed resources during development
+  # The main task is to upload test cases
+  # This is not a production container,
+  # but the "boptest_submit" python module that is executed
+  # by this service may be useful in provisioning a production environment
+  provision:
+    build: service/provision
+    depends_on:
+      - web
+    environment:
+      - BOPTEST_SERVER
+      - BOPTEST_DASHBOARD_SERVER
+      - BOPTEST_DASHBOARD_API_KEY=${BOPTEST_TEST_PRIVILEGED_KEY}
+    volumes:
+      - ./:/usr/src/boptest
+  web: # main boptest application
+    build:
+      dockerfile: service/web/Dockerfile
+      context: .
+      args:
+        - NODE_ENV
+    ports:
+      - "80:80"
+    environment:
+      - NODE_ENV
+      - BOPTEST_JOB_QUEUE_URL
+      - BOPTEST_INTERNAL_S3_URL
+      - BOPTEST_PUBLIC_S3_URL
+      - BOPTEST_S3_BUCKET
+      - BOPTEST_REDIS_HOST
+      - BOPTEST_REGION
+      - BOPTEST_TIMEOUT
+      - BOPTEST_MESSAGE_TIMEOUT
+      - BOPTEST_DASHBOARD_SERVER
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - BOPTEST_USE_TEST_USERS # If "true" the following user accounts will be used for testing
+      - BOPTEST_TEST_USERNAME # Only for testing
+      - BOPTEST_TEST_KEY # Only for testing
+      - BOPTEST_TEST_PRIVILEGED_USERNAME # Only for testing
+      - BOPTEST_TEST_PRIVILEGED_KEY # Only for testing
+    depends_on:
+      - redis
+      - worker
+      - mc
+  # Local implementation of s3
+  minio:
+    image: minio/minio
+    entrypoint:
+      - minio
+      - server
+      - /data
+      - --console-address
+      - ":9001"
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    environment:
+      - MINIO_ROOT_USER=${MINIO_ROOT_USER}
+      - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
+  mc:
+    image: minio/mc
+    entrypoint: >
+      /bin/sh -c "
+      sleep 5;
+      /usr/bin/mc config host add myminio http://minio:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD};
+      /usr/bin/mc mb myminio/boptest;
+      /usr/bin/mc anonymous set public myminio/boptest;
+      /usr/bin/mc anonymous set download myminio/boptest/testcases;
+      /usr/bin/mc anonymous set download myminio/boptest/tests;
+      /usr/bin/mc admin user svcacct add --access-key ${AWS_ACCESS_KEY_ID} --secret-key ${AWS_SECRET_ACCESS_KEY} myminio ${MINIO_ROOT_USER};
+      "
+    depends_on:
+      - minio
+  worker:
+    build:
+      dockerfile: service/worker/Dockerfile
+      context: .
+    environment:
+      - BOPTEST_JOB_QUEUE_URL
+      - BOPTEST_LOGLEVEL
+      - BOPTEST_INTERNAL_S3_URL
+      - BOPTEST_S3_BUCKET
+      - BOPTEST_REDIS_HOST
+      - BOPTEST_REGION
+      - BOPTEST_DASHBOARD_SERVER
+      - BOPTEST_DASHBOARD_API_KEY
+      - BOPTEST_TIMEOUT
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+    depends_on:
+      - redis
+      - mc
+  redis:
+    image: redis
+  test:
+    build:
+      dockerfile: service/test/Dockerfile
+      context: .
+    depends_on:
+      - web
+    environment:
+      - BOPTEST_SERVER
+      - BOPTEST_DASHBOARD_API_KEY
+      - BOPTEST_DASHBOARD_USERNAME
+      - BOPTEST_TEST_USERNAME
+      - BOPTEST_TEST_KEY
+      - BOPTEST_TEST_PRIVILEGED_USERNAME
+      - BOPTEST_TEST_PRIVILEGED_KEY
+      - BOPTEST_USE_TEST_USERS

examples/julia/makefile

@@ -9,7 +9,7 @@ COMMAND_RUN=docker run \
  	  ${IMG_NAME} /bin/bash
 
 build:
-	docker build --build-arg testcase=${Script} --no-cache --rm -t ${IMG_NAME} .
+	docker build --quiet --build-arg testcase=${Script} --no-cache --rm -t ${IMG_NAME} .
 
 remove-image:
 	docker rmi ${IMG_NAME}