Draft: 148 migrate camp repo (#191)

* Rework to split amp-manager from ION containers

* Aligning ION config inputs, fixing proxy socket path

* Fixing container build after merge

* Fix compose config

* Cleaning up CI config

* Fixing access in CI

* Update checkout test port

* Fixing podman use and podman checkout CI job

* Stop in opposite order from start

* updating nm_host from ion-manger to anms-amp-manager-1. still having issues submitting reports

* updated name to amp-manager, removed debug log

* Renamed test containers file to testenv-compose to make its purpose more clear. Moved socket bind mount to an environment controlled path.

* Fixing puppet testenv disable behavior

* Fix hostname for the NM manager

* Separate anms network from testenv network

* Fix container name after merge

* updated to dtnma-camp

* updated to latest CAMP and DTNNA-TOOLS

* Updating uses of ACE, CAMP, and REFDM to latest development

* updated to latest dtnma libraries

* updating to latest sql tables

* handling ADM upload and report printing

* working translation and report handling

* updated for sending and viewing execsets

* fixed up creating execset

* updaded submodules

* updated to proper commit for dtnma-tools

* updating tests

* updating core tests

* passing tests

* updated ace

* removing test print and extra copy

* adding latest ace

* updated adms to be out of anms-ace

* updated copy for adms

---------

Co-authored-by: Brian Sipos <brian.sipos@jhuapl.edu>
Co-authored-by: Brian Sipos <brian.sipos@gmail.com>
Co-authored-by: David Linko <david.linko@jhuapl.edu>

Author: 3 people

.env

@@ -51,4 +51,6 @@ RENDERER_PORT=8081
 RENDERER_HOST_PORT=${DOCKER_CTR_PREFIX}grafana-image-renderer:${RENDERER_PORT}
 ION_MGR_PORT=8089
 HTTP_PORT:80
+SOCKDIR=/var/tmp/nm
 
+ADM_PATH=deps/dtnma-adms

.github/workflows/anms-core.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip3 install deps/dtnma-ace
-          pip3 install deps/anms-camp
+          pip3 install deps/dtnma-camp
       - name: Install
         working-directory: anms-core
         run: pip3 install -e '.[test]'
@@ -43,7 +43,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip3 install deps/dtnma-ace
-          pip3 install deps/anms-camp
+          pip3 install deps/dtnma-camp
       - name: Install flake8
         working-directory: anms-core
         run: pip3 install -e '.[flake8]'

.github/workflows/build-test.yaml

@@ -43,6 +43,7 @@ jobs:
       - name: Build Volume
         run: |
           ./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
+          sudo mkdir /run/anms
       - name: Start
         run: |
           podman compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate
@@ -104,6 +105,7 @@ jobs:
       - name: Build Volume
         run: |
           ./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
+          sudo mkdir /run/anms
       - name: Start
         run: |
           docker compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate

.gitlab-ci.yml

@@ -173,7 +173,7 @@ anms-core_unit-test:
     - *prep-install-ca
     - *prep-install-python
     - pip3 wheel deps/dtnma-ace -w ${PY_WHEEL_DIR} --no-deps
-    - pip3 wheel deps/anms-camp -w ${PY_WHEEL_DIR} --no-deps
+    - pip3 wheel deps/dtnma-camp -w ${PY_WHEEL_DIR} --no-deps
     - (cd anms-core &&
         pip-compile --find-links ${PY_WHEEL_DIR} --extra test pyproject.toml &&
         pip3 install --find-links ${PY_WHEEL_DIR} -r requirements.txt)

.gitmodules

@@ -1,11 +1,14 @@
-[submodule "deps/anms-camp"]
-	path = deps/anms-camp
-	url = ../anms-camp.git
-[submodule "ion/src"]
-	path = ion/src
-	url = https://github.com/JHUAPL/dtnma-tools.git
-
 [submodule "deps/dtnma-ace"]
 	path = deps/dtnma-ace
-	url = https://github.com/JHUAPL-DTNMA/dtnma-ace
+	url = https://github.com/JHUAPL-DTNMA/dtnma-ace.git
 	branch = main
+[submodule "deps/dtnma-tools"]
+	path = deps/dtnma-tools
+	url = https://github.com/JHUAPL-DTNMA/dtnma-tools.git
+	branch = main
+[submodule "deps/dtnma-camp"]
+	path = deps/dtnma-camp
+	url = https://github.com/JHUAPL-DTNMA/dtnma-camp.git
+[submodule "deps/dtnma-adms"]
+	path = deps/dtnma-adms
+	url = https://github.com/JHUAPL-DTNMA/dtnma-adms.git

README.md

@@ -230,7 +230,7 @@ The two output paths for ADM C files are:
 
 To regenerate agent source, scraping the pre-existing source to avoid clearing out agent implementations, run:
 ```sh
-PYTHONPATH=deps/dtnma-ace/src/:deps/anms-camp/src/ python3 -m camp.tools.camp ion/src/nm/doc/adms/ion_bp_admin.json -o ion/src/bpv7/nm/ --only-ch --scrape
+PYTHONPATH=deps/dtnma-ace/src/:deps/dtnma-camp/src/ python3 -m camp.tools.camp ion/src/nm/doc/adms/ion_bp_admin.json -o ion/src/bpv7/nm/ --only-ch --scrape
 ```
 
 ### Manual Agent exercising