V2.1.0

backend/cmd/config.go

@@ -5,7 +5,11 @@ import (
 	"github.com/HyperloopUPV-H8/h9-backend/internal/vehicle"
 )
 
+type Adj struct {
+	Branch string
+}
 type Config struct {
 	Vehicle vehicle.Config
 	Server  server.Config
+	Adj     Adj
 }

backend/cmd/config.toml

@@ -11,4 +11,7 @@ connections = "/backend"
 files = "/"
 
 [vehicle]
-boardsList = ["VCU"]
+boardsList = ["VCU"]
+
+[adj]
+branch = "main" # Leave blank when using ADJ as a submodule

backend/cmd/main.go

@@ -12,6 +12,7 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"os"
+	"os/exec"
 	"os/signal"
 	"path"
 	"runtime"
@@ -96,15 +97,23 @@ func main() {
 		defer pprof.StopCPUProfile()
 	}
 	runtime.SetBlockProfileRate(*blockprofile)
+
 	config := getConfig("./config.toml")
 
 	// <--- ADJ --->
 
-	adj, err := adj_module.NewADJ()
+	adj, err := adj_module.NewADJ(config.Adj.Branch)
 	if err != nil {
 		trace.Fatal().Err(err).Msg("setting up ADJ")
 	}
 
+	test := exec.Command("python3", "testadj.py")
+	out, err := test.CombinedOutput()
+	if err != nil || len(out) != 0 {
+		fmt.Printf("\nPython test failed:\nError: %v\nOutput: %s\n", err, string(out))
+		os.Exit(1)
+	}
+
 	podData, err := pod_data.NewPodData(adj.Boards, adj.Info.Units)
 	if err != nil {
 		fmt.Println(err)
@@ -558,7 +567,7 @@ func getIPIPfilter() string {
 	return "ip[9] == 4"
 }
 
-func getUDPFilter(addrs []net.IP, backendAddr net.IP, port uint16) string {
+func getUDPFilter(addrs []net.IP, backendAddr net.IP, _ uint16) string {
 	udpPort := "udp" // TODO use proper ports for the filter
 	srcUdpAddrs := common.Map(addrs, func(addr net.IP) string {
 		return fmt.Sprintf("(src host %s)", addr)

backend/cmd/testadj.py

@@ -0,0 +1,121 @@
+import os
+import json
+
+
+def validate_json_structure(data):
+    errors = []
+
+    if "board_id" in data:
+        if not isinstance(data["board_id"], int):
+            errors.append(f"'board_id' debe ser un entero, pero se encontró: {type(data['board_id']).__name__}.")
+
+    if "board_ip" in data:
+        if not isinstance(data["board_ip"], str):
+            errors.append(f"'board_ip' debe ser una cadena, pero se encontró: {type(data['board_ip']).__name__}.")
+
+
+    if "measurements" in data:
+        if not isinstance(data["measurements"], list):
+            errors.append("La clave 'measurements' debe ser una lista.")
+        else:
+            for measurement in data["measurements"]:
+                if isinstance(measurement, dict):
+                    required_keys = ["id", "name", "type", "podUnits", "displayUnits"]
+                    for key in required_keys:
+                        if key not in measurement:
+                            errors.append(f"Falta la clave '{key}' en un objeto de 'measurements'.")
+                    if "id" in measurement and not isinstance(measurement["id"], str):
+                        errors.append(f"El 'id' debe ser una cadena en: {measurement}")
+                    if "name" in measurement and not isinstance(measurement["name"], str):
+                        errors.append(f"El 'name' debe ser una cadena en: {measurement}")
+                    if "type" in measurement and not isinstance(measurement["type"], str):
+                        errors.append(f"El 'type' debe ser una cadena en: {measurement}")
+                    if "safeRange" in measurement and not isinstance(measurement.get("safeRange", []), list):
+                        errors.append(f"'safeRange' debe ser una lista en: {measurement}")
+                    if "warningRange" in measurement and not isinstance(measurement.get("warningRange", []), list):
+                        errors.append(f"'warningRange' debe ser una lista en: {measurement}")
+                    if "displayUnits" in measurement and not isinstance(measurement["displayUnits"], str):
+                        errors.append(f"El 'podUnits' debe ser una cadena en: {measurement}")
+                    if "podUnits" in measurement and not isinstance(measurement["podUnits"], str):
+                        errors.append(f"El 'podUnits' debe ser una cadena en: {measurement}") #esto se puede quitar (json 516)
+                elif not isinstance(measurement, str):
+                    errors.append("Cada elemento en 'measurements' debe ser un objeto o una cadena (nombre de archivo).")
+
+
+    if "packets" in data:
+        if not isinstance(data["packets"], list):
+            errors.append("La clave 'packets' debe ser una lista.")
+        else:
+            for packet in data["packets"]:
+                if isinstance(packet, dict):
+                    required_keys = ["id", "name", "type","variable"]
+                    for key in required_keys:
+                        if key not in packet:
+                            errors.append(f"Falta la clave '{key}' en un objeto de 'packets'.")
+                    if "id" in packet and not isinstance(packet["id"], str):
+                        errors.append(f"El 'id' debe ser una cadena en: {packet}")
+                    if "name" in packet and not isinstance(packet["name"], str):
+                        errors.append(f"El 'name' debe ser una cadena en: {packet}")
+                    if "type" in packet and not isinstance(packet["type"], str):
+                        errors.append(f"El 'type' debe ser una cadena en: {packet}")
+                    if "variables" in packet:
+                        if not isinstance(packet["variables"], list):
+                            errors.append(f"'variables' debe ser una lista en: {packet}")
+                        else:
+                            for variable in packet["variables"]:
+                                if not isinstance(variable, dict):
+                                    errors.append(f"Cada elemento en 'variables' debe ser un objeto en: {packet}")
+                                if "name" not in variable:
+                                    errors.append(f"Falta la clave 'name' en un objeto de 'variables' en: {packet}")
+                elif not isinstance(packet, str):
+                    errors.append("Cada elemento en 'packets' debe ser un objeto o una cadena (nombre de archivo).")
+
+    return errors
+
+
+
+def validate_json_folder(folder_path):
+    boards_file_path = os.path.join(folder_path, "boards.json")
+
+    try:
+        with open(boards_file_path, 'r') as boards_file:
+            boards_data = json.load(boards_file)
+            boards = boards_data.get("boards", {})
+
+
+            board_keys = list(boards.keys())
+            duplicate_keys = [key for key in board_keys if board_keys.count(key) > 1]
+
+            if duplicate_keys:
+                print(f"Error: El archivo boards.json contiene claves duplicadas: {', '.join(duplicate_keys)}")
+                return
+
+    except json.JSONDecodeError as e:
+        print(f"Error al decodificar JSON en {boards_file_path}: {e}")
+        return
+    except Exception as e:
+        print(f"Error al procesar el archivo {boards_file_path}: {e}")
+        return
+
+
+    for board_name, board_file_path in boards.items():
+        full_path = os.path.join(folder_path, board_file_path)
+        try:
+            with open(full_path, 'r') as board_file:
+                data = json.load(board_file)
+                errors = validate_json_structure(data)
+                if errors:
+                    print(f"Errores encontrados en {full_path} para la placa '{board_name}':")
+                    for error in errors:
+                        print(f"- {error}")
+
+        except json.JSONDecodeError as e:
+            print(f"Error al decodificar JSON en {full_path}: {e}")
+        except Exception as e:
+            print(f"Error al procesar el archivo {full_path}: {e}")
+
+
+if os.path.exists('./JSON_ADE/') == False:
+    print("La carpeta JSON_ADE no existe")
+if __name__ == "__main__":
+    validate_json_folder("./JSON_ADE/")

backend/go.mod

@@ -3,24 +3,18 @@ module github.com/HyperloopUPV-H8/h9-backend
 go 1.21.3
 
 require (
-	github.com/HyperloopUPV-H8/ade-linter v0.0.0-20230530153315-3379f05a664f
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/google/gopacket v1.1.19
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/jmaralo/sntp v0.0.0-20240116111937-45a0a3419272
 	github.com/pelletier/go-toml/v2 v2.0.7
 	github.com/pin/tftp/v3 v3.0.0
-	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.29.0
-	github.com/xuri/excelize/v2 v2.7.1
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	google.golang.org/api v0.114.0
 )
 
 require (
-	cloud.google.com/go/compute v1.19.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
@@ -30,33 +24,19 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
-	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.13.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )