From 8215a7d2ff908f648d67f39bd67841618218ae6b Mon Sep 17 00:00:00 2001 From: Giovanni Grieco Date: Fri, 31 May 2024 15:16:10 +0200 Subject: [PATCH] scenario: Fix antenna configuration keyword Co-authored-by: Daniele Pugliese --- scenario/integrated_ntn.json | 4 ++-- scenario/ntn-hap-big.json | 4 ++-- scenario/ntn-hap-static.json | 4 ++-- scenario/ntn-hap-sweep.json | 4 ++-- scenario/ntn-hap-test.json | 4 ++-- scenario/ntn-hap.json | 4 ++-- src/configuration/helper/entity-configuration-helper.cc | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scenario/integrated_ntn.json b/scenario/integrated_ntn.json index cec6a76..6375efc 100644 --- a/scenario/integrated_ntn.json +++ b/scenario/integrated_ntn.json @@ -85,7 +85,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -153,7 +153,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/scenario/ntn-hap-big.json b/scenario/ntn-hap-big.json index add3f45..94d9f1a 100644 --- a/scenario/ntn-hap-big.json +++ b/scenario/ntn-hap-big.json @@ -62,7 +62,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -126,7 +126,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/scenario/ntn-hap-static.json b/scenario/ntn-hap-static.json index 4aab6e2..698085c 100644 --- a/scenario/ntn-hap-static.json +++ b/scenario/ntn-hap-static.json @@ -62,7 +62,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -122,7 +122,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/scenario/ntn-hap-sweep.json b/scenario/ntn-hap-sweep.json index cd99ab2..8a0ff48 100644 --- a/scenario/ntn-hap-sweep.json +++ b/scenario/ntn-hap-sweep.json @@ -63,7 +63,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -123,7 +123,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/scenario/ntn-hap-test.json b/scenario/ntn-hap-test.json index da3ec91..7890337 100644 --- a/scenario/ntn-hap-test.json +++ b/scenario/ntn-hap-test.json @@ -62,7 +62,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -126,7 +126,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/scenario/ntn-hap.json b/scenario/ntn-hap.json index 925f065..8e435c3 100644 --- a/scenario/ntn-hap.json +++ b/scenario/ntn-hap.json @@ -69,7 +69,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { @@ -129,7 +129,7 @@ // TODO: What's the relation between netDevices and antennas? // Antenna may be configured globally on the node. In this way, all the netDevices will use the same antenna. // If we want to configure different antennas for different netDevices, we have to specify the antenna in the netDevice. - "antenna": { + "antennaModel": { "name": "ns3::UniformPlanarArray", "attributes": [ { diff --git a/src/configuration/helper/entity-configuration-helper.cc b/src/configuration/helper/entity-configuration-helper.cc index a6d63b2..f226e4d 100644 --- a/src/configuration/helper/entity-configuration-helper.cc +++ b/src/configuration/helper/entity-configuration-helper.cc @@ -122,7 +122,7 @@ EntityConfigurationHelper::DecodeNetdeviceConfigurations(const rapidjson::Value& }(); const auto antennaModel = - ModelConfigurationHelper::GetOptional(netdev.GetObject(), "antenna"); + ModelConfigurationHelper::GetOptional(netdev.GetObject(), "antennaModel"); if (type == "wifi") {