Skip to content

Commit 50f109c

Browse files
author
Tom Morelly
committed
fix(profiles): remove os.Exit to avoid oneview TF provider from responding
1 parent 81c712c commit 50f109c

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

ov/profiles.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"encoding/json"
2222
"errors"
2323
"fmt"
24-
"os"
2524
"reflect"
2625
"strings"
2726

@@ -454,18 +453,16 @@ func (c *OVClient) SubmitNewProfile(p ServerProfile, ignoreFlags ...ForceFlag) (
454453
if err != nil || isHardwareAvailable == false {
455454
log.Errorf("Error getting available Hardware: %s", p.ServerHardwareURI.String())
456455
if err != nil {
457-
log.Warnf("Error: %s", err)
456+
return fmt.Errorf("error getting available hardware: %v", err)
458457
}
459-
os.Exit(1)
460458
}
461459

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

465463
server, err = c.GetServerHardwareByUri(p.ServerHardwareURI)
466-
467464
if err != nil {
468-
log.Warnf("Problem getting server hardware, %s", err)
465+
return fmt.Errorf("problem getting server hardware, %v", err)
469466
}
470467

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

476473
serverHardwareType, err := c.GetServerHardwareTypeByUri(server.ServerHardwareTypeURI)
477474
if err != nil {
478-
log.Warnf("Error getting server hardware type %s", err)
475+
return fmt.Errorf("Error getting server hardware type %v", err)
479476
}
477+
480478
serverHarwdareTypeGen := serverHardwareType.Generation
481479

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

506503
log.Debugf("Response New Profile %s", data)
507504
if err := json.Unmarshal([]byte(data), &t); err != nil {
508505
t.TaskIsDone = true
509-
log.Errorf("Error with task un-marshal: %s", err)
510-
return err
506+
507+
return fmt.Errorf("Error with task un-marshal: %s", err)
511508
}
512509

513510
err = t.Wait()

0 commit comments

Comments
 (0)