Merge branch 'L2SS-2129-Part-II' into 'main'

Let antenafield be field, and antenna be antenna

Closes L2SS-2129

See merge request !11

proto/stationcontrol/antenna.proto

+syntax = "proto3";
+
+service Antenna {
+  rpc GetAntenna(GetAntennaRequest) returns (AntennaReply) {}
+  rpc SetAntennaStatus(SetAntennaStatusRequest) returns (AntennaReply) {}
+  rpc SetAntennaUse(SetAntennaUseRequest) returns (AntennaReply) {}
+  
+}
+
+enum Antenna_Status {
+  OK = 0;
+  SUSPICIOUS = 1;
+  BROKEN = 2;
+  BEYOND_REPAIR = 3;
+  NOT_AVAILABLE = 4;
+}
+
+enum Antenna_Use {
+  // use antenna only if it's OK or SUSPICIOUS
+  AUTO = 0;
+  // force antenna to be on, regardless of status
+  ON = 1;
+  // force antenna to be off, regardless of status
+  OFF = 2;
+}
+
+message Identifier {
+  // e.g. "LBA"
+  string antennafield_name = 1;
+  // e.g. "LBA00"
+  string antenna_name = 2;
+}
+
+message SetAntennaStatusRequest {
+  Identifier identifier = 1;
+  Antenna_Status antenna_status = 2 ;
+}
+
+message GetAntennaRequest {
+  Identifier identifier = 1;
+}
+
+message SetAntennaUseRequest {
+  Identifier identifier = 1;
+  Antenna_Use antenna_use = 2;
+}
+
+message AntennaResult {
+  Identifier identifier = 1;
+  Antenna_Use antenna_use = 2;
+  Antenna_Status antenna_status = 3;
+}
+
+message AntennaReply {
+  bool success = 1;
+  string exception = 2;
+  AntennaResult result = 3;
+}

proto/stationcontrol/antennafield.proto

 syntax = "proto3";
 
 service Antennafield {
-  rpc GetAntenna(GetAntennaRequest) returns (AntennaReply) {}
-  rpc SetAntennaStatus(SetAntennaStatusRequest) returns (AntennaReply) {}
-  rpc SetAntennaUse(SetAntennaUseRequest) returns (AntennaReply) {}
+  rpc GetAntennafieldPower(GetAntennafieldRequest) returns (AntennafieldReply) {}
+  rpc SetAntennafieldPower(SetAntennafieldRequest) returns (AntennafieldReply) {}
 }
 
-enum Antenna_Status {
-  OK = 0;
-  SUSPICIOUS = 1;
-  BROKEN = 2;
-  BEYOND_REPAIR = 3;
-  NOT_AVAILABLE = 4;
+enum Antennafield_Power_Status {
+  Antennafield_POWER_OFF = 0;
+  Antennafield_POWER_ON = 1;
 }
 
-enum Antenna_Use {
-  // use antenna only if it's OK or SUSPICIOUS
-  AUTO = 0;
-  // force antenna to be on, regardless of status
-  ON = 1;
-  // force antenna to be off, regardless of status
-  OFF = 2;
+message AntennafieldIdentifier {
+  // e.g. "LBA","HBA"
+  string antenna_field_id = 1;
 }
 
-message Identifier {
-  // e.g. "LBA"
-  string antennafield_name = 1;
-  // e.g. "LBA00"
-  string antenna_name = 2;
+message SetAntennafieldRequest {
+  AntennafieldIdentifier identifier = 1;
+  Antennafield_Power_Status power_status = 2 ;
 }
 
-message SetAntennaStatusRequest {
-  Identifier identifier = 1;
-  Antenna_Status antenna_status = 2 ;
+message GetAntennafieldRequest {
+  AntennafieldIdentifier identifier = 1;
 }
 
-message GetAntennaRequest {
-  Identifier identifier = 1;
+message AntennafieldResult {
+  AntennafieldIdentifier identifier = 1;
+  Antennafield_Power_Status power_status = 2 ;
 }
 
-message SetAntennaUseRequest {
-  Identifier identifier = 1;
-  Antenna_Use antenna_use = 2;
-}
-
-message AntennaResult {
-  Identifier identifier = 1;
-  Antenna_Use antenna_use = 2;
-  Antenna_Status antenna_status = 3;
-}
-
-message AntennaReply {
+message AntennafieldReply {
   bool success = 1;
   string exception = 2;
-  AntennaResult result = 3;
+  AntennafieldResult result = 3;
 }

proto/stationcontrol/subrack.proto

-syntax = "proto3";
-
-service Subrack {
-  rpc GetSubrackPower(GetSubrackRequest) returns (SubrackReply) {}
-  rpc SetSubrackPower(SetSubrackRequest) returns (SubrackReply) {}
-}
-
-enum Subrack_Power_Status {
-  Subrack_POWER_OFF = 0;
-  Subrack_POWER_ON = 1;
-}
-
-message SubrackIdentifier {
-  // e.g. "l0, l1,h0"
-  string subrack_id = 1;
-}
-
-message SetSubrackRequest {
-  SubrackIdentifier identifier = 1;
-  Subrack_Power_Status power_status = 2 ;
-}
-
-message GetSubrackRequest {
-  SubrackIdentifier identifier = 1;
-}
-
-message SubrackResult {
-  SubrackIdentifier identifier = 1;
-  Subrack_Power_Status power_status = 2 ;
-}
-
-message SubrackReply {
-  bool success = 1;
-  string exception = 2;
-  SubrackResult result = 3;
-}

tests/test_sid.py

@@ -7,7 +7,7 @@ from unittest import TestCase
 
 from lofar_sid.contract import about
 
-from lofar_sid.interface.stationcontrol.antennafield_pb2 import Antenna_Status
+from lofar_sid.interface.stationcontrol.antenna_pb2 import Antenna_Status
 
 
 class SidModule(TestCase):