From 4b3cc0aa4e8359b68341fb02d74e2c834e85ebcb Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Sat, 10 Sep 2022 21:58:44 +0200 Subject: [PATCH] Improve platform parsing --- esds/helpers/platform.py | 4 +++- example/platform.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/esds/helpers/platform.py b/esds/helpers/platform.py index 119537a..bafd493 100644 --- a/esds/helpers/platform.py +++ b/esds/helpers/platform.py @@ -94,7 +94,9 @@ class YAMLPlatformFile: interfaces=self.platform["interfaces"] node_count=self.default["node_count"] for i in interfaces: - is_wired=not interfaces[i]["wireless"] + if interfaces[i]["type"] not in ["wireless","wired"]: + self.parsing_error("Invalid interface type \""+interfaces[i]["type"]+"\"") + is_wired=interfaces[i]["type"] == "wired" links=list() if type(interfaces[i]["links"]) == list: for link in interfaces[i]["links"]: diff --git a/example/platform.yaml b/example/platform.yaml index 62db585..0545c04 100644 --- a/example/platform.yaml +++ b/example/platform.yaml @@ -11,11 +11,11 @@ nodes: interfaces: wlan0: - wireless: yes + type: "wireless" links: - 0 1Bps 10s 0 txperfs: - all 1Bps 10s eth0: - wireless: no + type: "wired" links: all 5Mbps 10s all \ No newline at end of file