airship/airshipctl
Code Issues Proposed changes

Fix unknown event type message in logs

Browse Source 
This commit allows to normalize baremetal host events, so they
appear in logs corretly.

Change-Id: If6fb862d2baef0897a24bf6b3fdfa196f2b1ee8d
This commit is contained in:
Kostiantyn Kalynovskyi 2021-03-05 19:01:14 +00:00
parent 749073228b
commit 9578556480
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/events/events.go
View File

@ -108,6 +108,11 @@ var genericContainerOperationToString = map[GenericContainerOperation]string{
GenericContainerStop: "GenericContainerStop",
}
var baremetalInventoryOperationToString = map[BaremetalManagerStep]string{
BaremetalManagerStart: "BaremetalOperationStart",
BaremetalManagerComplete: "BaremetalOperationComplete",
}
//Normalize cast Event to GenericEvent type
func Normalize(e Event) GenericEvent {
var eventType string
@ -131,6 +136,9 @@ func Normalize(e Event) GenericEvent {
case GenericContainerType:
operation = genericContainerOperationToString[e.GenericContainerEvent.Operation]
message = e.GenericContainerEvent.Message
case BaremetalManagerEventType:
operation = baremetalInventoryOperationToString[e.BaremetalManagerEvent.Step]
message = e.BaremetalManagerEvent.Message
}
return GenericEvent{

4
pkg/phase/executors/baremetal_manager.go
View File

@ -57,8 +57,8 @@ func (e *BaremetalManagerExecutor) Run(evtCh chan events.Event, opts ifc.RunOpti
evtCh <- events.NewEvent().WithBaremetalManagerEvent(events.BaremetalManagerEvent{
Step: events.BaremetalManagerStart,
HostOperation: string(e.options.Spec.Operation),
Message: fmt.Sprintf("Starting remote operation, selector to be to filter hosts %v",
e.options.Spec.HostSelector),
Message: fmt.Sprintf("Starting remote operation '%s', selector to be to filter hosts %v",
e.options.Spec.Operation, e.options.Spec.HostSelector),
})
op, err := e.validate()