It Works!

nextmn · Feb 2, 2024 · ca64462 · ca64462
1 parent 5887f8e
commit ca64462
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/config.yaml b/config.yaml
@@ -80,9 +80,9 @@ subnets:
     end-m-gtp4-e:
       ipv6_prefix: fc00:1:1::/48
     gnb1:
-      ipv6_address: fc00:1:1:0A01:0081:0000:0000:0200 # fc00:1:1 + hex(10.1.0.129) = 0A 01 00 81 + Args.Mob.Session ( 0 + 0000 0002) + padding
+      ipv6_address: fc00:1:1:0A01:0481:0000:0000:0100 # fc00:1:1 + hex(gnb1) = hex(10.1.4.129) = 0A 01 04 81 + Args.Mob.Session ( 0 + 0000 0001) + padding
     gnb2:
-      ipv6_address: fc00:1:1:0A01:0082:0000:0000:0400 # fc00:1:1 + hex(10.1.0.130) = 0A 01 00 82 + Args.Mob.Session ( 0 + 0000 0004) + padding
+      ipv6_address: fc00:1:1:0A01:0482:0000:0000:0100 # fc00:1:1 + hex(gnb2) = hex(10.1.4.130) = 0A 01 04 82 + Args.Mob.Session ( 0 + 0000 0001) + padding
 
   r0:
     subnet:

diff --git a/templates/compose.yaml.j2 b/templates/compose.yaml.j2
@@ -45,7 +45,9 @@ services:
     networks:
       ran: # automatic allocation by docker compose
 
-  {{ container_s(name='gnb1', image='louisroyer/ueransim-gnb', ipv6=True, restart='always', iface_tun=True, cap_net_admin=True) }}
+  {{ container_s(name='gnb1', image='louisroyer/ueransim-gnb', ipv6=True, restart='always', iface_tun=True, cap_net_admin=True, debug=True) }}
+    depends_on:
+      - amf
     environment:
       NCI: 000000001
       RLS_IP: "{{ ipv6('gnb1', 'ran') }}"
@@ -72,7 +74,9 @@ services:
       dataplane:
         ipv4_address: "{{ ipv4('gnb1', 'dataplane') }}"
 
-  {{ container_s(name='gnb2', image='louisroyer/ueransim-gnb', ipv6=True, restart='always', iface_tun=True, cap_net_admin=True) }}
+  {{ container_s(name='gnb2', image='louisroyer/ueransim-gnb', ipv6=True, restart='always', iface_tun=True, cap_net_admin=True, debug=True) }}
+    depends_on:
+      - amf
     environment:
       NCI: 000000002
       RLS_IP: "{{ ipv6('gnb2', 'ran') }}"
@@ -498,7 +502,7 @@ services:
       PRE_INIT_HOOK_4: "edge-0"
   {{ container_s(name='s0', image='nginx', command=False, debug=True) }}
     volumes:
-      {{ volume_ro('nginx/instance.conf.template', '/etc/nginx/templates/instance.conf') }}
+      {{ volume_ro('nginx/instance.conf.template', '/etc/nginx/templates/instance.conf.template') }}
     environment:
       NGINX_PORT: "80"
       NGINX_SERVICE_ID: "{{ ipv4('s', 'service') }}"
@@ -520,7 +524,7 @@ services:
       PRE_INIT_HOOK_4: "edge-0"
   {{ container_s(name='s1', image='nginx', command=False, debug=True) }}
     volumes:
-      {{ volume_ro('nginx/instance.conf.template', '/etc/nginx/templates/instance.conf') }}
+      {{ volume_ro('nginx/instance.conf.template', '/etc/nginx/templates/instance.conf.template') }}
     environment:
       NGINX_PORT: "80"
       NGINX_SERVICE_ID: "{{ ipv4('s', 'service') }}"