From e6c7db520b70ba27d2cbf9684053f14e590d666d Mon Sep 17 00:00:00 2001 From: Timo Tietavainen Date: Thu, 7 Oct 2021 09:22:33 +0300 Subject: [PATCH] Replace deprecated SDL APIs Replace deprecated SDL SdlInstance usage with xapp-frame's SdlStorage APIs, which have been built on top of the valid SDL SyncStorage APIs. Upgrade xapp-frame version to v0.9.1 and SDL version to v0.8.0. Bump routing-manager's Docker container tag to 0.7.9 Issue-Id: RIC-805 Signed-off-by: Timo Tietavainen Change-Id: I1f7b02a1b3bcdeeeae03f8a10beb5f96a371c988 --- RELNOTES | 3 +++ container-tag.yaml | 2 +- go.mod | 6 +++--- go.sum | 23 ++++++++++++----------- pkg/nbi/httprestful.go | 6 +++--- pkg/rtmgr/types.go | 3 +++ pkg/sbi/nngpush_test.go | 4 ++-- 7 files changed, 27 insertions(+), 20 deletions(-) diff --git a/RELNOTES b/RELNOTES index 28a9cb6..e9dfe1c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,3 +1,6 @@ +### v0.7.9 +* Replacing deprecated SDL APIs + ### v0.7.8 * Refactoring rtmgr code diff --git a/container-tag.yaml b/container-tag.yaml index 6ce4ec2..b66320d 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 0.7.8 +tag: 0.7.9 diff --git a/go.mod b/go.mod index e34f32e..ae6990b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module routing-manager go 1.13 require ( - gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.4.15 + gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.9.1 github.com/ghodss/yaml v1.0.0 github.com/go-openapi/errors v0.19.3 github.com/go-openapi/loads v0.19.4 @@ -26,8 +26,8 @@ require ( gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) -replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0 +replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0 -replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3-1 +replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.9.1 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 diff --git a/go.sum b/go.sum index 05aa827..5f77620 100644 --- a/go.sum +++ b/go.sum @@ -3,16 +3,16 @@ gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 h1:Ix6SgFuzd6yW6Ur6+qDlGhDO65UYs8PiIk gerrit.o-ran-sc.org/r/com/golog.git v0.0.2/go.mod h1:A7hUL52YQSO4dFIZNcj76XQ09C9PftAe3LyL7kqBnok= gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0 h1:OKDsIDlttbaoHwleyjflIWVZPgPvYbDhim6gWF0zf5E= gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35 h1:TGXHb4DNY8on+ej4S9VUnk2HibIC/5chDy64OE+bQBQ= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35 h1:tkM3yE8UzmuH4nf9TqAmiNBSuIZ2CtcMRH2eBIYIzpQ= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35/go.mod h1:G+4sUBMbLfQ+RrGS65U15tKmbnP+/1b5oLTPmMfyfT4= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35 h1:LcxnUUDwsCzYEISKmkjkyYfg/lnLt8ofkPiGK69vNIA= -gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35/go.mod h1:2bSaXTpECbZieB8bMnubTqMwF3n+mMBxlTaAXvcduNg= -gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0 h1:mxlBo54jxwHHFmGYzFI+fBIkOGwarQP4dx2KBxQ8ln8= -gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.7.0/go.mod h1:KCHu4JkWnw2Ro6P747wU9S2t7zxFLmBNCiYvGZo3CHo= -gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3-1 h1:1bJ+pEZMNrvCdgA1crvY57Ms3Hy+MbJKdCtvI2k7g78= -gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3-1/go.mod h1:Z9SajRPqZ7N1/y+Lzp5lUzq24fvrcjQg3cMBXRQVkiM= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1 h1:3FFbXx55BODThXfyWAiz6cPXVELXFICDQUmJi13EoxM= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1 h1:8Z60JRsPgcS1Ona4fEh6d0/03nLq1WHoZcNnBsni5+g= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1/go.mod h1:YaQ+XEI4PcAoISxp9wUpUr2TP0J7JihpQTD0G1Lpd4A= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.2.1 h1:BG3kste8PLVTG0m8CRB/VP2tAV5JImKueBGuOsUNcR8= +gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.2.1/go.mod h1:zX8rW6YEsagHrRGVW5YO50Ku/Csrpzsuvblhr4DbYi4= +gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0 h1:H7GtCRC+pGn6oOxYalUZr7LinQX5jQCVa+ConX7PB5Q= +gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0/go.mod h1:KCHu4JkWnw2Ro6P747wU9S2t7zxFLmBNCiYvGZo3CHo= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.9.1 h1:qutjgf6QMlpcAG8JPwQiCnLczoTosVjCRCRh5nsGZsM= +gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.9.1/go.mod h1:foKMPQZ+RlM0Pos2GlEPAg6ux7Y9PRQmCUglYM7/Qt8= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -129,7 +129,6 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -143,6 +142,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index ab62a13..7db7071 100644 --- a/pkg/nbi/httprestful.go +++ b/pkg/nbi/httprestful.go @@ -576,7 +576,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile //rlist := make(map[string]string) xapp.Logger.Info("Reading SDL for any routes") - rlist, sdlerr := xapp.Sdl.Read("routes") + rlist, sdlerr := xapp.SdlStorage.Read(rtmgr.RTMGR_SDL_NS, "routes") readErr = sdlerr if readErr == nil { xapp.Logger.Info("Value is %s", rlist["routes"]) @@ -725,12 +725,12 @@ func Adddelrmrroute(routelist models.Routelist, rtflag bool) error { } rtmgr.DynamicRouteList = append(rtmgr.DynamicRouteList, data) routearray := strings.Join(rtmgr.DynamicRouteList, " ") - xapp.Sdl.Store("routes", routearray) + xapp.SdlStorage.Store(rtmgr.RTMGR_SDL_NS, "routes", routearray) } else { if err == true { xapp.Logger.Info("Successfully deleted route: %s", data) routearray := strings.Join(rtmgr.DynamicRouteList, " ") - xapp.Sdl.Store("routes", routearray) + xapp.SdlStorage.Store(rtmgr.RTMGR_SDL_NS, "routes", routearray) } else { xapp.Logger.Info("No such route: %s", data) return errors.New("No such route: " + data) diff --git a/pkg/rtmgr/types.go b/pkg/rtmgr/types.go index b9b9604..f9a356c 100644 --- a/pkg/rtmgr/types.go +++ b/pkg/rtmgr/types.go @@ -156,3 +156,6 @@ type XappList struct { var ( Rtmgr_ready bool ) + +//To encapsulate routing-manager's keys under their own namespace in a DB +const RTMGR_SDL_NS string = "rtmgr" diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go index e53ac5c..a778ddb 100644 --- a/pkg/sbi/nngpush_test.go +++ b/pkg/sbi/nngpush_test.go @@ -40,7 +40,7 @@ import ( type Consumer struct{} func (m Consumer) Consume(params *xapp.RMRParams) (err error) { - xapp.Sdl.Store("myKey", params.Payload) + xapp.SdlStorage.Store(rtmgr.RTMGR_SDL_NS, "myKey", params.Payload) return nil } @@ -56,7 +56,7 @@ func TestMain(m *testing.M) { Resets the EndpointList according to argumnets */ func resetTestPushDataset(instance RmrPush, testdata []rtmgr.Endpoint) { - rtmgr.RMRConnStatus = make(map[string]bool) + rtmgr.RMRConnStatus = make(map[string]bool) rtmgr.Eps = make(map[string]*rtmgr.Endpoint) for _, endpoint := range testdata { ep := endpoint -- 2.16.6