Import changes.

  - 8b0f15bd5936b6fcb5efb9125601d42d0ff1e193

GitOrigin-RevId: 8b0f15bd5936b6fcb5efb9125601d42d0ff1e193

Author: Aalyria Technologies, Inc

api/provisioning/v1alpha/provisioning.proto

@@ -22,7 +22,6 @@ import "google/api/resource.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/type/interval.proto";
-import "nmts/v1/proto/types/physical/emissions.proto";
 import "nmts/v1/proto/types/physical/polarization.proto";
 
 
@@ -138,15 +137,6 @@ service Provisioning {
   rpc UpdateEmissionsLimit(UpdateEmissionsLimitRequest) returns (EmissionsLimit) {}
   rpc DeleteEmissionsLimit(DeleteEmissionsLimitRequest) returns (google.protobuf.Empty) {}
 
-  // Methods on EmissionsTargets.
-  //
-  // Manage resources under `emissionsTargets/{id}`.
-  rpc GetEmissionsTarget(GetEmissionsTargetRequest) returns (EmissionsTarget) {}
-  rpc ListEmissionsTargets(ListEmissionsTargetsRequest) returns (ListEmissionsTargetsResponse) {}
-  rpc CreateEmissionsTarget(CreateEmissionsTargetRequest) returns (EmissionsTarget) {}
-  rpc UpdateEmissionsTarget(UpdateEmissionsTargetRequest) returns (EmissionsTarget) {}
-  rpc DeleteEmissionsTarget(DeleteEmissionsTargetRequest) returns (google.protobuf.Empty) {}
-
   // TODO: Consider RFC 8623 P2MP TE -like request
   // TODO: Consider PHY-layer requests (bent pipe, etc)
   // TODO: Add a DigitalTransparentService request (details TBD)
@@ -428,7 +418,7 @@ message P2mpSrTePolicy {
   // Note: SR P2P Policy color-like differentiation can be implemented
   // via tree_id values.
   string root = 5;
-  int64 tree_id = 6;  // restricted to uint32 values
+  int64 tree_id = 6; // restricted to uint32 values
 
   // NMTS Entity IDs corresponding to the destination EK_ROUTE_FN
   // Entity elements already created within the network data model.
@@ -1255,91 +1245,3 @@ message DeleteEmissionsLimitRequest{
       type: "provisioning.spacetimeapis.com/EmissionsLimit"
     }];
 }
-
-// A target on the emissions that may be emitted from an antenna.
-// The target may be defined to be enforced only over certain frequencies,
-// polarizations, and geographical regions.
-message EmissionsTarget {
-  // The resource name of the emissions target.
-  // Format: emissionsTargets/{target}
-  string name = 1;
-
-  // The geographic regions in which this emissions target is to be enforced.
-  // If empty, the emissions target is applied globally.
-  // Format: geographicRegions/{region}
-  repeated string geographic_regions = 2;
-
-  message Label {
-    string key = 1;
-    string value = 2;
-  }
-
-  // A list of NMTS entity labels to which this emissions target applies. Any
-  // antenna having a label in its Entity.labels field whose key and value match
-  // a key-value pair in this list is subject to the emissions target.
-  //
-  // If empty, the target is applied to all antennas.
-  repeated Label subject_labels = 3;
-
-  // The desired power flux density (PFD) to apply to the target.
-  nmts.v1.types.physical.PowerFluxDensity power_flux_density = 4;
-}
-
-message GetEmissionsTargetRequest{
-  // The resource name of the emissions target to retrieve.
-  // Format: `emissionsTargets/{target}`
-  string name = 1 [
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = {
-      type: "provisioning.spacetimeapis.com/EmissionsTarget"
-    }];
-}
-
-message ListEmissionsTargetsRequest{
-}
-
-message ListEmissionsTargetsResponse{
-  repeated EmissionsTarget emissions_targets = 1;
-}
-
-message CreateEmissionsTargetRequest{
-  // The ID to use for the emissions target, which will become the final
-  // component of the emissions target's resource name.
-  //
-  // This value should be 1-63 characters, and valid characters
-  // are /[a-z][0-9]-/, specifically of the form
-  // "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$".
-  string target_id = 2 [(google.api.field_behavior) = REQUIRED];
-
-  // The emissions target to create.
-  EmissionsTarget emissions_target = 3 [
-    (google.api.field_behavior) = REQUIRED
-  ];
-}
-
-message UpdateEmissionsTargetRequest{
-  // The EmissionsTarget to update.
-  //
-  // The EmissionsTarget's `name` field is used to identify the EmissionsTarget
-  // instance to be updated.
-  EmissionsTarget emissions_target  = 1 [
-    (google.api.field_behavior) = REQUIRED
-  ];
-
-  // The list of fields to be updated.
-  google.protobuf.FieldMask update_mask = 2;
-
-  // If set to true, and the EmissionsTarget named above is not found, a new
-  // instance will be created. In this situation, `update_mask` is ignored.
-  bool allow_missing = 3;
-}
-
-message DeleteEmissionsTargetRequest{
-  // The resource name of the emissions target to delete.
-  // Format: `emissionsTargets/{target}`
-  string name = 1 [
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = {
-      type: "provisioning.spacetimeapis.com/EmissionsTarget"
-    }];
-}

tools/nbictl/proto/provisioning.proto

@@ -38,5 +38,6 @@ message ProvisioningResources {
   repeated aalyria.spacetime.api.provisioning.v1alpha.Link links = 6;
   repeated aalyria.spacetime.api.provisioning.v1alpha.GeographicRegion geographic_regions = 7;
   repeated aalyria.spacetime.api.provisioning.v1alpha.EmissionsLimit emissions_limits = 8;
-  repeated aalyria.spacetime.api.provisioning.v1alpha.EmissionsTarget emissions_targets = 9;
+
+  reserved 9;
 }

tools/nbictl/provisioning.go

@@ -56,7 +56,6 @@ type ProvisioningResources struct {
 	links                        map[string]*provapipb.Link
 	geographicRegions            map[string]*provapipb.GeographicRegion
 	emissionsLimits              map[string]*provapipb.EmissionsLimit
-	emissionsTargets             map[string]*provapipb.EmissionsTarget
 }
 
 func (pr *ProvisioningResources) String() string {
@@ -71,7 +70,6 @@ func (pr *ProvisioningResources) String() string {
 		lo.Keys(pr.links),
 		lo.Keys(pr.geographicRegions),
 		lo.Keys(pr.emissionsLimits),
-		lo.Keys(pr.emissionsTargets),
 	)
 
 	if len(keys) == 0 {
@@ -101,7 +99,6 @@ func (pr *ProvisioningResources) MarshalledString(marshaller protoFormat) string
 		lo.Entries(marshalMap(pr.links, marshaller)),
 		lo.Entries(marshalMap(pr.geographicRegions, marshaller)),
 		lo.Entries(marshalMap(pr.emissionsLimits, marshaller)),
-		lo.Entries(marshalMap(pr.emissionsTargets, marshaller)),
 	)
 	slices.SortFunc(entries, func(e1, e2 lo.Entry[string, string]) int { return strings.Compare(e1.Key, e2.Key) })
 
@@ -123,7 +120,6 @@ func NewProvisioningResources() *ProvisioningResources {
 		links:                        map[string]*provapipb.Link{},
 		geographicRegions:            map[string]*provapipb.GeographicRegion{},
 		emissionsLimits:              map[string]*provapipb.EmissionsLimit{},
-		emissionsTargets:             map[string]*provapipb.EmissionsTarget{},
 	}
 }
 
@@ -137,8 +133,7 @@ func (pr *ProvisioningResources) ResourceCount() int {
 		len(pr.disjointAssociationGroups) +
 		len(pr.links) +
 		len(pr.geographicRegions) +
-		len(pr.emissionsLimits) +
-		len(pr.emissionsTargets)
+		len(pr.emissionsLimits)
 }
 
 func (pr *ProvisioningResources) InsertProvisioningResources(resources *provnbipb.ProvisioningResources) {
@@ -152,7 +147,6 @@ func (pr *ProvisioningResources) InsertProvisioningResources(resources *provnbip
 	pr.insertLinks(resources.GetLinks())
 	pr.insertGeographicRegions(resources.GetGeographicRegions())
 	pr.insertEmissionsLimits(resources.GetEmissionsLimits())
-	pr.insertEmissionsTargets(resources.GetEmissionsTargets())
 }
 
 func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.ProvisioningClient) (*ProvisioningResources, error) {
@@ -238,19 +232,6 @@ func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.Provi
 		return nil
 	})
 
-	var emissionsTargets []*provapipb.EmissionsTarget
-	p.Go(func() error {
-		result, err := client.ListEmissionsTargets(ctx, &provapipb.ListEmissionsTargetsRequest{})
-		if err != nil {
-			if isUnimplementedError(err) {
-				return nil
-			}
-			return err
-		}
-		emissionsTargets = result.GetEmissionsTargets()
-		return nil
-	})
-
 	err := p.Wait()
 	if err != nil {
 		return nil, err
@@ -262,7 +243,6 @@ func ProvisioningResourcesFromRemote(ctx context.Context, client provapipb.Provi
 	pr.insertLinks(links)
 	pr.insertGeographicRegions(geographicRegions)
 	pr.insertEmissionsLimits(emissionsLimits)
-	pr.insertEmissionsTargets(emissionsTargets)
 
 	{
 		result, err := client.ListP2PSrTePolicies(ctx, &provapipb.ListP2PSrTePoliciesRequest{})
@@ -403,12 +383,6 @@ func (pr *ProvisioningResources) insertEmissionsLimits(entries []*provapipb.Emis
 	}
 }
 
-func (pr *ProvisioningResources) insertEmissionsTargets(entries []*provapipb.EmissionsTarget) {
-	for _, entry := range entries {
-		pr.emissionsTargets[entry.GetName()] = entry
-	}
-}
-
 func provisioningResourcesAreEquivalent[T proto.Message](a, b T) bool {
 	// TODO: find a more robust equivalency check.
 	return proto.Equal(a, b)
@@ -493,7 +467,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 		"links":                       lo.Without(lo.Keys(localResources.links), lo.Keys(remoteResources.links)...),
 		"geographicRegions":           lo.Without(lo.Keys(localResources.geographicRegions), lo.Keys(remoteResources.geographicRegions)...),
 		"emissionsLimits":             lo.Without(lo.Keys(localResources.emissionsLimits), lo.Keys(remoteResources.emissionsLimits)...),
-		"emissionsTargets":            lo.Without(lo.Keys(localResources.emissionsTargets), lo.Keys(remoteResources.emissionsTargets)...),
 	}
 
 	resourcesInCommon := map[string][]string{
@@ -505,7 +478,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 		"links":                       lo.Intersect(lo.Keys(localResources.links), lo.Keys(remoteResources.links)),
 		"geographicRegions":           lo.Intersect(lo.Keys(localResources.geographicRegions), lo.Keys(remoteResources.geographicRegions)),
 		"emissionsLimits":             lo.Intersect(lo.Keys(localResources.emissionsLimits), lo.Keys(remoteResources.emissionsLimits)),
-		"emissionsTargets":            lo.Intersect(lo.Keys(localResources.emissionsTargets), lo.Keys(remoteResources.emissionsTargets)),
 	}
 
 	fmt.Println("\ncomparing local and remote resources:")
@@ -526,7 +498,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 			links:                       lo.Without(lo.Keys(remoteResources.links), lo.Keys(localResources.links)...),
 			geographicRegions:           lo.Without(lo.Keys(remoteResources.geographicRegions), lo.Keys(localResources.geographicRegions)...),
 			emissionsLimits:             lo.Without(lo.Keys(remoteResources.emissionsLimits), lo.Keys(localResources.emissionsLimits)...),
-			emissionsTargets:            lo.Without(lo.Keys(remoteResources.emissionsTargets), lo.Keys(localResources.emissionsTargets)...),
 
 			printMode:  printMode,
 			dryRunMode: dryRunMode,
@@ -542,7 +513,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 			deleteParams.links,
 			deleteParams.geographicRegions,
 			deleteParams.emissionsLimits,
-			deleteParams.emissionsTargets,
 		)))
 
 		err := deleteProvisioning(ctx, deleteParams)
@@ -633,16 +603,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 				return err
 			})...)
 	})
-	p.Go(func() error {
-		return errors.Join(updateRemoteResources[*provapipb.EmissionsTarget](
-			resourcesInCommon["emissionsTargets"], localResources.emissionsTargets, remoteResources.emissionsTargets, printMode, dryRunMode, func(emissionsTarget *provapipb.EmissionsTarget) error {
-				_, err := provisioningClient.UpdateEmissionsTarget(ctx, &provapipb.UpdateEmissionsTargetRequest{
-					EmissionsTarget: emissionsTarget,
-					AllowMissing:    false,
-				})
-				return err
-			})...)
-	})
 
 	///
 	// Add resources.
@@ -729,16 +689,6 @@ func ProvisioningSync(appCtx *cli.Context) error {
 				return err
 			})...)
 	})
-	p.Go(func() error {
-		return errors.Join(createRemoteResources[*provapipb.EmissionsTarget](
-			resourcesToBeAdded["emissionsTargets"], localResources.emissionsTargets, printMode, dryRunMode, func(emissionsTarget *provapipb.EmissionsTarget) error {
-				_, err := provisioningClient.UpdateEmissionsTarget(ctx, &provapipb.UpdateEmissionsTargetRequest{
-					EmissionsTarget: emissionsTarget,
-					AllowMissing:    true,
-				})
-				return err
-			})...)
-	})
 
 	errs = append(errs, p.Wait())
 	return errors.Join(errs...)
@@ -776,7 +726,6 @@ type deleteProvisioningParams struct {
 	links                       []string
 	geographicRegions           []string
 	emissionsLimits             []string
-	emissionsTargets            []string
 
 	printMode  bool
 	dryRunMode bool
@@ -884,17 +833,6 @@ func deleteProvisioning(ctx context.Context, params deleteProvisioningParams) er
 				})...)
 		})
 	}
-	if len(params.emissionsTargets) > 0 {
-		p.Go(func() error {
-			return errors.Join(deleteRemoteResources(
-				params.emissionsTargets, printMode, dryRunMode, func(emissionsTarget string) error {
-					_, err := client.DeleteEmissionsTarget(ctx, &provapipb.DeleteEmissionsTargetRequest{
-						Name: emissionsTarget,
-					})
-					return err
-				})...)
-		})
-	}
 
 	return p.Wait()
 }
@@ -930,7 +868,6 @@ func ProvisioningDeleteAll(appCtx *cli.Context) error {
 		links:                       lo.Keys(remoteResources.links),
 		geographicRegions:           lo.Keys(remoteResources.geographicRegions),
 		emissionsLimits:             lo.Keys(remoteResources.emissionsLimits),
-		emissionsTargets:            lo.Keys(remoteResources.emissionsTargets),
 	}
 
 	return deleteProvisioning(appCtx.Context, params)
@@ -972,7 +909,6 @@ func ProvisioningDelete(appCtx *cli.Context) error {
 	params.links = lo.Intersect(resourceNames, lo.Keys(remoteResources.links))
 	params.geographicRegions = lo.Intersect(resourceNames, lo.Keys(remoteResources.geographicRegions))
 	params.emissionsLimits = lo.Intersect(resourceNames, lo.Keys(remoteResources.emissionsLimits))
-	params.emissionsTargets = lo.Intersect(resourceNames, lo.Keys(remoteResources.emissionsTargets))
 
 	deleteResourceNameSet := slices.Concat(
 		params.p2pSrTePolicies,
@@ -983,7 +919,6 @@ func ProvisioningDelete(appCtx *cli.Context) error {
 		params.links,
 		params.geographicRegions,
 		params.emissionsLimits,
-		params.emissionsTargets,
 	)
 
 	notFoundNames := lo.Without(resourceNames, deleteResourceNameSet...)

version.bzl

@@ -19,13 +19,13 @@
 # - Incompatible changes to APIs that can break depending projects code or expectations.
 # - Incompatible changes in how data is written or read from config files or DBs.
 # - Changes requiring manual enviroment adjustments before the new version can be used.
-MAJOR = 20
+MAJOR = 21
 
 # Increment after releasing a public version.
 # -------------------------------------------------------------
 # This allows to publish bugfixes to the released version
 # through increments of PATCH segment.
-MINOR = 10
+MINOR = 0
 
 # Monotonic ID of bugfixes applied to each MAJOR.MINOR release.
 # -------------------------------------------------------------