X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Foruclosedlooprecovery%2Fgoversion%2Finternal%2Flinkfailure%2Flinkfailurehandler.go;h=26b3ab32d3a410d564935e8736a139e8cdef7ecf;hb=237a4da4b9419171f774bd6a02f61bef81f1b60f;hp=3aecf45cd69941b70277f8908c56aaaa4683fb99;hpb=afe34e22e0be919b8e054826c23c551b4e493f79;p=nonrtric.git diff --git a/test/usecases/oruclosedlooprecovery/goversion/internal/linkfailure/linkfailurehandler.go b/test/usecases/oruclosedlooprecovery/goversion/internal/linkfailure/linkfailurehandler.go index 3aecf45c..26b3ab32 100644 --- a/test/usecases/oruclosedlooprecovery/goversion/internal/linkfailure/linkfailurehandler.go +++ b/test/usecases/oruclosedlooprecovery/goversion/internal/linkfailure/linkfailurehandler.go @@ -37,8 +37,8 @@ type Configuration struct { SDNRPassword string } -const rawSdnrPath = "/rests/data/network-topology:network-topology/topology=topology-netconf/node=[O-DU-ID]/yang-ext:mount/o-ran-sc-du-hello-world:network-function/du-to-ru-connection=[O-RU-ID]" -const unlockMessage = `{"o-ran-sc-du-hello-world:du-to-ru-connection": [{"name":"[O-RU-ID]","administrative-state":"UNLOCKED"}]}` +const rawSdnrPath = "/rests/data/network-topology:network-topology/topology=topology-netconf/node=[O-DU-ID]/yang-ext:mount/o-ran-sc-du-hello-world:network-function/distributed-unit-functions=[O-DU-ID]/radio-resource-management-policy-ratio=rrm-pol-1" +const unlockMessage = `{"o-ran-sc-du-hello-world:radio-resource-management-policy-ratio":[{"id":"rrm-pol-1","radio-resource-management-policy-max-ratio":25,"radio-resource-management-policy-members":[{"mobile-country-code":"310","mobile-network-code":"150","slice-differentiator":1,"slice-service-type":1}],"radio-resource-management-policy-min-ratio":15,"user-label":"rrm-pol-1","resource-type":"prb","radio-resource-management-policy-dedicated-ratio":20,"administrative-state":"unlocked"}]}` type LinkFailureHandler struct { lookupService repository.LookupService @@ -71,8 +71,7 @@ func (lfh LinkFailureHandler) MessagesHandler(w http.ResponseWriter, r *http.Req func (lfh LinkFailureHandler) sendUnlockMessage(oRuId string) { if oDuId, err := lfh.lookupService.GetODuID(oRuId); err == nil { - sdnrPath := getSdnrPath(oRuId, oDuId) - unlockMessage := lfh.getUnlockMessage(oRuId) + sdnrPath := getSdnrPath(oDuId) if error := restclient.Put(lfh.config.SDNRAddress+sdnrPath, unlockMessage, lfh.client, lfh.config.SDNRUser, lfh.config.SDNRPassword); error == nil { log.Debugf("Sent unlock message for O-RU: %v to O-DU: %v.", oRuId, oDuId) } else { @@ -84,12 +83,7 @@ func (lfh LinkFailureHandler) sendUnlockMessage(oRuId string) { } -func getSdnrPath(oRuId string, oDuId string) string { - sdnrPath := strings.Replace(rawSdnrPath, "[O-DU-ID]", oDuId, 1) - sdnrPath = strings.Replace(sdnrPath, "[O-RU-ID]", oRuId, 1) +func getSdnrPath(oDuId string) string { + sdnrPath := strings.Replace(rawSdnrPath, "[O-DU-ID]", oDuId, -1) return sdnrPath } - -func (lfh LinkFailureHandler) getUnlockMessage(oRuId string) string { - return strings.Replace(unlockMessage, "[O-RU-ID]", oRuId, 1) -}