make serial output part of openstackProvider

Author: sergiocazzolato

spread/openstack.go

@@ -157,47 +157,6 @@ func (s *openstackServer) ReuseData() interface{} {
 	return &s.d
 }
 
-var openstackSerialOutputTimeout = 30 * time.Second
-var openstackSerialConsoleErr = fmt.Errorf("cannot get console output")
-
-func (s *openstackServer) SerialOutput(ctx context.Context) (string, error) {
-	_, err := s.p.computeClient.GetServer(s.d.Id)
-	if err != nil {
-		// this is when the server is removed
-		return "", fmt.Errorf("failed to retrieve the serial console, server removed: %s", s)
-	}
-
-	url := fmt.Sprintf("servers/%s/action", s.d.Id)
-
-	var req struct {
-		OsGetSerialConsole struct{} `json:"os-getConsoleOutput"`
-	}
-	var resp struct {
-		Output string `json:"output"`
-	}
-	requestData := goosehttp.RequestData{ReqValue: req, RespValue: &resp, ExpectedStatus: []int{http.StatusOK}}
-	timeout := time.After(openstackSerialOutputTimeout)
-	retry := time.NewTicker(openstackServerBootRetry)
-	defer retry.Stop()
-
-	for {
-		err := s.p.osClient.SendRequest("POST", "compute", "v2", url, &requestData)
-		if err != nil {
-			debugf("failed to retrieve the serial console for server %s: %v", s, err)
-		}
-		if len(resp.Output) > 0 {
-			return resp.Output, nil
-		}
-		select {
-		case <-retry.C:
-		case <-timeout:
-			return "", fmt.Errorf("failed to retrieve the serial console for instance %s: timeout reached", s)
-		case <-ctx.Done():
-			return "", fmt.Errorf("failed to retrieve the serial console for instance %s: interrupted", s)
-		}
-	}
-}
-
 const (
 	serverStatusProvisioning = "PROVISIONING"
 	volumeStatusAvailable    = "available"
@@ -308,6 +267,47 @@ func (e *openstackError) Error() string {
 	return msg
 }
 
+var openstackSerialOutputTimeout = 30 * time.Second
+var openstackSerialConsoleErr = fmt.Errorf("cannot get console output")
+
+func (p *openstackProvider) SerialOutput(ctx context.Context, s *openstackServer) (string, error) {
+	_, err := p.computeClient.GetServer(s.d.Id)
+	if err != nil {
+		// this is when the server is removed
+		return "", fmt.Errorf("failed to retrieve the serial console, server removed: %s", s)
+	}
+
+	url := fmt.Sprintf("servers/%s/action", s.d.Id)
+
+	var req struct {
+		OsGetSerialConsole struct{} `json:"os-getConsoleOutput"`
+	}
+	var resp struct {
+		Output string `json:"output"`
+	}
+	requestData := goosehttp.RequestData{ReqValue: req, RespValue: &resp, ExpectedStatus: []int{http.StatusOK}}
+	timeout := time.After(openstackSerialOutputTimeout)
+	retry := time.NewTicker(openstackServerBootRetry)
+	defer retry.Stop()
+
+	for {
+		err := s.p.osClient.SendRequest("POST", "compute", "v2", url, &requestData)
+		if err != nil {
+			debugf("failed to retrieve the serial console for server %s: %v", s, err)
+		}
+		if len(resp.Output) > 0 {
+			return resp.Output, nil
+		}
+		select {
+		case <-retry.C:
+		case <-timeout:
+			return "", fmt.Errorf("failed to retrieve the serial console for instance %s: timeout reached", s)
+		case <-ctx.Done():
+			return "", fmt.Errorf("failed to retrieve the serial console for instance %s: interrupted", s)
+		}
+	}
+}
+
 func (p *openstackProvider) findFlavor(flavorName string) (*nova.Entity, error) {
 	flavors, err := p.computeClient.ListFlavors()
 	if err != nil {
@@ -625,7 +625,7 @@ func (p *openstackProvider) waitServerBootSerial(ctx context.Context, s *opensta
 
 	var marker = openstackReadyMarker
 	for {
-		resp, err := s.SerialOutput(ctx)
+		resp, err := p.SerialOutput(ctx, s)
 		if err != nil {
 			return fmt.Errorf("%w: %v", openstackSerialConsoleErr, err)
 		}