[orc8r] add service indicator to PolicyRules on swagger (magma#7545)

Signed-off-by: Oriol Batalla <[email protected]>

Author: uri200

feg/gateway/go.mod

@@ -46,7 +46,6 @@ require (
 	google.golang.org/grpc v1.33.2
 	google.golang.org/protobuf v1.26.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
-	gotest.tools/gotestsum v1.6.4 // indirect
 	layeh.com/radius v0.0.0-20200615152116-663b41c3bf86
 	magma/feg/cloud/go v0.0.0
 	magma/feg/cloud/go/protos v0.0.0

lte/cloud/go/services/policydb/obsidian/models/conversion.go

@@ -178,6 +178,7 @@ func (m *PolicyRule) getConfig() *PolicyRuleConfig {
 		MonitoringKey:           m.MonitoringKey,
 		Priority:                m.Priority,
 		RatingGroup:             m.RatingGroup,
+		ServiceIdentifier:       m.ServiceIdentifier,
 		Redirect:                m.Redirect,
 		TrackingType:            m.TrackingType,
 		AppName:                 m.AppName,
@@ -200,6 +201,7 @@ func (m *PolicyRule) fillFromConfig(entConfig interface{}) *PolicyRule {
 	m.MonitoringKey = monKey
 	m.Priority = cfg.Priority
 	m.RatingGroup = cfg.RatingGroup
+	m.ServiceIdentifier = cfg.ServiceIdentifier
 	m.Redirect = cfg.Redirect
 	m.TrackingType = cfg.TrackingType
 	m.AppName = cfg.AppName
@@ -262,6 +264,7 @@ func (m *PolicyRuleConfig) ToProto(id string, qos *protos.FlowQos) *protos.Polic
 			protoMKey = []byte(m.MonitoringKey)
 		}
 	}
+
 	rule := &protos.PolicyRule{
 		Id:             id,
 		Priority:       swag.Uint32Value(m.Priority),
@@ -273,6 +276,9 @@ func (m *PolicyRuleConfig) ToProto(id string, qos *protos.FlowQos) *protos.Polic
 		HardTimeout:    0,
 		Qos:            qos,
 	}
+	if m.ServiceIdentifier != 0 {
+		rule.ServiceIdentifier = &protos.ServiceIdentifier{Value: m.ServiceIdentifier}
+	}
 	if m.Redirect != nil {
 		rule.Redirect = m.Redirect.ToProto()
 	}

lte/cloud/go/services/policydb/obsidian/models/policy_rule_config_swaggergen.go

@@ -573,6 +573,9 @@ definitions:
         type: integer
         format: uint32
         default: 10
+      service_identifier:
+        type: integer
+        format: uint32
       rating_group:
         type: integer
         format: uint32
@@ -664,6 +667,9 @@ definitions:
       rating_group:
         type: integer
         format: uint32
+      service_identifier:
+        type: integer
+        format: uint32
       monitoring_key:
         type: string
       tracking_type:

lte/cloud/go/services/policydb/obsidian/models/policy_rule_swaggergen.go

@@ -10657,6 +10657,9 @@ definitions:
         type: integer
       redirect:
         $ref: '#/definitions/redirect_information'
+      service_identifier:
+        format: uint32
+        type: integer
       tracking_type:
         enum:
         - ONLY_OCS
@@ -10726,6 +10729,9 @@ definitions:
         type: integer
       redirect:
         $ref: '#/definitions/redirect_information'
+      service_identifier:
+        format: uint32
+        type: integer
       tracking_type:
         enum:
         - ONLY_OCS