Skip to content

fix(profiles): remove os.Exit to avoid oneview TF provider from responding #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FalcoSuessgott wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(profiles): remove os.Exit to avoid oneview TF provider from responding #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions ov/profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"encoding/json"
"errors"
"fmt"
"os"
"reflect"
"strings"

Expand Down Expand Up @@ -452,20 +451,15 @@ func (c *OVClient) SubmitNewProfile(p ServerProfile, ignoreFlags ...ForceFlag) (

isHardwareAvailable, err := c.GetAvailableServers(p.ServerHardwareURI.String())
if err != nil || isHardwareAvailable == false {
log.Errorf("Error getting available Hardware: %s", p.ServerHardwareURI.String())
if err != nil {
log.Warnf("Error: %s", err)
return fmt.Errorf("error getting available hardware: %v", err)
}
os.Exit(1)
}

server, err = c.GetServerHardwareByUri(p.ServerHardwareURI)
}

server, err = c.GetServerHardwareByUri(p.ServerHardwareURI)

if err != nil {
log.Warnf("Problem getting server hardware, %s", err)
return fmt.Errorf("problem getting server hardware, %v", err)
}

// power off the server so that we can add to SP
Expand All @@ -475,8 +469,9 @@ func (c *OVClient) SubmitNewProfile(p ServerProfile, ignoreFlags ...ForceFlag) (

serverHardwareType, err := c.GetServerHardwareTypeByUri(server.ServerHardwareTypeURI)
if err != nil {
log.Warnf("Error getting server hardware type %s", err)
return fmt.Errorf("Error getting server hardware type %v", err)
}

serverHarwdareTypeGen := serverHardwareType.Generation

var emptyMgmtProcessorsStruct ManagementProcessors
Expand All @@ -499,15 +494,14 @@ func (c *OVClient) SubmitNewProfile(p ServerProfile, ignoreFlags ...ForceFlag) (
data, err := c.RestAPICall(rest.POST, uri, p, forceFlags)
if err != nil {
t.TaskIsDone = true
log.Errorf("Error submitting new profile request: %s", err)
return err
return fmt.Errorf("Error submitting new profile request: %v", err)
}

log.Debugf("Response New Profile %s", data)
if err := json.Unmarshal([]byte(data), &t); err != nil {
t.TaskIsDone = true
log.Errorf("Error with task un-marshal: %s", err)
return err

return fmt.Errorf("Error with task un-marshal: %s", err)
}

err = t.Wait()
Expand Down