X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Fodusliceassurance%2Fgoversion%2Fmessages%2FpolicyRatio.go;h=502e867c116000a8e1d6172a76382aba6b18d45f;hb=07a4236558e3876add50a8a080a431b5b7f366b4;hp=8868ff8b05b888c24389f80f6d769917632286a4;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git diff --git a/test/usecases/odusliceassurance/goversion/messages/policyRatio.go b/test/usecases/odusliceassurance/goversion/messages/policyRatio.go index 8868ff8b..502e867c 100644 --- a/test/usecases/odusliceassurance/goversion/messages/policyRatio.go +++ b/test/usecases/odusliceassurance/goversion/messages/policyRatio.go @@ -20,36 +20,22 @@ package messages -import ( - "strconv" - - "oransc.org/usecase/oduclosedloop/internal/structures" -) - type ORanDuRestConf struct { DistributedUnitFunction DistributedUnitFunction `json:"distributed-unit-functions"` } type DistributedUnitFunction struct { Id string `json:"id"` - Cell []Cell `json:"cell"` RRMPolicyRatio []RRMPolicyRatio `json:"radio-resource-management-policy-ratio"` } -type Cell struct { - Id string `json:"id"` - AdmState string `json:"administrative-state"` - OpState string `json:"operational-state"` - UserLabel string `json:"user-label"` -} - type RRMPolicyRatio struct { Id string `json:"id"` AdmState string `json:"administrative-state"` UserLabel string `json:"user-label"` RRMPolicyMaxRatio int `json:"radio-resource-management-policy-max-ratio"` - RRMPolicyMinRatio string `json:"radio-resource-management-policy-min-ratio"` - RRMPolicyDedicatedRatio string `json:"radio-resource-management-policy-dedicated-ratio"` + RRMPolicyMinRatio int `json:"radio-resource-management-policy-min-ratio"` + RRMPolicyDedicatedRatio int `json:"radio-resource-management-policy-dedicated-ratio"` ResourceType string `json:"resource-type"` RRMPolicyMembers []RRMPolicyMember `json:"radio-resource-management-policy-members"` } @@ -60,23 +46,3 @@ type RRMPolicyMember struct { SliceDifferentiator int `json:"slice-differentiator"` SliceServiceType int `json:"slice-service-type"` } - -func GetDedicatedRatioUpdateMessage(metric structures.SliceMetric, policy structures.PolicyRatio, dedicatedRatio int) RRMPolicyRatio { - return RRMPolicyRatio{ - Id: policy.PolicyRatioId, - AdmState: "Locked", - UserLabel: "Some user label", - RRMPolicyMaxRatio: policy.PolicyMaxRatio, - RRMPolicyMinRatio: policy.PolicyMinRatio, - RRMPolicyDedicatedRatio: strconv.Itoa(dedicatedRatio), - ResourceType: "prb", - RRMPolicyMembers: []RRMPolicyMember{ - { - MobileCountryCode: "046", - MobileNetworkCode: "651", - SliceDifferentiator: metric.SliceDiff, - SliceServiceType: metric.SliceServiceType, - }, - }, - } -}