config changes in prep for generalizations

Author: haisamido

deployments/Taskfile.yaml

@@ -4,20 +4,20 @@ dotenv:
   - ./.env
 
 vars:
-#  # PROJECT: '{{.PROJECT | default "nos3"}}'
-#   FLEET: '{{.PROJECT | default "nos3"}}'
-#   MISSION: '{{.MISSION | default "m01"}}'
-#   SPACECRAFT: '{{.SPACECRAFT | default "sc01"}}'
+  PROJECT: '{{.PROJECT | default "nos3"}}'
+  FLEET: '{{.PROJECT | default "nos3"}}'
+  MISSION: '{{.MISSION | default "m01"}}'
+  SPACECRAFT: '{{.SPACECRAFT | default "sc01"}}'
 
-#  # PROJECT_NAME: '{{.PROJECT}}-{{.MISSION}}-{{.SPACECRAFT}}'
-#   PROJECT_MISSION: '{{.PROJECT}}-{{.MISSION}}'
+  PROJECT_NAME: '{{.PROJECT}}-{{.MISSION}}-{{.SPACECRAFT}}'
+  PROJECT_MISSION: '{{.PROJECT}}-{{.MISSION}}'
 
-#   COMPOSE_PROJECT_NAME: '{{.PROJECT}}-{{.MISSION}}-{{.SPACECRAFT}}'
-#   SC_ENVIRO: '{{.SC_ENVIRO | default "sim"}}'
+  COMPOSE_PROJECT_NAME: '{{.PROJECT}}-{{.MISSION}}-{{.SPACECRAFT}}'
+  SC_ENVIRO: '{{.SC_ENVIRO | default "sim"}}'
 
-#   YAMCS_HOST_PORT: '{{.YAMCS_HOST_PORT | default "8090"}}'
-#   OPENMCT_HOST_PORT: '{{.OPENMCT_HOST_PORT | default "9000"}}'
-#   FORTYTWO_HOST_PORT: '{{.FORTYTWO_HOST_PORT | default "30090"}}'
+  YAMCS_HOST_PORT: '{{.YAMCS_HOST_PORT | default "8090"}}'
+  OPENMCT_HOST_PORT: '{{.OPENMCT_HOST_PORT | default "9000"}}'
+  FORTYTWO_HOST_PORT: '{{.FORTYTWO_HOST_PORT | default "30090"}}'
 
   SERVICES_DIR: ./services
   SCRIPTS_DIR: ./scripts
@@ -306,6 +306,8 @@ tasks:
     cmds:
       - |
         {{.ENVIRO_SCRIPT}} > {{.ENVIRO_FILE}}
+    # cmds:
+    #   - task generate:env
     silent: true
 
   install-lazydocker:
@@ -369,26 +371,29 @@ tasks:
 
         mkdir -p ${ENV_PATH}
 
-        envsubst '\
-          $PROJECT \
-          $FLEET \
-          $MISSION \
-          $SPACECRAFT \
-          $PROJECT_NAME \
-          $PROJECT_MISSION \
-          $COMPOSE_PROJECT_NAME \
-          $SC_ENVIRO \
-          $FORTYTWO_HOST \
-          $FORTYTWO_PORT \
-          $FORTYTWO_HOST_PORT \
-          $YAMCS_HOST \
-          $YAMCS_PORT \
-          $YAMCS_HOST_PORT \
-          $OPENMCT_HOST \
-          $OPENMCT_PORT \
-          $OPENMCT_HOST_PORT' \
-            < {{.ENVIRO_TEMPLATE}} > ${ENV_PATH}/${ENV_SHELL} && \
-        chmod +x ${ENV_PATH}/${ENV_SHELL}
+        ./scripts/env.sh > ${ENV_PATH}/${ENV_SHELL}.env
+        cp ${ENV_PATH}/${ENV_SHELL}.env .env
+
+        # envsubst '\
+        #   $PROJECT \
+        #   $FLEET \
+        #   $MISSION \
+        #   $SPACECRAFT \
+        #   $PROJECT_NAME \
+        #   $PROJECT_MISSION \
+        #   $COMPOSE_PROJECT_NAME \
+        #   $SC_ENVIRO \
+        #   $FORTYTWO_HOST \
+        #   $FORTYTWO_PORT \
+        #   $FORTYTWO_HOST_PORT \
+        #   $YAMCS_HOST \
+        #   $YAMCS_PORT \
+        #   $YAMCS_HOST_PORT \
+        #   $OPENMCT_HOST \
+        #   $OPENMCT_PORT \
+        #   $OPENMCT_HOST_PORT' \
+        #     < {{.ENVIRO_TEMPLATE}} > ${ENV_PATH}/${ENV_SHELL} && \
+        # chmod +x ${ENV_PATH}/${ENV_SHELL}
     silent: true
 
 # nos3 native tasks

deployments/scripts/env.sh

@@ -32,6 +32,7 @@ PROJECT=${PROJECT:-nos3}
 MISSION=${MISSION:-m01}
 SPACECRAFT=${SPACECRAFT:-sc01}
 PROJECT_NAME=${PROJECT}-${MISSION}-${SPACECRAFT}
+PROJECT_MISSION=${PROJECT}-${MISSION}
 SC_ENVIRO=${SC_ENVIRO:-sim}
 
 FORTYTWO_HOST=${FORTYTWO_HOST:-localhost}

deployments/scripts/nos3.yaml

@@ -156,46 +156,103 @@ defaults:
       #     container: 
       #       << : *container
 
-missions:
-  - m01:
-      enabled: true
-      spacecraft:
-        - sc1:
-            enabled: true
-            components: 
-              fortytwo:
-                name: fsw
-                replicas: 1
-                container: 
-                  << : *container
-              fsw:
-                name: fsw
-                replicas: 1
-                container: 
-                  << : *container
-              nos-engine-server:
-                name: nos-engine-server
-                replicas: 1
-                container: 
-                  << : *container
-              time:
-                name: time
-                replicas: 1
-                container: 
-                  << : *container
-              gps:
-                name: gps
-                replicas: 1
-                container: 
-                  << : *container
-  - m02:
-      enabled: false
-      spacecraft:
-        - sc1:
-            enabled: true
-            components: 
-              << : *hw_components
-        - sc2:
-            enabled: false
-            components: 
-              << : *hw_components
+projects:
+  nos3:
+    missions:
+      m01:
+        enabled: true
+        spacecraft:
+          sc01:
+              enabled: true
+              components:
+                fortytwo:
+                  port: 30090
+                yamcs:
+                  port: 8090
+                openmct:
+                  port: 9000
+          sc02:
+              enabled: false
+              components:
+                fortytwo:
+                  port: 30091
+                yamcs:
+                  port: 8091
+                openmct:
+                  port: 9001
+          sc03:
+              enabled: false
+              components:
+                fortytwo:
+                  port: 30092
+                yamcs:
+                  port: 8092
+                openmct:
+                  port: 9002
+      m02:
+        enabled: false
+        spacecraft:
+          sc01:
+              enabled: true
+              components:
+                fortytwo:
+                  port: 30092
+                yamcs:
+                  port: 8092
+                openmct:
+                  port: 9002
+          sc02:
+              enabled: false
+              components:
+                fortytwo:
+                  port: 30093
+                yamcs:
+                  port: 8093
+                openmct:
+                  port: 9003
+
+# projects:
+#   nos3:
+#     missions:
+#       - m01:
+#           enabled: true
+#           spacecraft:
+#             - sc01:
+#                 enabled: true
+#                 components: 
+#                   fortytwo:
+#                     name: fsw
+#                     replicas: 1
+#                     container: 
+#                       << : *container
+#                   fsw:
+#                     name: fsw
+#                     replicas: 1
+#                     container: 
+#                       << : *container
+#                   nos-engine-server:
+#                     name: nos-engine-server
+#                     replicas: 1
+#                     container: 
+#                       << : *container
+#                   time:
+#                     name: time
+#                     replicas: 1
+#                     container: 
+#                       << : *container
+#                   gps:
+#                     name: gps
+#                     replicas: 1
+#                     container: 
+#                       << : *container
+#       - m02:
+#           enabled: false
+#           spacecraft:
+#             - sc01:
+#                 enabled: true
+#                 components: 
+#                   << : *hw_components
+#             - sc02:
+#                 enabled: false
+#                 components: 
+#                   << : *hw_components

deployments/scripts/test.sh

@@ -1,39 +1,40 @@
 #! /usr/bin/env bash
 
-PROJECT=nos3
-MISSIONS=(m01 m02)
-SC=(sc01 sc02)
-FORTYTWO_HOST_PORTS=(30090 30091)
-YAMCS_HOST_PORTS=(8090 8091)
-OPENMCT_HOST_PORTS=(9000 9001)
-
-for MISSION in "${MISSIONS[@]}"
+set -e
+
+config=$(cat ./scripts/nos3.yaml)
+
+PROJECTS=$(echo "$config" | yq ' .projects | select(.) | keys []')
+
+for PROJECT in "${PROJECTS[@]}"
 do
+  MISSIONS=$(echo "$config" | yq " .projects.${PROJECT}.missions | keys []")
 
-  for SPACECRAFT in "${SC[@]}"
+  for MISSION in ${MISSIONS[@]}
   do
+    SPACECRAFT=$(echo "$config" | yq ".projects.${PROJECT}.missions.${MISSION}.spacecraft | keys []")
 
-    for FORTYTWO_HOST_PORT in "${FORTYTWO_HOST_PORTS[@]}"
+    for SC in ${SPACECRAFT[@]}
     do
 
-      for YAMCS_HOST_PORT in "${YAMCS_HOST_PORTS[@]}"
-      do
+      FORTYTWO_HOST_PORT=$(echo "$config" | yq " .projects.${PROJECT}.missions.${MISSION}.spacecraft.${SC}.components.fortytwo.port // \"default\"")
+      YAMCS_HOST_PORT=$(echo "$config" | yq " .projects.${PROJECT}.missions.${MISSION}.spacecraft.${SC}.components.yamcs.port // \"default\"")
+      OPENMCT_HOST_PORT=$(echo "$config" | yq " .projects.${PROJECT}.missions.${MISSION}.spacecraft.${SC}.components.openmct.port // \"default\"")
 
-        for OPENMCT_HOST_PORT in "${OPENMCT_HOST_PORTS[@]}"
-        do
+      echo "Generating .env for Project: ${PROJECT}, Mission: ${MISSION}, Spacecraft: ${SC}"
+      task generate:env \
+        PROJECT=${PROJECT} \
+        FLEET=${PROJECT} \
+        MISSION=${MISSION} \
+        SPACECRAFT=${SC} \
+        FORTYTWO_HOST_PORT=${FORTYTWO_HOST_PORT} \
+        YAMCS_HOST_PORT=${YAMCS_HOST_PORT} \
+        OPENMCT_HOST_PORT=${OPENMCT_HOST_PORT}
 
-          task generate:env \
-            PROJECT=${PROJECT} \
-            FLEET=${PROJECT} \
-            MISSION=${MISSION} \
-            SPACECRAFT=${SPACECRAFT} \
-            FORTYTWO_HOST_PORT=${FORTYTWO_HOST_PORT} \
-            YAMCS_HOST_PORT=${YAMCS_HOST_PORT} \
-            OPENMCT_HOST_PORT=${OPENMCT_HOST_PORT}
-
-        done
-      done
     done
+
   done
+
 done
 
+echo "Environment files generated successfully."