scenario: Fix antenna configuration keyword

Co-authored-by: Daniele Pugliese <[email protected]>
telematics-lab · May 31, 2024 · 8215a7d · 8215a7d
1 parent 5f952ba
commit 8215a7d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
         {