Import changes.

- 80f5047e8e94020dbf5c30d5f11f4a9a1af86908 GitOrigin-RevId: 80f5047e8e94020dbf5c30d5f11f4a9a1af86908
aalyria · Oct 15, 2024 · fd9dd95 · fd9dd95
1 parent 27d0da6
commit fd9dd95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/api/common/coordinates.proto b/api/common/coordinates.proto
@@ -580,10 +580,3 @@ message CcsdsOrbitEphemerisMessage {
   // CCSDS OEM File as a String
   optional string file = 1;
 }
-
-// WARNING: This field is under development and not fully supported.
-message MotionDefinition {
-  // A list of `Motion` descriptions over time, sorted by the `interval` of
-  // applicability defined within each message.
-  repeated Motion motions = 1;
-}
diff --git a/api/nbi/v1alpha/nbi.proto b/api/nbi/v1alpha/nbi.proto
@@ -47,7 +47,6 @@ enum EntityType {
   INTERFACE_LINK_REPORT = 5; 
   INTERFERENCE_CONSTRAINT = 23;
   // WARNING: This type is under development and not fully supported.
-  MOTION_DEFINITION = 4;    
   NETWORK_NODE = 3;         
   NETWORK_STATS_REPORT = 8; 
   PLATFORM_DEFINITION = 1;  
@@ -56,7 +55,7 @@ enum EntityType {
   // WARNING: This type is under development and not fully supported.
   COMPUTED_MOTION = 7; 
 
-  reserved 14, 15, 17, 20, 25 to max;  // (-- Next ID --)
+  reserved 4, 14, 15, 17, 20, 25 to max;  // (-- Next ID --)
 }
 
 message EntityGroup {
@@ -116,7 +115,6 @@ message Entity {
     aalyria.spacetime.api.nbi.v1alpha.resources.InterferenceConstraint
         interference_constraint = 29;
     // WARNING: This message is under development and not fully supported.
-    aalyria.spacetime.api.common.MotionDefinition motion_definition = 7;
     aalyria.spacetime.api.nbi.v1alpha.resources.NetworkNode network_node = 6;
     aalyria.spacetime.api.common.NetworkStatsReport network_stats_report = 11;
     aalyria.spacetime.api.common.PlatformDefinition platform = 4;
@@ -126,7 +124,7 @@ message Entity {
         transceiver_link_report = 25;
   }
 
-  reserved 18, 23, 26, 35 to max;
+  reserved 7, 18, 23, 26, 35 to max;
 }
 
 service NetOps {
@@ -272,4 +270,4 @@ message VersionInfoResponse {
   // Version of the Spacetime build.
   // Uses Semantic Versioning 2.0.0 format. See: https://semver.org/
   optional string build_version = 1;
-}
+}
diff --git a/tools/nbictl/README.md b/tools/nbictl/README.md
@@ -29,7 +29,7 @@ Gets the entity with the given type and ID.
 
 **--id**="": [REQUIRED] ID of entity to delete.
 
-**--type, -t**="": [REQUIRED] Type of entity to delete. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, MOTION_DEFINITION, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
+**--type, -t**="": [REQUIRED] Type of entity to delete. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
 
 ## create
 
@@ -43,7 +43,7 @@ Opens the specified entity as a textproto in $EDITOR, then updates the NBI's ver
 
 **--id**="": [REQUIRED] ID of entity to edit.
 
-**--type, -t**="": [REQUIRED] Type of entity to edit. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, MOTION_DEFINITION, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
+**--type, -t**="": [REQUIRED] Type of entity to edit. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
 
 ## update
 
@@ -59,7 +59,7 @@ Lists all entities of a given type.
 
 **--field_masks**="": Comma-separated allow-list of fields to include in the response; see the aalyria.spacetime.api.nbi.v1alpha.EntityFilter.field_masks documentation for usage details.
 
-**--type, -t**="": [REQUIRED] Type of entities to query. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, MOTION_DEFINITION, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
+**--type, -t**="": [REQUIRED] Type of entities to query. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
 
 ## delete
 
@@ -73,7 +73,7 @@ Deletes one or more entities. Provide the type and ID to delete a single entity,
 
 **--last_commit_timestamp**="": Delete the entity only if `last_commit_timestamp` matches the `commit_timestamp` of the currently stored entity. (default: 0)
 
-**--type, -t**="": Type of entity to delete. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, MOTION_DEFINITION, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
+**--type, -t**="": Type of entity to delete. Allowed values: [ANTENNA_PATTERN, BAND_PROFILE, COMPUTED_MOTION, DEVICES_IN_REGION, INTENT, INTERFACE_LINK_REPORT, INTERFERENCE_CONSTRAINT, NETWORK_NODE, NETWORK_STATS_REPORT, PLATFORM_DEFINITION, SERVICE_REQUEST, STATION_SET, SURFACE_REGION, TRANSCEIVER_LINK_REPORT]
 
 ## get-link-budget