fix(dp): Add carrier aggregation fields to cbsd write fields (#13296)

Signed-off-by: Wojciech Sadowy <wojciech.sadowy@freedomfi.com> Co-authored-by: Wojciech Sadowy <wojciech.sadowy@freedomfi.com>
magma · Jul 14, 2022 · c2b0c40 · c2b0c40
1 parent d43c577
commit c2b0c40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/dp/cloud/go/services/dp/builders/builders.go b/dp/cloud/go/services/dp/builders/builders.go
@@ -205,15 +205,6 @@ func (b *DBCbsdBuilder) WithCbsdCategory(cat string) *DBCbsdBuilder {
 	return b
 }
 
-// func (b *DBCbsdBuilder) WithDefaulValues() *DBCbsdBuilder {
-// 	return b.WithCbsdCategory(catB).
-// 		WithSingleStepEnabled(false).
-// 		WithIndoorDeployment(false).
-// 		WithGrantRedundancy(true).
-// 		WithCarrierAggregationEnabled(false).
-// 		WithMaxIbwMhx(150)
-// }
-
 type DBGrantBuilder struct {
 	Grant *storage.DBGrant
 }

diff --git a/dp/cloud/go/services/dp/storage/cbsd_manager.go b/dp/cloud/go/services/dp/storage/cbsd_manager.go
@@ -208,7 +208,7 @@ func getCbsdWriteFields() []string {
 		"preferred_bandwidth_mhz", "preferred_frequencies_mhz", "single_step_enabled",
 		"cbsd_category", "latitude_deg", "longitude_deg", "height_m", "height_type", "horizontal_accuracy_m",
 		"antenna_azimuth_deg", "antenna_downtilt_deg", "antenna_beamwidth_deg", "antenna_model", "eirp_capability_dbm_mhz",
-		"indoor_deployment", "cpi_digital_signature",
+		"indoor_deployment", "cpi_digital_signature", "carrier_aggregation_enabled", "max_ibw_mhz", "grant_redundancy",
 	}
 }
 

diff --git a/dp/cloud/go/services/dp/storage/cbsd_manager_test.go b/dp/cloud/go/services/dp/storage/cbsd_manager_test.go
@@ -105,6 +105,20 @@ func (s *CbsdManagerTestSuite) TestCreateCbsdWithDefaultValues() {
 	s.verifyCbsdCreation(b.NewDBCbsdBuilder().WithIndoorDeployment(false).Cbsd)
 }
 
+func (s *CbsdManagerTestSuite) TestCreateCbsdWithCarrierAggregationFields() {
+	err := s.cbsdManager.CreateCbsd(someNetwork, b.GetMutableDBCbsd(
+		b.NewDBCbsdBuilder().
+			WithCarrierAggregationEnabled(true).
+			WithGrantRedundancy(true).
+			WithMaxIbwMhx(140).Cbsd, registered))
+	s.Require().NoError(err)
+	s.verifyCbsdCreation(b.NewDBCbsdBuilder().
+		WithIndoorDeployment(false).
+		WithCarrierAggregationEnabled(true).
+		WithGrantRedundancy(true).
+		WithMaxIbwMhx(140).Cbsd)
+}
+
 func (s *CbsdManagerTestSuite) TestCreateSingleStepCbsd() {
 	err := s.cbsdManager.CreateCbsd(someNetwork, b.GetMutableDBCbsd(
 		b.NewDBCbsdBuilder().
@@ -205,6 +219,9 @@ func (s *CbsdManagerTestSuite) TestUpdateCbsd() {
 		WithNumberOfPorts(cbsdBuilder.Cbsd.NumberOfPorts.Int64+4).
 		WithSingleStepEnabled(true).
 		WithIndoorDeployment(true).
+		WithCarrierAggregationEnabled(true).
+		WithMaxIbwMhx(140).
+		WithGrantRedundancy(true).
 		WithCbsdCategory("a").
 		WithNetworkId(someNetwork).
 		Cbsd,