Improve tests

docker-compose-test.yml

@@ -18,7 +18,7 @@ services:
       POSTGRES_PASSWORD: '${AERIE_PASSWORD}'
       POSTGRES_PORT: 5432
       POSTGRES_USER: '${AERIE_USERNAME}'
-    image: 'ghcr.io/nasa-ammos/aerie-gateway:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-gateway:v1.7.0'
     ports: ['9000:9000']
     restart: always
     volumes:
@@ -40,7 +40,7 @@ services:
         -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO
         -Dorg.slf4j.simpleLogger.logFile=System.err
       UNTRUE_PLAN_START: '2000-01-01T11:58:55.816Z'
-    image: 'ghcr.io/nasa-ammos/aerie-merlin:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-merlin:v1.7.0'
     ports: ['27183:27183']
     restart: always
     volumes:
@@ -60,7 +60,7 @@ services:
         -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO
         -Dorg.slf4j.simpleLogger.logFile=System.err
       UNTRUE_PLAN_START: '2000-01-01T11:58:55.816Z'
-    image: 'ghcr.io/nasa-ammos/aerie-merlin-worker:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-merlin-worker:v1.7.0'
     ports: ['27187:8080']
     restart: always
     volumes:
@@ -81,7 +81,7 @@ services:
         -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG
         -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO
         -Dorg.slf4j.simpleLogger.logFile=System.err
-    image: 'ghcr.io/nasa-ammos/aerie-scheduler:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-scheduler:v1.7.0'
     ports: ['27185:27185']
     restart: always
     volumes:
@@ -103,7 +103,7 @@ services:
       JAVA_OPTS: >
         -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO
         -Dorg.slf4j.simpleLogger.logFile=System.err
-    image: 'ghcr.io/nasa-ammos/aerie-scheduler-worker:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-scheduler-worker:v1.7.0'
     ports: ['27189:8080']
     restart: always
     volumes:
@@ -123,7 +123,7 @@ services:
       SEQUENCING_DB_USER: '${AERIE_USERNAME}'
       SEQUENCING_LOCAL_STORE: /usr/src/app/sequencing_file_store
       SEQUENCING_SERVER_PORT: 27184
-    image: 'ghcr.io/nasa-ammos/aerie-sequencing:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-sequencing:v1.7.0'
     ports: ['27184:27184']
     restart: always
     volumes:
@@ -147,7 +147,7 @@ services:
       HASURA_GRAPHQL_LOG_LEVEL: info
       HASURA_GRAPHQL_METADATA_DATABASE_URL: 'postgres://${AERIE_USERNAME}:${AERIE_PASSWORD}@postgres:5432/aerie_hasura'
       HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata
-    image: 'ghcr.io/nasa-ammos/aerie-hasura:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-hasura:v1.7.0'
     ports: ['8080:8080']
     restart: always
   postgres:
@@ -158,7 +158,7 @@ services:
       POSTGRES_DB: postgres
       POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
       POSTGRES_USER: '${POSTGRES_USER}'
-    image: 'ghcr.io/nasa-ammos/aerie-postgres:v1.6.2'
+    image: 'ghcr.io/nasa-ammos/aerie-postgres:v1.7.0'
     ports: ['5432:5432']
     restart: always
     volumes:

tests/integration_tests/README.md

@@ -0,0 +1,32 @@
+# Test against an active instance of Aerie
+
+## WARNING
+These tests will delete and modify data permanently. Expect the localhost instance of Aerie to be modified heavily. These test will delete all models.
+
+See: [localhost configuration](files/configuration/localhost_config.json)
+
+## Tests
+
+### [Configurations test](test_configurations.py)
+- Configuration initialization is in conftest.py to ensure all tests use localhost
+- These tests will end with the localhost configuration active
+- Test all `configurations` commands
+
+### [Models test](test_models.py)
+- Test all `models` commands
+
+### [Plans test](test_plans.py)
+- Test all `plans` commands
+- Tests simulations and `plans download...` commands as well
+
+### [Scheduling test](test_scheduling.py)
+- Test all `scheduling` commands
+
+### [Expansion test](test_expansion.py)
+- Test all `expansion` commands
+
+### [Metadata test](test_metadata.py)
+- Test all `metadata` commands
+
+### [Constraints test](test_constraints.py)
+- Test all `constraints` commands

tests/integration_tests/conftest.py

@@ -0,0 +1,57 @@
+# Configure persistent session and configuration
+# Note that we're setting global variables here rather than using pytest.VARIABLE
+# The scope is global either way, but this allows for easier debugging, type hints, and autofill
+import os
+import sys
+
+from aerie_cli.aerie_client import AerieClient
+from aerie_cli.aerie_host import AerieHostSession, AuthMethod
+from aerie_cli.commands.configurations import delete_all_persistent_files, upload_configurations, deactivate_session, activate_session
+from aerie_cli.utils.sessions import get_active_session_client
+
+# in case src_path is not from aeri-cli src and from site-packages
+src_path = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../src")
+sys.path.insert(0, src_path)
+
+GRAPHQL_URL = "http://localhost:8080/v1/graphql"
+GATEWAY_URL = "http://localhost:9000"
+AUTH_URL = "http://localhost:9000/auth/login"
+AUTH_METHOD = AuthMethod.AERIE_NATIVE
+USERNAME = "a"
+PASSWORD = "a"
+# This should only ever be set to the admin secret for a local instance of aerie
+HASURA_ADMIN_SECRET = os.environ.get("HASURA_GRAPHQL_ADMIN_SECRET")
+
+session = AerieHostSession.session_helper(
+    AUTH_METHOD,
+    GRAPHQL_URL,
+    GATEWAY_URL,
+    AUTH_URL,
+    USERNAME,
+    PASSWORD
+)
+session.session.headers["x-hasura-admin-secret"] = HASURA_ADMIN_SECRET
+client = AerieClient(session)
+
+DOWNLOADED_FILE_NAME = "downloaded_file.test"
+
+TEST_DIR = os.path.dirname(os.path.abspath(__file__))
+
+FILES_PATH = os.path.join(TEST_DIR, "files")
+
+# Configuration Variables
+CONFIGURATIONS_PATH = os.path.join(FILES_PATH, "configuration")
+CONFIGURATION_PATH = os.path.join(CONFIGURATIONS_PATH, "localhost_config.json")
+
+# Resets the configurations and adds localhost
+deactivate_session()
+delete_all_persistent_files()
+upload_configurations(CONFIGURATION_PATH)
+activate_session("localhost")
+persisent_client = None
+try:
+    persisent_client = get_active_session_client()
+except:
+    raise RuntimeError("Configuration is not active!")
+assert persisent_client.host_session.gateway_url == GATEWAY_URL,\
+    "Aerie instances are mismatched. Ensure test URLs are the same."

tests/integration_tests/files/constraints/constraint.ts

@@ -0,0 +1,3 @@
+export default (): Constraint => {
+
+}

tests/integration_tests/files/goals/goal1.ts

@@ -0,0 +1,3 @@
+export default (): Goal => {
+
+}

tests/integration_tests/files/metadata_schemas/metadata_schema.json

@@ -0,0 +1,6 @@
+{
+    "schemas": [
+      { "key": "STRING_EXAMPLE", "schema": { "type": "string" } },
+      { "key": "LONG_STRING_EXAMPLE", "schema": { "type": "long_string" } }
+    ]
+  }

tests/integration_tests/files/plans/create_config.json

@@ -1,4 +1,10 @@
 {
-    "foo": "arg1",
-    "num": 5
+    "initialPlantCount": 2,
+    "initialProducer": "nobody",
+    "initialDataPath": "/etc/os-release",
+    "initialConditions": {
+            "flag": "A",
+            "fruit": 3,
+            "peel": 3
+        }
 }

tests/integration_tests/files/plans/update_config.json

@@ -1,4 +1,10 @@
 {
-    "foo": "arg2",
-    "num": 5
+    "initialPlantCount": 3,
+    "initialProducer": "somebody",
+    "initialDataPath": "/etc/os-release",
+    "initialConditions": {
+            "flag": "B",
+            "fruit": 2,
+            "peel": 2
+        }
 }