Merge remote-tracking branch 'origin/main' into 324-testing-ci

Author: DavidEdell

.env

@@ -39,10 +39,13 @@ DB_NAME=amp_core
 DB_HEALTHCHECK_USER=healthcheck
 DB_HEALTHCHECK_PASSWORD=healthcheck
 
+OPENSEARCH_INITIAL_ADMIN_PASSWORD=Bw1YckbI3jroOxVnaQHm
+
 GRAFANA_CONTAINER_PORT=3000
 GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
 GRAFANA_PROXIES_PATH=localhost/grafana
 GRAFANA_DB_NAME=grafana_internal_db
+GRAFANA_PASS=grafana
 
 REDIS_PORT=6379
 JS_AMP_PORT=3001
@@ -67,4 +70,3 @@ CTR_SOCKDIR=/var/tmp/nm
 
 ADM_PATH=deps/dtnma-adms
 
-GRAFANA_PASS=grafana

.gitignore

@@ -20,6 +20,7 @@ testresults.xml
 # local build files
 /anms-core/build/
 /anms-ui/release/
+docker-compose.override.yml
 
 # Javascript and ESLint related content to be ignored
 node_modules

README.md

@@ -52,7 +52,8 @@ If yes, do not rely on this README for operational guidance. Refer to the ANMS P
 
 **3. Are you a developer contributing to ANMS or setting up a development environment?**
 
-If yes, refer to both this Readme and the ANMS Wiki [Development Guide](https://github.com/NASA-AMMOS/anms/wiki/Development-Guide) for:
+If yes, refer to both this README and the ANMS Wiki [Development Guide](https://github.com/NASA-AMMOS/anms/wiki/Development-Guide) for:
+
 * Local development environment configuration
 * Testing workflows
 * Contribution guidelines
@@ -66,10 +67,10 @@ This section details prerequisites to installing the ANMS from source on a devel
 
 ### Software and OS Versions
 
-The setup of ANMS and demos listed in this README have been tested on macOS 11.6.4 (Big Sur), RHEL 9  and Ubuntu 20.04.
+The setup of ANMS and demos listed in this README have been tested on macOS 11.6.4 (Big Sur), RHEL 9 and Ubuntu 20.04.
 To run the ANMS tool, you must also install Docker Engine version 20.10.10 or newer or Podman 5.2.2+.  You will also need either Docker Compose version 1.29.2+ or podman-compose.  Docker and Podman can generally be used interchangeably. 
 
-**NOTE:** `docker-compose` can be used with `podman`, and `docker-compose` is generally recommended for improved reliability over `podman-compose`, with some platforms (e.g. Mac) failing to startup correctly with Podman.  In all cases, recent versions of the installed compose tool are invoked with `podman compose` or `docker compose` as appropriate. 
+**NOTE:** `docker-compose` can be used with `podman`, and `docker-compose` is generally recommended for improved reliability over `podman-compose`, with some platforms (e.g. Mac) failing to start up correctly with Podman.  In all cases, recent versions of the installed compose tool are invoked with `podman compose` or `docker compose` as appropriate. 
 
 The ANMS UI should work on all modern browsers.
 
@@ -112,7 +113,7 @@ docker stop $(docker ps -q); docker rm $(docker ps --all -q); docker system prun
 
 The quickstart script will configure, pull, and start the ANMS system for the first time.  See comments in the script for additional details, including optional ENV variables to override default behavior.
 
-NOTICE: By default, quick start will pull pre-built containers from the github registry (ghcr.io). To force a rebuild, run it as `FORCE_REBULD=y ./quickstart.sh`. See the script header for details.
+NOTICE: By default, quick start will pull pre-built containers from the github registry (ghcr.io). To force a rebuild, run it as `FORCE_REBUILD=y ./quickstart.sh`. See the script header for details.
 
 To stop the system, use `podman compose -f testenv-compose.yml -f docker-compose.yml down`.
 
@@ -121,7 +122,7 @@ To start the system in the future, use `podman compose -f testenv-compose.yml up
 ## Manual Startup
 Choose the appropriate docker, podman, or podman-compose commands in the directions below as appropriate for your system.
 
-- Edit `.env` file as appropriately
+- Edit `.env` file as appropriate.
   - Select appropriate profile(s) as desired. 
     - Core ANMS services are always started.
     - The 'full' profile starts up all UI and related services.
@@ -142,7 +143,7 @@ Choose the appropriate docker, podman, or podman-compose commands in the directi
   - `docker compose -f docker-compose.yml build`
   - `podman compose -f docker-compose.yml build`
   - `podman-compose --podman-build-args='--format docker' -f docker-compose.yml build`
-    - Note: The docker format argument here enables suppoort for HEALTHCHECK. If omitted, the system will run but will be unable to report the health of the system.  This flag does not appear necessary when using the no-dash version of compose.
+    - Note: The docker format argument here enables support for HEALTHCHECK. If omitted, the system will run but will be unable to report the health of the system.  This flag does not appear necessary when using the no-dash version of compose.
 - Build test environment images using one of the following:
   - `docker compose -f testenv-compose.yml build`
   - `podman compose -f testenv-compose.yml build`
@@ -193,7 +194,7 @@ point. With ANMS running, go to `localhost:8080` and log in to the database with
 
 ### ADM and Agent Updates
 
-Changes to ADMs are handled on the Manager by uploading a new version of the ADM via the Web UI.
+By default after building the system, ANMS starts with the ADMs defined in `deps/dtnma-adms` and ADMs added to `anms-core/extra_adms`. Changes to and adding new ADMs are handled on the Manager by uploading a new version of the ADM via the Web UI or the REST POST endpoint `http://localhost:5555/adms/`.
 The manager will then be able to use the new ADM.
 
 Changes to a test Agent are more complicated, and require auto-generated C sources built into the ION source tree.

anms-core/anms/init_adms.py

@@ -22,7 +22,6 @@
 # subcontract 1658085.
 #
 import asyncio
-from functools import cache
 from typing import List
 
 from fastapi import Depends, APIRouter
@@ -36,7 +35,6 @@
 from anms.models.relational import get_async_session
 from anms.models.relational.actual_parameter import ActualParameter
 from anms.models.relational.ari import ARI
-from anms.models.relational.adms.data_model_view import DataModel 
 from anms.models.relational.formal_parameter import FormalParameter
 
 

anms-core/anms/routes/ARIs/ari.py

@@ -126,71 +126,11 @@ async def remove_adm(enumeration: int, namespace:str):
             logger.debug(f"ADM ENUM:{enumeration} in NAMESPACE {namespace} not a known ADM")
             raise HTTPException(status_code = status.HTTP_400_BAD_REQUEST, detail = f"ADM ENUM:{enumeration} in NAMESPACE {namespace} not a known ADM")
 
-
-
-async def handle_adm(admset: ace.AdmSet, adm_file: ace.models.AdmModule, session, replace=True):
-    ''' Process a received and decoded ADM into the ANMS DB.
-
-    :param replace: If true and the ADM exists it will be checked and replaced.
-    :return: A list of issues with the ADM, which is empty if successful.
-    '''
-    logger.info("Adm name: %s", adm_file.norm_name)
-    data_model_view = await DataModel.get(adm_file.ns_model_enum,adm_file.ns_org_name )
-    if data_model_view:
-        if not replace:
-            logger.info('Not replacing existing ADM name %s', adm_file.norm_name)
-            return []
-        data_rec = None
-        async with get_async_session() as session:
-            data_rec,_ = await AdmData.get(data_model_view.data_model_id,session)
-
-        if data_rec:
-            # Compare old and new contents
-            logger.info("Checking existing ADM name %s", adm_file.norm_name)
-            old_adm = admset.load_from_data(io.BytesIO(data_rec.data), del_dupe=False)
-            comp = AdmCompare(admset)
-            if not comp.compare_adms(old_adm, adm_file):
-                issues = comp.get_errors()
-            else:
-                issues = [f"Updating existing adm is not allowed yet"]
-            return issues
-
-    logger.info("Inserting ADM name %s", adm_file.norm_name)
-
-    # Use CAmPython to generate sql
-    out_path = ""  # This is empty string since we don't need to write the generated sql to a file
-    sql_dialect = 'pgsql'
-    writer = create_sql.Writer(admset, adm_file, out_path, sql_dialect)
-    string_buffer = io.StringIO()
-    writer.write(string_buffer)
-
-    # execute generated Sql
-    queries = string_buffer.getvalue()
-    try:
-        await session.execute(queries)
-        await session.commit()
-    except Exception as err:
-        logger.error(f"{sql_dialect} execution error: {err.args}")
-        logger.debug('%s', traceback.format_exc())
-        raise
-
-    # Save the adm file of the new adm
-    
-
-    buf = io.StringIO()
-    ace.adm_yang.Encoder().encode(adm_file, buf)
-    ret_dm = await DataModel.get(adm_file.ns_model_enum,  adm_file.ns_org_name, session)
-    
-    # Write the encoded string data to the BytesIO object
-    bytes_io = io.BytesIO()
-    bytes_io.write(buf.getvalue().encode('utf-8'))
-    # Reset the pointer to the beginning
-    bytes_io.seek(0)
-    data = {"enumeration":ret_dm.data_model_id, "data": bytes_io.getvalue()}
-    await AdmData.add_data(data, session)
-
-    return []
-
+@router.post("/load_default", status_code=status.HTTP_201_CREATED)
+async def load_default_adm():
+    await TRANSMORGIFIER.load_default_adms()
+    response = JSONResponse(status_code=status.HTTP_200_OK, content={"message": "Initilized default ADMs", "error_details": ""})
+    return response
 
 @router.post("/", status_code=status.HTTP_201_CREATED,
              responses={400: {"model": RequestError}, 405: {"model": UpdateAdmError}, 500: {"model": RequestError}})