X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cli%2Falarm-cli.go;h=a3ea90c3ce11763180d07d874cde39cecd31cf9a;hb=4cedd5020e5c7ba0383156f9929ab3db986c0593;hp=0fd5b1859a3d17641d5475229c0471ece49b08d1;hpb=478720e4a200ea2d635800813abf0b14290f8f32;p=ric-plt%2Falarm-go.git diff --git a/cli/alarm-cli.go b/cli/alarm-cli.go index 0fd5b18..a3ea90c 100755 --- a/cli/alarm-cli.go +++ b/cli/alarm-cli.go @@ -10,12 +10,12 @@ import ( "net/http" "os" "time" - + "strconv" "gerrit.o-ran-sc.org/r/ric-plt/alarm-go/alarm" ) type CliAlarmDefinitions struct { - AlarmDefinitions []*alarm.AlarmDefinition `json:"alarmdefinitions"` + AlarmDefinitions []*alarm.AlarmDefinition `json:"alarmdefinitions"` } func main() { @@ -92,16 +92,26 @@ func main() { // Create alarm defenition commando. Register("define"). - SetShortDescription("Define alarm with given parameters"). - AddFlag("aid", "alarm identifier", commando.Int, nil). - AddFlag("atx", "alarm text", commando.String, nil). - AddFlag("ety", "event type", commando.String, nil). - AddFlag("oin", "operation instructions", commando.String, nil). + SetShortDescription("Define alarm with given parameters"). + AddFlag("aid", "alarm identifier", commando.Int, nil). + AddFlag("atx", "alarm text", commando.String, nil). + AddFlag("ety", "event type", commando.String, nil). + AddFlag("oin", "operation instructions", commando.String, nil). AddFlag("host", "Alarm manager host address", commando.String, "localhost"). AddFlag("port", "Alarm manager host address", commando.String, "8080"). - SetAction(func(args map[string]commando.ArgValue, flags map[string]commando.FlagValue) { - postAlarmDefinition(flags) - }) + SetAction(func(args map[string]commando.ArgValue, flags map[string]commando.FlagValue) { + postAlarmDefinition(flags) + }) + // Delete alarm defenition + commando. + Register("undefine"). + SetShortDescription("Define alarm with given parameters"). + AddFlag("aid", "alarm identifier", commando.Int, nil). + AddFlag("host", "Alarm manager host address", commando.String, "localhost"). + AddFlag("port", "Alarm manager host address", commando.String, "8080"). + SetAction(func(args map[string]commando.ArgValue, flags map[string]commando.FlagValue) { + deleteAlarmDefinition(flags) + }) // parse command-line arguments commando.Parse(nil) @@ -214,30 +224,50 @@ func postAlarmConfig(flags map[string]commando.FlagValue) { } func postAlarmDefinition(flags map[string]commando.FlagValue) { - host, _ := flags["host"].GetString() - port, _ := flags["port"].GetString() - alarmid, _ := flags["aid"].GetInt() - alarmtxt, _ := flags["atx"].GetString() - etype, _ := flags["ety"].GetString() - operation, _ := flags["oin"].GetString() - targetUrl := fmt.Sprintf("http://%s:%s/ric/v1/alarms/define", host, port) + host, _ := flags["host"].GetString() + port, _ := flags["port"].GetString() + alarmid, _ := flags["aid"].GetInt() + alarmtxt, _ := flags["atx"].GetString() + etype, _ := flags["ety"].GetString() + operation, _ := flags["oin"].GetString() + targetUrl := fmt.Sprintf("http://%s:%s/ric/v1/alarms/define", host, port) var alarmdefinition alarm.AlarmDefinition - alarmdefinition.AlarmId = alarmid - alarmdefinition.AlarmText = alarmtxt - alarmdefinition.EventType = etype - alarmdefinition.OperationInstructions = operation + alarmdefinition.AlarmId = alarmid + alarmdefinition.AlarmText = alarmtxt + alarmdefinition.EventType = etype + alarmdefinition.OperationInstructions = operation m := CliAlarmDefinitions{AlarmDefinitions: []*alarm.AlarmDefinition{&alarmdefinition}} - jsonData, err := json.Marshal(m) - if err != nil { - fmt.Println("json.Marshal failed: %v", err) - return - } - - resp, err := http.Post(targetUrl, "application/json", bytes.NewBuffer(jsonData)) - if err != nil || resp == nil { - fmt.Println("Couldn't fetch post alarm configuration due to error: %v", err) - return - } + jsonData, err := json.Marshal(m) + if err != nil { + fmt.Println("json.Marshal failed: %v", err) + return + } + + resp, err := http.Post(targetUrl, "application/json", bytes.NewBuffer(jsonData)) + if err != nil || resp == nil { + fmt.Println("Couldn't post alarm definition due to error: %v", err) + return + } +} + +func deleteAlarmDefinition(flags map[string]commando.FlagValue) { + host, _ := flags["host"].GetString() + port, _ := flags["port"].GetString() + alarmid, _ := flags["aid"].GetInt() + salarmid := strconv.FormatUint(uint64(alarmid), 10) + targetUrl := fmt.Sprintf("http://%s:%s/ric/v1/alarms/define/%s", host, port, salarmid) + + client := &http.Client{} + req, err := http.NewRequest("DELETE", targetUrl, nil) + if err != nil || req == nil { + fmt.Println("Couldn't make delete request due to error: %v", err) + return + } + resp, errr := client.Do(req) + if errr != nil || resp == nil { + fmt.Println("Couldn't send delete request due to error: %v", err) + return + } }