Fix/restructure

.github/workflows/integration-test.yml

@@ -64,7 +64,7 @@ jobs:
 
       - name: Start OAI Core Network
         run: |
-          cd demo_containerized/oai_setup
+          cd core_network_setup/oai
           docker compose up -d
           ./wait_for_core_network.sh
 
@@ -115,6 +115,6 @@ jobs:
           docker compose -f docker-compose-test-simulation.yml down || true
           docker stop ue_turtlebot oai-gNB1 2>/dev/null || true
           docker rm ue_turtlebot oai-gNB1 2>/dev/null || true
-          cd "${{ github.workspace }}/demo_containerized/oai_setup"
+          cd "${{ github.workspace }}/core_network_setup/oai"
           docker compose down || true
           docker network rm ros_gz_net 2>/dev/null || true

.gitignore

@@ -59,5 +59,6 @@ demo/images/ue_amr/nav_stack
 
 .DS_Store
 
-demo/open5gs_setup/db_data/*
-demo_containerized/open5gs_setup/db_data/*
+core_network_setup/open5gs/db_data/*
+core_network_setup/open5gs/db_data/*
+demo_containerized/open5gs_setup/db_data/*

demo/open5gs_setup/docker-compose.yml → core_network_setup/open5gs/docker-compose.yml

@@ -11,8 +11,8 @@ services:
     ports:
       - "27017:27017"
     volumes:
-      - ./db_data:/data/db
-      - ./db_config:/data/configdb
+      - db_data:/data/db
+      - db_config:/data/configdb
 
   nrf:
     container_name: nrf
@@ -174,7 +174,13 @@ networks:
 
 volumes:
   db_data:
+    name: open5gs_db_data
+    labels:
+      org.open5gs.mongodb_version: ${MONGODB_VERSION:-6.0}
   db_config:
+    name: open5gs_db_config
+    labels:
+      org.open5gs.mongodb_version: ${MONGODB_VERSION:-6.0}
 
 configs:
   nrf_config:

core_network_setup/open5gs/scripts/add_ue_subscriber.sh

@@ -0,0 +1,16 @@
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+export UE1_IMSI="001010000000101"
+export UE1_KEY="8baf473f2f8fd09487cccbd7097c6862"
+export UE1_OPC="8e27b6af0e692e750f32667a3b14605d"
+export UE1_DNN="internet"
+export UE1_SST="1"
+export UE1_SD="000001"
+
+sudo "$SCRIPT_DIR/open5gs-dbctl" add_ue_with_slice \
+  "$UE1_IMSI" \
+  "$UE1_KEY" \
+  "$UE1_OPC" \
+  "$UE1_DNN" \
+  "$UE1_SST" \
+  "$UE1_SD" || true