Attempted bug fixes

oran-testing · Dec 19, 2024 · 885d31e · 885d31e
1 parent aaf3463
commit 885d31e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 33 deletions.
diff --git a/docker/controller/Dockerfile b/docker/controller/Dockerfile
@@ -1,4 +1,10 @@
-FROM ubuntu:22.04
+ARG OS_VERSION=24.04
+ARG LIB=uhd
+ARG LIB_VERSION=4.7.0.0
+ARG MARCH=native
+ARG NUM_CORES=""
+
+FROM ubuntu:$OS_VERSION
 
 ENV CONFIG="configs/basic_ue_zmq.yaml"
 ENV DEBIAN_FRONTEND=noninteractive
@@ -21,7 +27,7 @@ COPY pyproject.toml .
 COPY ./src .
 COPY ./configs configs
 
-RUN pip3 install --no-cache-dir poetry
+RUN pip3 install --break-system-packages --no-cache-dir poetry
 
 RUN poetry install --only main
 

diff --git a/docker/controller/src/Ue.py b/docker/controller/src/Ue.py
@@ -141,29 +141,28 @@ def start(self, args):
             try:
                 # Check if the container already exists
                 # V
-                containers = self.docker_client.containers.list(all=True, filters={"name": container_name})
+                containers = self.docker_client.containers.list(all=True, filters={"ancestor": "srsran/ue"})
                 if containers:
-                    self.docker_container = containers[0]
-                    self.docker_container.start()  # Restart if stopped
-                    logging.debug(f"Restarted existing Docker container {container_name}")
-                else:
-                    network_name = "docker_srsue_network"
-                    self.docker_network = self.docker_client.networks.get(network_name)
-                    self.docker_container = self.docker_client.containers.run(
-                        image="srsran/ue",
-                        name=container_name,
-                        environment=environment,
-                        volumes={
-                            "/dev/bus/usb/": {"bind": "/dev/bus/usb/", "mode": "rw"},
-                            "/usr/share/uhd/images": {"bind": "/usr/share/uhd/images", "mode": "ro"},
-                            "ue-storage": {"bind": "/tmp", "mode": "rw"}
-                        },
-                        privileged=True,
-                        cap_add=["SYS_NICE", "SYS_PTRACE"],
-                        network=network_name,
-                        detach=True,
-                    )
-                    logging.debug(f"Started new Docker container {container_name}")
+                    containers[0].stop()
+                    containers[0].remove()
+                    logging.debug(f"Removed existing container")
+                network_name = "docker_srsue_network"
+                self.docker_network = self.docker_client.networks.get(network_name)
+                self.docker_container = self.docker_client.containers.run(
+                    image="srsran/ue",
+                    name=container_name,
+                    environment=environment,
+                    volumes={
+                        "/dev/bus/usb/": {"bind": "/dev/bus/usb/", "mode": "rw"},
+                        "/usr/share/uhd/images": {"bind": "/usr/share/uhd/images", "mode": "ro"},
+                        "ue-storage": {"bind": "/tmp", "mode": "rw"}
+                    },
+                    privileged=True,
+                    cap_add=["SYS_NICE", "SYS_PTRACE"],
+                    network=network_name,
+                    detach=True,
+                )
+                logging.debug(f"Started new Docker container {container_name}")
 
 
                 self.docker_logs = self.docker_container.logs(stream=True, follow=True)

diff --git a/docker/controller/src/entrypoint.sh b/docker/controller/src/entrypoint.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 kill_ue_containers() {
-	UE_IMG_IDS=$(docker ps | awk '/srsran\/ue/{print $1}')
+	UE_IMG_IDS=$(docker ps --filter "ancestor=srsran/ue" -q)
+
 	for IMG in $UE_IMG_IDS; do
 		docker kill $IMG
 	done

diff --git a/docker/webui/public/index.html b/docker/webui/public/index.html
@@ -139,15 +139,15 @@
                 }
                 if (chart.data.labels.length > 50) {
                     while(chart.data.labels.length >= 50){
-                      chart.data.labels.shift();
+                      //chart.data.labels.shift();
                     }
 
                     while(chart.data.datasets[0].length >= 50){
-                      chart.data.datasets[0].shift();
+                      //chart.data.datasets[0].shift();
                     }
 
                     while(chart.data.datasets[1].length >= 50){
-                      chart.data.datasets[1].shift();
+                      //chart.data.datasets[1].shift();
                     }
                 }
                 chart.update();  // Update the chart with new data
@@ -237,23 +237,23 @@
 
                 if (channelChart.data.labels.length > 50) {
                     while(channelChart.data.labels.length >= 50){
-                      channelChart.data.labels.shift();
+                      //channelChart.data.labels.shift();
                     }
 
                     while(channelChart.data.datasets[0].length >= 50){
-                      channelChart.data.datasets[0].shift();
+                      //channelChart.data.datasets[0].shift();
                     }
 
                     while(channelChart.data.datasets[1].length >= 50){
-                      channelChart.data.datasets[1].shift();
+                      //channelChart.data.datasets[1].shift();
                     }
 
                     while(channelChart.data.datasets[2].length >= 50){
-                      channelChart.data.datasets[2].shift();
+                      //channelChart.data.datasets[2].shift();
                     }
 
                     while(channelChart.data.datasets[3].length >= 50){
-                      channelChart.data.datasets[3].shift();
+                      //channelChart.data.datasets[3].shift();
                     }
                 }
                 chart.update();  // Update the chart with new data