Rename project components

5G-MAG · Oct 28, 2024 · adc9de8 · adc9de8
1 parent 0d3a96a
commit adc9de8
Show file tree

Hide file tree

Showing 26 changed files with 164 additions and 161 deletions.
diff --git a/compose-files/external/docker-compose.yaml b/compose-files/external/docker-compose.yaml
@@ -129,63 +129,63 @@ services:
     ports:
       - "0.0.0.0:9999:9999/tcp"
 
-  mb-amf:
-    container_name: mb-amf
-    image: "ghcr.io/5g-mag/mb-amf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-amf.yaml"
+  amf_with_mbs:
+    container_name: amf_with_mbs
+    image: "ghcr.io/5g-mag/amf_with_mbs:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/amf_with_mbs.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-amf.5g-mag.org
+          - amf-with-mbs.5g-mag.org
     configs:
-      - source: mb_amf_config
-        target: /etc/open5gs/custom/mb-amf.yaml
+      - source: amf_with_mbs_config
+        target: /etc/open5gs/custom/amf_with_mbs.yaml
     depends_on:
       - nrf
     ports:
       - "0.0.0.0:38412:38412/sctp"
 
-  mb-smf:
-    container_name: mb-smf
-    image: "ghcr.io/5g-mag/mb-smf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-smf.yaml"
+  smf_mb-smf:
+    container_name: smf_mb-smf
+    image: "ghcr.io/5g-mag/smf_mb-smf:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/smf_mb-smf.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-smf.5g-mag.org
+          - smf-mb-smf.5g-mag.org
     configs:
-      - source: mb_smf_config
-        target: /etc/open5gs/custom/mb-smf.yaml
+      - source: smf_mb-smf_config
+        target: /etc/open5gs/custom/smf_mb-smf.yaml
     depends_on:
       - nrf
-      - mb-upf
+      - upf_mb-upf
 
-  mb-upf:
-    container_name: mb-upf
-    image: "ghcr.io/5g-mag/mb-upf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-upf.yaml"
+  upf_mb-upf:
+    container_name: upf_mb-upf
+    image: "ghcr.io/5g-mag/upf_mb-upf:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/upf_mb-upf.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-upf.5g-mag.org
+          - upf-mb-upf.5g-mag.org
     extra_hosts:
       docker-host.external-ip: ${DOCKER_HOST_IP}
     configs:
-      - source: mb_upf_config
-        target: /etc/open5gs/custom/mb-upf.yaml
+      - source: upf_mb-upf_config
+        target: /etc/open5gs/custom/upf_mb-upf.yaml
     ports:
       - "0.0.0.0:2152:2152/udp"
     privileged: true
     cap_add:
       - NET_ADMIN
 
-  af:
-    container_name: af
-    image: "ghcr.io/5g-mag/af:${FIVEG_MAG_MBS_VERSION}"
+  test_mbs_af_as:
+    container_name: test_mbs_af_as
+    image: "ghcr.io/5g-mag/test_mbs_af_as:${FIVEG_MAG_MBS_VERSION}"
     networks:
       5g-mag:
         aliases:
-          - af.5g-mag.org
+          - test-mbs-af-as.5g-mag.org
     volumes:
       - ../../test:/test:ro
 
@@ -224,9 +224,9 @@ configs:
     file: ../../configs/external/bsf.yaml
   pcf_config:
     file: ../../configs/external/pcf.yaml
-  mb_amf_config:
-    file: ../../configs/external/mb-amf.yaml
-  mb_smf_config:
-    file: ../../configs/external/mb-smf.yaml
-  mb_upf_config:
-    file: ../../configs/external/mb-upf.yaml
+  amf_with_mbs_config:
+    file: ../../configs/external/amf_with_mbs.yaml
+  smf_mb-smf_config:
+    file: ../../configs/external/smf_mb-smf.yaml
+  upf_mb-upf_config:
+    file: ../../configs/external/upf_mb-upf.yaml
diff --git a/compose-files/internal/docker-compose.yaml b/compose-files/internal/docker-compose.yaml
@@ -129,99 +129,99 @@ services:
     ports:
       - "0.0.0.0:9999:9999/tcp"
 
-  mb-amf:
-    container_name: mb-amf
-    image: "ghcr.io/5g-mag/mb-amf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-amf.yaml"
+  amf_with_mbs:
+    container_name: amf_with_mbs
+    image: "ghcr.io/5g-mag/amf_with_mbs:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/amf_with_mbs.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-amf.5g-mag.org
+          - amf-with-mbs.5g-mag.org
     configs:
-      - source: mb_amf_config
-        target: /etc/open5gs/custom/mb-amf.yaml
+      - source: amf_with_mbs_config
+        target: /etc/open5gs/custom/amf_with_mbs.yaml
     depends_on:
       - nrf
 
-  mb-smf:
-    container_name: mb-smf
-    image: "ghcr.io/5g-mag/mb-smf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-smf.yaml"
+  smf_mb-smf:
+    container_name: smf_mb-smf
+    image: "ghcr.io/5g-mag/smf_mb-smf:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/smf_mb-smf.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-smf.5g-mag.org
+          - smf-mb-smf.5g-mag.org
     configs:
-      - source: mb_smf_config
-        target: /etc/open5gs/custom/mb-smf.yaml
+      - source: smf_mb-smf_config
+        target: /etc/open5gs/custom/smf_mb-smf.yaml
     depends_on:
       - nrf
-      - mb-upf
+      - upf_mb-upf
 
-  mb-upf:
-    container_name: mb-upf
-    image: "ghcr.io/5g-mag/mb-upf:${FIVEG_MAG_MBS_VERSION}"
-    command: "-c /etc/open5gs/custom/mb-upf.yaml"
+  upf_mb-upf:
+    container_name: upf_mb-upf
+    image: "ghcr.io/5g-mag/upf_mb-upf:${FIVEG_MAG_MBS_VERSION}"
+    command: "-c /etc/open5gs/custom/upf_mb-upf.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-upf.5g-mag.org
+          - upf-mb-upf.5g-mag.org
     configs:
-      - source: mb_upf_config
-        target: /etc/open5gs/custom/mb-upf.yaml
+      - source: upf_mb-upf_config
+        target: /etc/open5gs/custom/upf_mb-upf.yaml
     privileged: true
     cap_add:
       - NET_ADMIN
 
-  af:
-    container_name: af
-    image: "ghcr.io/5g-mag/af:${FIVEG_MAG_MBS_VERSION}"
+  test_mbs_af_as:
+    container_name: test_mbs_af_as
+    image: "ghcr.io/5g-mag/test_mbs_af_as:${FIVEG_MAG_MBS_VERSION}"
     networks:
       5g-mag:
         aliases:
-          - af.5g-mag.org
+          - test-mbs-af-as.5g-mag.org
     volumes:
       - ../../test:/test:ro
 
-  mb-gnb:
-    container_name: mb-gnb
-    image: "ghcr.io/5g-mag/mb-gnb:${FIVEG_MAG_MBS_VERSION}"
+  gnb_with_mbs:
+    container_name: gnb_with_mbs
+    image: "ghcr.io/5g-mag/gnb_with_mbs:${FIVEG_MAG_MBS_VERSION}"
     environment:
-      - GNB_FQDN=mb-gnb.5g-mag.org
-      - UE_FQDN=mb-ue.5g-mag.org
-    command: "-c /etc/rt-srsRAN_Project/custom/mb-gnb.yaml"
+      - GNB_FQDN=gnb-with-mbs.5g-mag.org
+      - UE_FQDN=ue-with-mbs.5g-mag.org
+    command: "-c /etc/rt-srsRAN_Project/custom/gnb_with_mbs.yaml"
     networks:
       5g-mag:
         aliases:
-          - mb-gnb.5g-mag.org
+          - gnb-with-mbs.5g-mag.org
     configs:
-      - source: mb_gnb_config
-        target: /etc/rt-srsRAN_Project/custom/mb-gnb.yaml
+      - source: gnb_with_mbs_config
+        target: /etc/rt-srsRAN_Project/custom/gnb_with_mbs.yaml
     privileged: true
     cap_add:
       - NET_ADMIN
     depends_on:
-      - mb-amf
+      - amf_with_mbs
 
-  mb-ue:
-    container_name: mb-ue
-    image: "ghcr.io/5g-mag/mb-ue:${FIVEG_MAG_MBS_VERSION}"
+  ue_with_mbs:
+    container_name: ue_with_mbs
+    image: "ghcr.io/5g-mag/ue_with_mbs:${FIVEG_MAG_MBS_VERSION}"
     environment:
-      - UE_FQDN=mb-ue.5g-mag.org
-      - GNB_FQDN=mb-gnb.5g-mag.org
-    command: "/etc/srsRAN_4G/custom/mb-ue.conf"
+      - UE_FQDN=ue-with-mbs.5g-mag.org
+      - GNB_FQDN=gnb-with-mbs.5g-mag.org
+    command: "/etc/srsRAN_4G/custom/ue_with_mbs.conf"
     networks:
       5g-mag:
         aliases:
-          - mb-ue.5g-mag.org
+          - ue-with-mbs.5g-mag.org
     configs:
-      - source: mb_ue_config
-        target: /etc/srsRAN_4G/custom/mb-ue.conf
+      - source: ue_with_mbs_config
+        target: /etc/srsRAN_4G/custom/ue_with_mbs.conf
     privileged: true
     cap_add:
       - NET_ADMIN
     depends_on:
-      - mb-gnb
+      - gnb_with_mbs
 
 networks:
   5g-mag:
@@ -258,13 +258,13 @@ configs:
     file: ../../configs/internal/bsf.yaml
   pcf_config:
     file: ../../configs/internal/pcf.yaml
-  mb_amf_config:
-    file: ../../configs/internal/mb-amf.yaml
-  mb_smf_config:
-    file: ../../configs/internal/mb-smf.yaml
-  mb_upf_config:
-    file: ../../configs/internal/mb-upf.yaml
-  mb_gnb_config:
-    file: ../../configs/internal/mb-gnb.yaml
-  mb_ue_config:
-    file: ../../configs/internal/mb-ue.conf
+  amf_with_mbs_config:
+    file: ../../configs/internal/amf_with_mbs.yaml
+  smf_mb-smf_config:
+    file: ../../configs/internal/smf_mb-smf.yaml
+  upf_mb-upf_config:
+    file: ../../configs/internal/upf_mb-upf.yaml
+  gnb_with_mbs_config:
+    file: ../../configs/internal/gnb_with_mbs.yaml
+  ue_with_mbs_config:
+    file: ../../configs/internal/ue_with_mbs.conf
diff --git a/configs/external/mb-amf.yaml → configs/external/amf_with_mbs.yaml b/configs/external/mb-amf.yaml → configs/external/amf_with_mbs.yaml
@@ -1,20 +1,20 @@
 logger:
   file:
-    path: /var/log/open5gs/mb-amf.log
+    path: /var/log/open5gs/amf-with-mbs.log
 
 global:
 
 amf:
   sbi:
     server:
-      - address: mb-amf.5g-mag.org
+      - address: amf-with-mbs.5g-mag.org
         port: 80
     client:
       nrf:
         - uri: http://nrf.5g-mag.org:80
   ngap:
     server:
-      - address: mb-amf.5g-mag.org
+      - address: amf-with-mbs.5g-mag.org
   guami:
     - plmn_id:
         mcc: 001
@@ -39,7 +39,7 @@ amf:
       ciphering_order : [ NEA0, NEA1, NEA2 ]
   network_name:
     full: 5G-MAG MBS
-  amf_name: 5g-mag-mb-amf0
+  amf_name: 5g-mag-amf-with-mbs-0
   time:
     t3512:
       value: 540
diff --git a/configs/external/mb-smf.yaml → configs/external/smf_mb-smf.yaml b/configs/external/mb-smf.yaml → configs/external/smf_mb-smf.yaml
@@ -1,26 +1,26 @@
 logger:
   file:
-    path: /var/log/open5gs/mb-smf.log
+    path: /var/log/open5gs/smf_mb-smf.log
 
 global:
 
 smf:
   sbi:
     server:
-      - address: mb-smf.5g-mag.org
+      - address: smf-mb-smf.5g-mag.org
         port: 80
     client:
       nrf:
         - uri: http://nrf.5g-mag.org:80
   pfcp:
     server:
-      - address: mb-smf.5g-mag.org
+      - address: smf-mb-smf.5g-mag.org
     client:
       upf:
-        - address: mb-upf.5g-mag.org
+        - address: upf-mb-upf.5g-mag.org
   gtpu:
     server:
-      - address: mb-smf.5g-mag.org
+      - address: smf-mb-smf.5g-mag.org
   session:
     - subnet: 10.45.0.0/16
       gateway: 10.45.0.1

diff --git a/configs/external/mb-upf.yaml → configs/external/upf_mb-upf.yaml b/configs/external/mb-upf.yaml → configs/external/upf_mb-upf.yaml
@@ -1,17 +1,17 @@
 logger:
   file:
-    path: /var/log/open5gs/mb-upf.log
+    path: /var/log/open5gs/upf_mb-upf.log
 
 global:
 
 upf:
   pfcp:
     server:
-      - address: mb-upf.5g-mag.org
+      - address: upf-mb-upf.5g-mag.org
     client:
   gtpu:
     server:
-      - address: mb-upf.5g-mag.org
+      - address: upf-mb-upf.5g-mag.org
         advertise: docker-host.external-ip
   session:
     - subnet: 10.45.0.0/16

diff --git a/configs/internal/mb-amf.yaml → configs/internal/amf_with_mbs.yaml b/configs/internal/mb-amf.yaml → configs/internal/amf_with_mbs.yaml
@@ -1,20 +1,20 @@
 logger:
   file:
-    path: /var/log/open5gs/mb-amf.log
+    path: /var/log/open5gs/amf-with-mbs.log
 
 global:
 
 amf:
   sbi:
     server:
-      - address: mb-amf.5g-mag.org
+      - address: amf-with-mbs.5g-mag.org
         port: 80
     client:
       nrf:
         - uri: http://nrf.5g-mag.org:80
   ngap:
     server:
-      - address: mb-amf.5g-mag.org
+      - address: amf-with-mbs.5g-mag.org
   guami:
     - plmn_id:
         mcc: 001
@@ -39,7 +39,7 @@ amf:
       ciphering_order : [ NEA0, NEA1, NEA2 ]
   network_name:
     full: 5G-MAG MBS
-  amf_name: 5g-mag-mb-amf0
+  amf_name: 5g-mag-amf-with-mbs-0
   time:
     t3512:
       value: 540