From 3aad133390bd56a2e5b12cb3a17e47d5a4662a29 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Wed, 8 Jun 2011 01:46:04 +0200 Subject: [PATCH] bug fixes --- src/nepi/testbeds/ns3/attributes_metadata_v3_9.py | 2 +- src/nepi/testbeds/ns3/factories_metadata_v3_9.py | 5 +++-- src/nepi/util/parser/_xml.py | 2 +- src/nepi/util/parser/base.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py b/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py index d6e95106..85127d60 100644 --- a/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py +++ b/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py @@ -2415,7 +2415,7 @@ attributes = dict({ "name": "Standard", "validation_function": validation.is_string, "value": "WIFI_PHY_STANDARD_80211a", - "flags": Attribute.DesignOnly, + "flags": Attribute.DesignOnly | Attribute.HasNoDefaultValue, "type": Attribute.ENUM, "allowed": wifi_standards.keys(), "help": "Wifi PHY standard" diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py index 6afc7f6d..df829098 100644 --- a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py +++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py @@ -205,8 +205,9 @@ def create_wifi_standard_model(testbed_instance, guid): element = testbed_instance._elements[guid] parameters = testbed_instance._get_parameters(guid) standard = parameters.get("Standard") - if standard: - element.ConfigureStandard(wifi_standards[standard]) + if not standard: + raise RuntimeError("No wifi standard set for %d" % guid) + element.ConfigureStandard(wifi_standards[standard]) def create_waypoint_mobility(testbed_instance, guid): create_element(testbed_instance, guid) diff --git a/src/nepi/util/parser/_xml.py b/src/nepi/util/parser/_xml.py index 7f439cfa..8eb3f070 100644 --- a/src/nepi/util/parser/_xml.py +++ b/src/nepi/util/parser/_xml.py @@ -16,7 +16,7 @@ class XmlExperimentParser(ExperimentParser): exp_tag.appendChild(testbeds_tag) elements_tags = dict() - for guid in data.guids: + for guid in sorted(data.guids): if data.is_testbed_data(guid): elements_tag = self.testbed_data_to_xml(doc, testbeds_tag, guid, data) elements_tags[guid] = elements_tag diff --git a/src/nepi/util/parser/base.py b/src/nepi/util/parser/base.py index 89d88deb..c06dabc9 100644 --- a/src/nepi/util/parser/base.py +++ b/src/nepi/util/parser/base.py @@ -261,7 +261,7 @@ class ExperimentParser(object): def from_data(self, experiment_description, data): box_guids = list() - for guid in data.guids: + for guid in sorted(data.guids): if data.is_testbed_data(guid): self.testbed_from_data(experiment_description, guid, data) else: -- 2.43.0