Project import generated by Copybara. (#59)

* Project import generated by Copybara.

GitOrigin-RevId: e48ee845290e2d1434194daa82843696cd6b4d93

Co-authored-by: Aalyria Technologies, Inc <[email protected]>

Author: dgnemo

api/common/telemetry.proto

@@ -54,8 +54,8 @@ message BeamStats {
 
     enum ConnectionStatus {
       UNKNOWN = 0;
-      SEEKING = 1;
-      LOCKED = 2;
+      SEEKING = 1; 
+      LOCKED = 2;  
     }
 
     // The progress of establishing a connection with the target specified in
@@ -143,6 +143,10 @@ message ReceiverStats {
   // The mean squared error, in dB, of the signal processed by the receiver.
   optional double mse_db = 6;
 
+  // The carrier to noise plus interference ratio (CINR), in dB, measured
+  // by the receiver.
+  optional double carrier_to_noise_plus_interference_db = 7;
+
   reserved 1;
 }
 
@@ -211,8 +215,8 @@ message RadioEvent {
   }
   enum LinkStatus {
     UNKNOWN = 0;
-    DOWN = 1;
-    UP = 2;
+    DOWN = 1; 
+    UP = 2;   
   }
   oneof event {
     LinkStatus link_status = 3;
@@ -224,8 +228,8 @@ message PortEvent {
   optional string port_id = 1;
   enum PortStatus {
     UNKNOWN = 0;
-    DOWN = 1;
-    UP = 2;
+    DOWN = 1; 
+    UP = 2;   
   }
   oneof event {
     PortStatus port_status = 2;
@@ -237,8 +241,8 @@ message InterfaceEvent {
   optional string interface_id = 1;
   enum InterfaceStatus {
     UNKNOWN = 0;
-    DISABLED = 1;
-    ENABLED = 2;
+    DISABLED = 1; 
+    ENABLED = 2;  
   }
   oneof event {
     InterfaceStatus interface_status = 2;

api/common/wireless_modcod.proto

@@ -28,23 +28,30 @@ message AdaptiveDataRateTable {
   optional string id = 3;  // required.
 
   // Maps a data-rate to the minimum C/(N+I) that is required to maintain it.
-  message ChannelStateDataRateMapping {
+  message CarrierToNoisePlusInterferenceDataRateMapping {
     // The ratio of the power of the carrier (or signal) at the demod input to
     // the noise power of the signal plus the power of the interfering signals,
     // commonly abbreviated C/(N+I), in units of dB.
     optional double min_carrier_to_noise_plus_interference_db = 1;
 
-    // The layer 2 data rate expected, in bps, based on the channel state
-    // information from the receiver that would be sent back to the transmitter.
+    // The layer 2 data rate achievable, in bps, provided the receiver receives
+    // at least the min_carrier_to_noise_plus_interference_db specified above.
     optional double tx_data_rate_bps = 2;
   }
   // Steps should be sorted by C/(N+I) in ascending order.
-  repeated ChannelStateDataRateMapping step = 2;
+  repeated CarrierToNoisePlusInterferenceDataRateMapping
+      carrier_to_noise_plus_interference_steps = 2;
 
-  // Deprecated (use step).
-  message ReceivedSignalLevelDataRateMapping {
-    optional double min_received_signal_power_dbw = 1 [deprecated = true];
-    optional double tx_data_rate_bps = 2 [deprecated = true];
+  // Maps a data-rate to the minimum received signal power, at the receiver
+  // output, that is required to maintain it.
+  message ReceivedSignalPowerDataRateMapping {
+    optional double min_received_signal_power_dbw = 1;
+    optional double tx_data_rate_bps = 2;
   }
-  repeated ReceivedSignalLevelDataRateMapping steps = 1 [deprecated = true];
+  // Prefer using `carrier_to_noise_plus_interference_steps`.
+  // This field is used as fallback if
+  // `carrier_to_noise_plus_interference_steps` are not provided,
+  // or if the receiver does not support CNIR.
+  // Steps should be sorted by min_received_signal_power_dbw in ascending order.
+  repeated ReceivedSignalPowerDataRateMapping received_signal_power_steps = 1;
 }

api/nbi/v1alpha/nbi.proto

@@ -152,21 +152,18 @@ message GetEntityRequest {
 // The id can be omitted, in which case a unique ID will be generated
 // by the backend.
 message CreateEntityRequest {
-  optional string type = 1;
-  optional Entity entity = 2;
+  optional Entity entity = 1;
 }
 
 // The posted Entity is merged with the existing one. The provided entity should
 // only specify the fields to be update, ID and Type should be omited.
 message UpdateEntityRequest {
-  optional string type = 1;
-  optional string id = 2;
-  optional Entity entity = 3;
+  optional Entity entity = 1;
 }
 
 message ListEntitiesRequest {
-  reserved 2, 7 to max;      // NEXT_ID: 6
-  optional string type = 1;  // required.
+  reserved 2, 7 to max;      // NEXT_ID: 7
+  optional EntityType type = 1;  // required.
   // The time interval of the history being requested. If both start and end
   // time are empty, return only the latest entities of the above type.
   // Do not use yet; results may be incomplete.
@@ -183,7 +180,7 @@ message ListEntitiesResponse {
 }
 
 message ListEntitiesOverTimeRequest {
-  optional string type = 1;  // required.
+  optional EntityType type = 1; // required.
 
   // The time range of the history being requested.
   optional aalyria.spacetime.api.common.TimeInterval interval = 2;  // required.
@@ -228,7 +225,7 @@ message EntityFilter {
 }
 
 message DeleteEntityRequest {
-  optional string type = 1;
+  optional EntityType type = 1;
   optional string id = 2;
 
   // This is a required field. The client must provide the latest known

api/nbi/v1alpha/resources/network_link.proto

@@ -147,33 +147,6 @@ message WirelessLinkBudget {
   optional double carrier_to_noise_density_db_per_hz = 9;
 }
 
-// Describes expected changes to the accessibility of a link to a destination
-// on a particular channel.
-message LinkReport {
-  reserved 1, 3, 4, 5, 6, 8 to max;
-  // The ID of the destination interface described by this report.
-  optional aalyria.spacetime.api.common.NetworkInterfaceId dst = 7;  // required
-
-  // A series of non-overlapping time intervals that describe the predicted
-  // accessibility of the link -- and link metrics within accessible intervals.
-  message AccessInterval {
-    reserved 3;
-
-    // The applicable time interval (may be open ended).
-    optional aalyria.spacetime.api.common.TimeInterval interval = 1;
-
-    // Whether or not the link is predicted/known to be accessible (usable).
-    optional Accessibility accessibility = 2;
-
-    // Delay incurred by a data-frame when communicated over this link.
-    optional aalyria.spacetime.api.common.Duration frame_delay = 4;
-
-    // The modeled data rate capacity, in layer 2 bits per second.
-    optional double data_rate_bps = 5;
-  }
-  repeated AccessInterval access_intervals = 2;
-}
-
 // Describes expected changes to the accessibility of a link to a destination
 // on a particular channel.
 message WirelessLinkReport {
@@ -223,17 +196,36 @@ message WirelessLinkReport {
   repeated WirelessAccessInterval access_intervals = 4;
 }
 
-// Provides interface link reports for all possible wired links from a source
-// interface. It is the responsibility of some SDN application to insert link
+// Provides interface link report between `src` and `dst` interfaces,
+// at different `access_intervals`. 
+// It is the responsibility of some SDN application to insert link
 // reports corresponding to the physical availability of connections from each
 // source interface they manage to any other interfaces which should be
 // considered reachable.
 message InterfaceLinkReport {
-  reserved 1, 3;
-  // The source interface for all of the reported possible wired links.
+  reserved 1, 2, 3;
+  // The source interface.
   optional aalyria.spacetime.api.common.NetworkInterfaceId src = 4;
-  // A set of possible links that this source interface could participate in.
-  repeated LinkReport links = 2;
+
+  // The destination interface.
+  optional aalyria.spacetime.api.common.NetworkInterfaceId dst = 5;
+
+  // A series of non-overlapping time intervals that describe the predicted
+  // accessibility of the link -- and link metrics within accessible intervals.
+  message AccessInterval {
+    // The applicable time interval (may be open ended).
+    optional aalyria.spacetime.api.common.TimeInterval interval = 1;
+
+    // Whether or not the link is predicted/known to be accessible (usable).
+    optional Accessibility accessibility = 2;
+
+    // Delay incurred by a data-frame when communicated over this link.
+    optional aalyria.spacetime.api.common.Duration frame_delay = 3;
+
+    // The modeled data rate capacity, in layer 2 bits per second.
+    optional double data_rate_bps = 4;
+  }
+  repeated AccessInterval access_intervals = 6;
 }
 
 // Provides transceiver link reports for all possible wireless links from a

api/nbi/v1alpha/resources/service_request.proto

@@ -46,13 +46,11 @@ message ServiceRequest {
 
   oneof src_type {
     string src_node_id = 2;
-    aalyria.spacetime.api.common.NetworkInterfaceId src_interface_id = 3;
     string src_devices_in_region_id = 8;
   }
 
   oneof dst_type {
     string dst_node_id = 16;
-    aalyria.spacetime.api.common.NetworkInterfaceId dst_interface_id = 17;
     string dst_devices_in_region_id = 18;
   }
 
@@ -153,7 +151,7 @@ message ServiceRequest {
   // time.
   repeated IntentAndIntervals intent_dependencies = 14;
 
-  reserved 1, 7;
+  reserved 1, 3, 7, 17;
   reserved 19 to max;  // Next IDs.
 }
 

entity_samples/build_a_scenario_tutorial/terrestrial_link_backward.textproto

@@ -17,18 +17,16 @@ group: {
   type: INTERFACE_LINK_REPORT
 }
 interface_link_report: {
-  links: {
-    access_intervals: {
-      accessibility: ACCESS_EXISTS
-      data_rate_bps: 1e+12
-    }
-    dst: {
-      node_id: "test-pop-network-node"
-      interface_id: "wan"
-    }
-  }
   src: {
     node_id: "test-gateway-network-node"
     interface_id: "wan"
   }
+  dst: {
+    node_id: "test-pop-network-node"
+    interface_id: "wan"
+  }
+  access_intervals: {
+    accessibility: ACCESS_EXISTS
+    data_rate_bps: 1e+12
+  }
 }

entity_samples/build_a_scenario_tutorial/terrestrial_link_forward.textproto

@@ -17,18 +17,16 @@ group: {
   type: INTERFACE_LINK_REPORT
 }
 interface_link_report: {
-  links: {
-    access_intervals: {
-      accessibility: ACCESS_EXISTS
-      data_rate_bps: 1e+12
-    }
-    dst: {
-      node_id: "test-gateway-network-node"
-      interface_id: "wan"
-    }
-  }
   src: {
     node_id: "test-pop-network-node"
     interface_id: "wan"
   }
+  dst: {
+    node_id: "test-gateway-network-node"
+    interface_id: "wan"
+  }
+  access_intervals: {
+    accessibility: ACCESS_EXISTS
+    data_rate_bps: 1e+12
+  }
 }

java/com/aalyria/spacetime/codesamples/nbi/client/ListEntities.java

@@ -74,7 +74,7 @@ public static void main(String[] args) {
 
     // This stub can now be used to call any method in the NetOps service.
     ListEntitiesRequest request =
-        ListEntitiesRequest.newBuilder().setType(EntityType.PLATFORM_DEFINITION.name()).build();
+        ListEntitiesRequest.newBuilder().setType(EntityType.PLATFORM_DEFINITION).build();
     ListEntitiesResponse entities = stub.listEntities(request);
     System.out.println("ListEntitiesResponse received: \n" + entities.toString());
   }

tools/nbictl/connection_test.go

@@ -23,11 +23,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/bazelbuild/rules_go/go/tools/bazel"
+	"golang.org/x/sync/errgroup"
+
 	nbi "aalyria.com/spacetime/api/nbi/v1alpha"
 	"aalyria.com/spacetime/auth/authtest"
 	"aalyria.com/spacetime/github/tools/nbictl/nbictlpb"
-	"github.com/bazelbuild/rules_go/go/tools/bazel"
-	"golang.org/x/sync/errgroup"
 )
 
 const (
@@ -113,9 +114,8 @@ func TestDial_insecure(t *testing.T) {
 	defer conn.Close()
 
 	// Test a gRPC method invocation
-	listEntityType := "TYPE"
 	client := nbi.NewNetOpsClient(conn)
-	_, err = client.ListEntities(ctx, &nbi.ListEntitiesRequest{Type: &listEntityType})
+	_, err = client.ListEntities(ctx, &nbi.ListEntitiesRequest{Type: nbi.EntityType_ANTENNA_PATTERN.Enum()})
 	checkErr(t, err)
 
 	// Verify that the method invocation reached the server
@@ -180,8 +180,7 @@ func TestDial_serverCertificate(t *testing.T) {
 
 	// Test a gRPC method invocation
 	client := nbi.NewNetOpsClient(conn)
-	listEntityType := "TYPE"
-	_, err = client.ListEntities(ctx, &nbi.ListEntitiesRequest{Type: &listEntityType})
+	_, err = client.ListEntities(ctx, &nbi.ListEntitiesRequest{Type: nbi.EntityType_ANTENNA_PATTERN.Enum()})
 	checkErr(t, err)
 
 	// Verify that the method invocation reached the server