summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
5a801c6)
Change-Id: Ie97eb86651ca3c54589668e0efd7a305be5f97e5
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
app.Resource.InjectRoute(v.appmgrNotifUrl, v.HandlexAppNotification, "POST")
app.Resource.InjectRoute(measUrl, v.HandleMeasurements, "POST")
app.Resource.InjectRoute("/supervision", v.HandleSupervision, "GET") // @todo: remove this
app.Resource.InjectRoute(v.appmgrNotifUrl, v.HandlexAppNotification, "POST")
app.Resource.InjectRoute(measUrl, v.HandleMeasurements, "POST")
app.Resource.InjectRoute("/supervision", v.HandleSupervision, "GET") // @todo: remove this
+ app.Resource.InjectRoute("/ric/v1/symptomdata", v.SymptomDataHandler, "GET")
go v.SubscribeXappNotif(fmt.Sprintf("%s%s", v.appmgrHost, v.appmgrSubsUrl))
go v.SubscribeXappNotif(fmt.Sprintf("%s%s", v.appmgrHost, v.appmgrSubsUrl))
+func (v *VespaMgr) SymptomDataHandler(w http.ResponseWriter, r *http.Request) {
+ appConfig, err := ioutil.ReadFile(app.Config.GetString("controls.vesagent.configFile"))
+ if err != nil {
+ app.Logger.Error("Unable to read config file: %v", err)
+ }
+ app.Logger.Info("SymptomDataHandler: appConfig=%+v", string(appConfig))
+
+ baseDir := app.Resource.CollectDefaultSymptomData("app-config.json", appConfig)
+ if baseDir != "" {
+ app.Resource.SendSymptomDataFile(w, r, baseDir, "symptomdata.zip")
+ }
+}
+
func (v *VespaMgr) Consume(rp *app.RMRParams) (err error) {
app.Logger.Info("Message received!")
func (v *VespaMgr) Consume(rp *app.RMRParams) (err error) {
app.Logger.Info("Message received!")
}
func (suite *VespaMgrTestSuite) TestHandleMeasurements() {
}
func (suite *VespaMgrTestSuite) TestHandleMeasurements() {
- data, err := ioutil.ReadFile("../../test/xApp_config_test_output.json")
- suite.Nil(err)
+ data, err := ioutil.ReadFile("../../test/xApp_config_test_output.json")
+ suite.Nil(err)
- pbodyEn, _ := json.Marshal(data)
- req, _ := http.NewRequest("POST", "/ric/v1/measurements", bytes.NewBuffer(pbodyEn))
- handleFunc := http.HandlerFunc(suite.vespaMgr.HandleMeasurements)
+ pbodyEn, _ := json.Marshal(data)
+ req, _ := http.NewRequest("POST", "/ric/v1/measurements", bytes.NewBuffer(pbodyEn))
+ handleFunc := http.HandlerFunc(suite.vespaMgr.HandleMeasurements)
response := executeRequest(req, handleFunc)
response := executeRequest(req, handleFunc)
- suite.Equal(http.StatusOK, response.Code)
+ suite.Equal(http.StatusOK, response.Code)
+}
+
+func (suite *VespaMgrTestSuite) TestSymptomDataHandler() {
+ req, _ := http.NewRequest("GET", "/ric/v1/symptomdata", nil)
+ handleFunc := http.HandlerFunc(suite.vespaMgr.SymptomDataHandler)
+ resp := executeRequest(req, handleFunc)
+ suite.Equal(http.StatusOK, resp.Code)
# The Jenkins job uses this string for the tag in the image name
# for example nexus3.o-ran-sc.org:10004/my-image-name:0.0.1
---
# The Jenkins job uses this string for the tag in the image name
# for example nexus3.o-ran-sc.org:10004/my-image-name:0.0.1
---
-replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7
+replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.1
replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2 h1:XNfkp3PwZ7pfkPszX7NaX6DzToCGjcWTLbIHYqCFNu0=
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2 h1:XNfkp3PwZ7pfkPszX7NaX6DzToCGjcWTLbIHYqCFNu0=
gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
+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.21 h1:eK9nUZOTMJ/EnMpH9bkWtMgOvCn3u4+PNCb9gu10s6w=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.21/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
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.21 h1:eK9nUZOTMJ/EnMpH9bkWtMgOvCn3u4+PNCb9gu10s6w=
gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.21/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
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/xapp-frame.git v0.4.4/go.mod h1:29CdUcCrNEqVBjQWAlgeGrYxSWqSZ4e67xzhuSf6BkI=
gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7 h1:lTURRbfaV0kPcplGF7jyowRXoUkNknRzd7Y51ZPs5PI=
gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7/go.mod h1:fpHeoGISAkz6bNfgZtq8Ycg9i9KdGgUBP2jLs6TGk2g=
gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.4/go.mod h1:29CdUcCrNEqVBjQWAlgeGrYxSWqSZ4e67xzhuSf6BkI=
gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7 h1:lTURRbfaV0kPcplGF7jyowRXoUkNknRzd7Y51ZPs5PI=
gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7/go.mod h1:fpHeoGISAkz6bNfgZtq8Ycg9i9KdGgUBP2jLs6TGk2g=
+gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.1 h1:kpeENcE4eaipw62MlS6xUpJ8RflqTWLOFKV3OwjZxic=
+gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.1/go.mod h1:MRTeTBLROgTA2t91SXYjTbRsxoOhMMvvkK/ChLVRZUU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=